From cc81f031e49936f32dd516a0f78a24ec652fd26a Mon Sep 17 00:00:00 2001 From: malaterre Date: Sun, 3 Oct 2004 20:17:57 +0000 Subject: [PATCH] ENH: Adding jconfig.h.in, which later be the central file to either generate the 8bits or 12bits jpeg library. Cmake will generate the proper .h file containing the redifinition of symbols --- src/jpeg/libijg/jconfig.h.in | 60 +++++++++++++++++++++++++++++++++++ src/jpeg/libijg8/jconfig.h.in | 60 +++++++++++++++++++++++++++++++++++ 2 files changed, 120 insertions(+) create mode 100644 src/jpeg/libijg/jconfig.h.in create mode 100644 src/jpeg/libijg8/jconfig.h.in diff --git a/src/jpeg/libijg/jconfig.h.in b/src/jpeg/libijg/jconfig.h.in new file mode 100644 index 00000000..37a19773 --- /dev/null +++ b/src/jpeg/libijg/jconfig.h.in @@ -0,0 +1,60 @@ +/* jconfig.h --- 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 +#ifndef HAVE_STDDEF_H +#define HAVE_STDDEF_H +#endif +#ifndef HAVE_STDLIB_H +#define HAVE_STDLIB_H +#endif +#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 + + +#if defined(_WIN32) && !(defined(__CYGWIN__) || defined(__MINGW32__)) +/* Define "boolean" as unsigned char, not int, per Windows custom */ +/* don't conflict if rpcndr.h already read; Note that the w32api headers + used by Cygwin and Mingw do not define "boolean", so jmorecfg.h + handles it later. */ +#ifndef __RPCNDR_H__ +typedef unsigned char boolean; +#endif +#define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */ +#endif + +#ifdef JPEG_INTERNALS + +#undef RIGHT_SHIFT_IS_UNSIGNED +#define 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/libijg8/jconfig.h.in b/src/jpeg/libijg8/jconfig.h.in new file mode 100644 index 00000000..37a19773 --- /dev/null +++ b/src/jpeg/libijg8/jconfig.h.in @@ -0,0 +1,60 @@ +/* jconfig.h --- 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 +#ifndef HAVE_STDDEF_H +#define HAVE_STDDEF_H +#endif +#ifndef HAVE_STDLIB_H +#define HAVE_STDLIB_H +#endif +#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 + + +#if defined(_WIN32) && !(defined(__CYGWIN__) || defined(__MINGW32__)) +/* Define "boolean" as unsigned char, not int, per Windows custom */ +/* don't conflict if rpcndr.h already read; Note that the w32api headers + used by Cygwin and Mingw do not define "boolean", so jmorecfg.h + handles it later. */ +#ifndef __RPCNDR_H__ +typedef unsigned char boolean; +#endif +#define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */ +#endif + +#ifdef JPEG_INTERNALS + +#undef RIGHT_SHIFT_IS_UNSIGNED +#define 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 */ -- 2.46.1