Removed extraneous semicolons and commas (partly fixes #10456).

[wxWidgets.git] / src / tiff / libtiff / tif_jpeg.c

diff --git a/src/tiff/libtiff/tif_jpeg.c b/src/tiff/libtiff/tif_jpeg.c
index ba2842247cd390cc7ee64c57858fdd1e26da49bd..bcc750ec47d6ff90ca6430778665e4deb592c5b8 100644 (file)
--- a/src/tiff/libtiff/tif_jpeg.c
+++ b/src/tiff/libtiff/tif_jpeg.c
@@ -84,9 +84,20 @@ int TIFFFillTile(TIFF*, ttile_t);
 # define HAVE_BOOLEAN            /* prevent jmorecfg.h from redefining it */
 #endif
 
 # define HAVE_BOOLEAN            /* prevent jmorecfg.h from redefining it */
 #endif
 

+#ifdef wxHACK_BOOLEAN
+  #include "wx/defs.h"
+  #define XMD_H 1
+  #define HAVE_BOOLEAN
+  #define boolean wxHACK_BOOLEAN
+#endif
+

 #include "jpeglib.h"
 #include "jerror.h"
 
 #include "jpeglib.h"
 #include "jerror.h"
 

+#ifndef HAVE_WXJPEG_BOOLEAN
+   typedef boolean wxjpeg_boolean;
+#endif
+

 /*
  * We are using width_in_blocks which is supposed to be private to
  * libjpeg. Unfortunately, the libjpeg delivered with Cygwin has
 /*
  * We are using width_in_blocks which is supposed to be private to
  * libjpeg. Unfortunately, the libjpeg delivered with Cygwin has


@@ -288,20 +299,20 @@ TIFFjpeg_set_colorspace(JPEGState* sp, J_COLOR_SPACE colorspace)
 }
 
 static int
 }
 
 static int

-TIFFjpeg_set_quality(JPEGState* sp, int quality, boolean force_baseline)
+TIFFjpeg_set_quality(JPEGState* sp, int quality, wxjpeg_boolean force_baseline)

 {
        return CALLVJPEG(sp,
            jpeg_set_quality(&sp->cinfo.c, quality, force_baseline));
 }
 
 static int
 {
        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, wxjpeg_boolean suppress)

 {
        return CALLVJPEG(sp, jpeg_suppress_tables(&sp->cinfo.c, suppress));
 }
 
 static int
 {
        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, wxjpeg_boolean write_all_tables)

 {
        return CALLVJPEG(sp,
            jpeg_start_compress(&sp->cinfo.c, write_all_tables));
 {
        return CALLVJPEG(sp,
            jpeg_start_compress(&sp->cinfo.c, write_all_tables));


@@ -334,7 +345,7 @@ TIFFjpeg_write_tables(JPEGState* sp)
 }
 
 static int
 }
 
 static int

-TIFFjpeg_read_header(JPEGState* sp, boolean require_image)
+TIFFjpeg_read_header(JPEGState* sp, wxjpeg_boolean require_image)

 {
        return CALLJPEG(sp, -1, jpeg_read_header(&sp->cinfo.d, require_image));
 }
 {
        return CALLJPEG(sp, -1, jpeg_read_header(&sp->cinfo.d, require_image));
 }


@@ -402,7 +413,7 @@ std_init_destination(j_compress_ptr cinfo)
        sp->dest.free_in_buffer = (size_t) tif->tif_rawdatasize;
 }
 
        sp->dest.free_in_buffer = (size_t) tif->tif_rawdatasize;
 }
 

-static boolean
+static wxjpeg_boolean

 std_empty_output_buffer(j_compress_ptr cinfo)
 {
        JPEGState* sp = (JPEGState*) cinfo;
 std_empty_output_buffer(j_compress_ptr cinfo)
 {
        JPEGState* sp = (JPEGState*) cinfo;


@@ -453,7 +464,7 @@ tables_init_destination(j_compress_ptr cinfo)
        sp->dest.free_in_buffer = (size_t) sp->jpegtables_length;
 }
 
        sp->dest.free_in_buffer = (size_t) sp->jpegtables_length;
 }
 

-static boolean
+static wxjpeg_boolean

 tables_empty_output_buffer(j_compress_ptr cinfo)
 {
        JPEGState* sp = (JPEGState*) cinfo;
 tables_empty_output_buffer(j_compress_ptr cinfo)
 {
        JPEGState* sp = (JPEGState*) cinfo;


@@ -519,7 +530,7 @@ std_init_source(j_decompress_ptr cinfo)
        sp->src.bytes_in_buffer = (size_t) tif->tif_rawcc;
 }
 
        sp->src.bytes_in_buffer = (size_t) tif->tif_rawcc;
 }
 

-static boolean
+static wxjpeg_boolean

 std_fill_input_buffer(j_decompress_ptr cinfo)
 {
        JPEGState* sp = (JPEGState* ) cinfo;
 std_fill_input_buffer(j_decompress_ptr cinfo)
 {
        JPEGState* sp = (JPEGState* ) cinfo;