final revision

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

diff --git a/src/tiff/tif_jpeg.c b/src/tiff/tif_jpeg.c
index 529afa71171b4d7943afcf6d3f7320d0ca393a2f..3ee97b90d7b91b4ee0c5225045f721a54e1bbc13 100644 (file)
--- a/src/tiff/tif_jpeg.c
+++ b/src/tiff/tif_jpeg.c
@@ -59,14 +59,20 @@ int TIFFFillTile(TIFF*, ttile_t);
 
    http://bugzilla.remotesensing.org/show_bug.cgi?id=188
 */
-#if defined(__RPCNDR_H__)
-#define HAVE_BOOLEAN
-#define boolean unsigned int
+#ifdef wxHACK_BOOLEAN
+    #include "wx/defs.h"
+    #define XMD_H
+    #define HAVE_BOOLEAN
+    #define boolean wxHACK_BOOLEAN
 #endif
 
 #include "jpeglib.h"
 #include "jerror.h"
 
+#ifndef HAVE_WXJPEG_BOOLEAN
+typedef boolean wxjpeg_boolean;
+#endif
+
 /*
  * On some machines it may be worthwhile to use _setjmp or sigsetjmp
  * in place of plain setjmp.  These macros will make it easier.
@@ -239,20 +245,20 @@ TIFFjpeg_set_colorspace(JPEGState* sp, J_COLOR_SPACE colorspace)
 }
 
 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
-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
-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));
@@ -285,7 +291,7 @@ TIFFjpeg_write_tables(JPEGState* sp)
 }
 
 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));
 }
@@ -353,7 +359,7 @@ std_init_destination(j_compress_ptr cinfo)
        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;
@@ -404,7 +410,7 @@ tables_init_destination(j_compress_ptr cinfo)
        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;
@@ -470,7 +476,7 @@ std_init_source(j_decompress_ptr cinfo)
        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;