rename jpeg bool type

another attempt at fixing this mess
2013-10-15 21:33:59 +01:00 · 2013-10-15 21:33:59 +01:00 · abfb5a5fc5
commit abfb5a5fc5
parent a1ffdbf7c5
2 changed files with 3 additions and 6 deletions
--- a/2
+++ b/2
@ -1,6 +1,6 @@
 3/10/13	started 7.36.2
 - better jpeg startup
- change jpeg bool type to uchar to match IM's expectations, thanks MvGulik
+- rename jpeg bool type to reduce confusion between libraries

 3/10/13	started 7.36.1
 - fix to help OS X build
--- a/libvips/foreign/jpeg.h
+++ b/libvips/foreign/jpeg.h
@ -43,12 +43,9 @@ extern "C" {
 #endif /*HAVE_STDLIB_H*/

 /* jpeglib defines its own boolean type which then clashes with everyone
- * elses. Turn it off and make our own.
- *
- * It has to be uchar to match imagemagick's expectations. 
+ * elses. Rename it as jboolean. 
 */
-#define HAVE_BOOLEAN
-typedef unsigned char boolean;
+#define boolean jboolean

 #include <jpeglib.h>
 #include <jerror.h>