You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
95 lines
3.0 KiB
95 lines
3.0 KiB
--- libtiff/tif_jpeg.c.orig 2009-08-20 14:27:50.688881034 +0200
|
|
+++ libtiff/tif_jpeg.c 2009-08-20 14:29:03.814866414 +0200
|
|
@@ -288,20 +288,20 @@
|
|
}
|
|
|
|
static int
|
|
-TIFFjpeg_set_quality(JPEGState* sp, int quality, boolean force_baseline)
|
|
+TIFFjpeg_set_quality(JPEGState* sp, int quality, jpeg_boolean force_baseline)
|
|
{
|
|
return CALLVJPEG(sp,
|
|
jpeg_set_quality(&sp->cinfo.c, quality, force_baseline));
|
|
}
|
|
|
|
static int
|
|
-TIFFjpeg_suppress_tables(JPEGState* sp, boolean suppress)
|
|
+TIFFjpeg_suppress_tables(JPEGState* sp, jpeg_boolean suppress)
|
|
{
|
|
return CALLVJPEG(sp, jpeg_suppress_tables(&sp->cinfo.c, suppress));
|
|
}
|
|
|
|
static int
|
|
-TIFFjpeg_start_compress(JPEGState* sp, boolean write_all_tables)
|
|
+TIFFjpeg_start_compress(JPEGState* sp, jpeg_boolean write_all_tables)
|
|
{
|
|
return CALLVJPEG(sp,
|
|
jpeg_start_compress(&sp->cinfo.c, write_all_tables));
|
|
@@ -334,7 +334,7 @@
|
|
}
|
|
|
|
static int
|
|
-TIFFjpeg_read_header(JPEGState* sp, boolean require_image)
|
|
+TIFFjpeg_read_header(JPEGState* sp, jpeg_boolean require_image)
|
|
{
|
|
return CALLJPEG(sp, -1, jpeg_read_header(&sp->cinfo.d, require_image));
|
|
}
|
|
@@ -402,7 +402,7 @@
|
|
sp->dest.free_in_buffer = (size_t) tif->tif_rawdatasize;
|
|
}
|
|
|
|
-static boolean
|
|
+static jpeg_boolean
|
|
std_empty_output_buffer(j_compress_ptr cinfo)
|
|
{
|
|
JPEGState* sp = (JPEGState*) cinfo;
|
|
@@ -453,7 +453,7 @@
|
|
sp->dest.free_in_buffer = (size_t) sp->jpegtables_length;
|
|
}
|
|
|
|
-static boolean
|
|
+static jpeg_boolean
|
|
tables_empty_output_buffer(j_compress_ptr cinfo)
|
|
{
|
|
JPEGState* sp = (JPEGState*) cinfo;
|
|
@@ -519,7 +519,7 @@
|
|
sp->src.bytes_in_buffer = (size_t) tif->tif_rawcc;
|
|
}
|
|
|
|
-static boolean
|
|
+static jpeg_boolean
|
|
std_fill_input_buffer(j_decompress_ptr cinfo)
|
|
{
|
|
JPEGState* sp = (JPEGState* ) cinfo;
|
|
--- libtiff/tif_ojpeg.c.orig 2010-06-25 14:42:58.387654713 +0200
|
|
+++ libtiff/tif_ojpeg.c 2010-06-25 14:43:24.483651879 +0200
|
|
@@ -383,9 +383,9 @@
|
|
static void OJPEGLibjpegJpegErrorMgrOutputMessage(jpeg_common_struct* cinfo);
|
|
static void OJPEGLibjpegJpegErrorMgrErrorExit(jpeg_common_struct* cinfo);
|
|
static void OJPEGLibjpegJpegSourceMgrInitSource(jpeg_decompress_struct* cinfo);
|
|
-static boolean OJPEGLibjpegJpegSourceMgrFillInputBuffer(jpeg_decompress_struct* cinfo);
|
|
+static jpeg_boolean OJPEGLibjpegJpegSourceMgrFillInputBuffer(jpeg_decompress_struct* cinfo);
|
|
static void OJPEGLibjpegJpegSourceMgrSkipInputData(jpeg_decompress_struct* cinfo, long num_bytes);
|
|
-static boolean OJPEGLibjpegJpegSourceMgrResyncToRestart(jpeg_decompress_struct* cinfo, int desired);
|
|
+static jpeg_boolean OJPEGLibjpegJpegSourceMgrResyncToRestart(jpeg_decompress_struct* cinfo, int desired);
|
|
static void OJPEGLibjpegJpegSourceMgrTermSource(jpeg_decompress_struct* cinfo);
|
|
|
|
int
|
|
@@ -2388,7 +2388,7 @@
|
|
(void)cinfo;
|
|
}
|
|
|
|
-static boolean
|
|
+static jpeg_boolean
|
|
OJPEGLibjpegJpegSourceMgrFillInputBuffer(jpeg_decompress_struct* cinfo)
|
|
{
|
|
TIFF* tif=(TIFF*)cinfo->client_data;
|
|
@@ -2414,7 +2414,7 @@
|
|
jpeg_encap_unwind(tif);
|
|
}
|
|
|
|
-static boolean
|
|
+static jpeg_boolean
|
|
OJPEGLibjpegJpegSourceMgrResyncToRestart(jpeg_decompress_struct* cinfo, int desired)
|
|
{
|
|
TIFF* tif=(TIFF*)cinfo->client_data;
|