Changeset 381

Timestamp:

Apr 12, 2010, 4:04:46 PM (15 years ago)

Author:

dmik

Message:

jpeg plugin: Provide a better resolution of a conflict between the boolean type in jpeglib and in SOM (fixes inability to load JPEG files which is a regression of r283).

File:

• trunk/Lucide/plugins/lujpeg/lujpeg.cpp (modified) (1 diff)

trunk/Lucide/plugins/lujpeg/lujpeg.cpp ¶

@@ -55 +55 @@
 #include "lujpeg.xih"
 
-#define HAVE_BOOLEAN
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <setjmp.h>
+
+// jpeglib defines boolean as int while SOM defines it as unsigned char,
+// work this around (note that you need to use jpeg_boolean in this source if
+// you need to refer to the jpeglib's definition of it)
+#define boolean jpeg_boolean
 #include <jpeglib.h>
+#undef boolean