JPEG fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2231 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/jpeg/jconfig.h b/src/jpeg/jconfig.h
new file mode 100644 (file)
index 0000000..9594ec5
--- /dev/null
+++ b/src/jpeg/jconfig.h
@@ -0,0 +1,45 @@
+/* jconfig.h.  Generated automatically by configure.  */
+/* jconfig.cfg --- source file edited by configure script */
+/* see jconfig.doc for explanations */
+
+#define HAVE_PROTOTYPES 
+#define HAVE_UNSIGNED_CHAR 
+#define HAVE_UNSIGNED_SHORT 
+#undef void
+#undef const
+#undef CHAR_IS_UNSIGNED
+#define HAVE_STDDEF_H 
+#define HAVE_STDLIB_H 
+#undef NEED_BSD_STRINGS
+#undef NEED_SYS_TYPES_H
+#undef NEED_FAR_POINTERS
+#undef NEED_SHORT_EXTERNAL_NAMES
+/* Define this if you get warnings about undefined structures. */
+#undef INCOMPLETE_TYPES_BROKEN
+
+#ifdef JPEG_INTERNALS
+
+#undef RIGHT_SHIFT_IS_UNSIGNED
+#define INLINE __inline__
+/* These are for configuring the JPEG memory manager. */
+#undef DEFAULT_MAX_MEM
+#undef NO_MKTEMP
+
+#endif /* JPEG_INTERNALS */
+
+#ifdef JPEG_CJPEG_DJPEG
+
+#define BMP_SUPPORTED          /* BMP image file format */
+#define GIF_SUPPORTED          /* GIF image file format */
+#define PPM_SUPPORTED          /* PBMPLUS PPM/PGM image file format */
+#undef RLE_SUPPORTED           /* Utah RLE image file format */
+#define TARGA_SUPPORTED                /* Targa image file format */
+
+#undef TWO_FILE_COMMANDLINE
+#undef NEED_SIGNAL_CATCHER
+#undef DONT_USE_B_MODE
+
+/* Define this if you want percent-done progress reports from cjpeg/djpeg. */
+#undef PROGRESS_REPORT
+
+#endif /* JPEG_CJPEG_DJPEG */

diff --git a/src/jpeg/jinclude.h b/src/jpeg/jinclude.h
index 0a4f15146aeb2070601838439e169509f6fe5b7d..b4722d428e235581e5cb2353f6bb99b61350547e 100644 (file)
--- a/src/jpeg/jinclude.h
+++ b/src/jpeg/jinclude.h
@@ -17,7 +17,7 @@
 
 /* Include auto-config file to find out which system include files we need. */
 
-#include "jconfig.h"           /* auto configuration options */
+#include "../src/jpeg/jconfig.h"               /* auto configuration options */
 #define JCONFIG_INCLUDED       /* so that jpeglib.h doesn't do it again */
 
 /*

diff --git a/src/jpeg/jpeglib.h b/src/jpeg/jpeglib.h
index d1be8ddeff1bfee59f56d3ea04379f4b6f4d1c0e..b7a0ec4e98ea1f6f36d7fbe635b9b63d66165067 100644 (file)
--- a/src/jpeg/jpeglib.h
+++ b/src/jpeg/jpeglib.h
@@ -21,7 +21,7 @@
  */
 
 #ifndef JCONFIG_INCLUDED       /* in case jinclude.h already did */
-#include "jconfig.h"           /* widely used configuration options */
+#include "../src/jpeg/jconfig.h"               /* widely used configuration options */
 #endif
 #include "jmorecfg.h"          /* seldom changed options */