diff --git a/CMakeLists.txt b/CMakeLists.txt index 034b7387..2220992f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,7 +17,7 @@ if(WIN32) endif() if(WIN32 AND NOT CYGWIN) - set(TWO_FILE_COMMANDLINE true) + set(TWO_FILE_COMMANDLINE true) endif() set(WITH_JPEG8 true) @@ -27,79 +27,78 @@ if(WIN32) #include_directories(${CMAKE_CURRENT_BINARY_DIR}) FILE(GLOB JPEG_LIB_HEADERS - ${JPEG_LIB}/jerror.h - ${JPEG_LIB}/jmorecfg.h - ${JPEG_LIB}/jpeglib.h - ${JPEG_LIB}/jconfig.h - ${JPEG_LIB}/turbojpeg.h + ${JPEG_LIB}/config.h + ${JPEG_LIB}/jerror.h + ${JPEG_LIB}/jmorecfg.h + ${JPEG_LIB}/jpeglib.h + ${JPEG_LIB}/jconfig.h + ${JPEG_LIB}/jconfigiint.h + ${JPEG_LIB}/turbojpeg.h ) FILE(GLOB JPEG_LIB_SRC - ${JPEG_LIB}/jmemnobs.c - ${JPEG_LIB}/jaricom.c - ${JPEG_LIB}/jcapimin.c - ${JPEG_LIB}/jcapistd.c - ${JPEG_LIB}/jcarith.c - ${JPEG_LIB}/jccoefct.c - ${JPEG_LIB}/jccolor.c - ${JPEG_LIB}/jcdctmgr.c - ${JPEG_LIB}/jchuff.c - ${JPEG_LIB}/jcinit.c - ${JPEG_LIB}/jcmainct.c - ${JPEG_LIB}/jcmarker.c - ${JPEG_LIB}/jcmaster.c - ${JPEG_LIB}/jcomapi.c - ${JPEG_LIB}/jcparam.c - ${JPEG_LIB}/jcphuff.c - ${JPEG_LIB}/jcprepct.c - ${JPEG_LIB}/jcsample.c - ${JPEG_LIB}/jctest.c - ${JPEG_LIB}/jctrans.c - ${JPEG_LIB}/jdapimin.c - ${JPEG_LIB}/jdapistd.c - ${JPEG_LIB}/jdarith.c - ${JPEG_LIB}/jdatadst.c - ${JPEG_LIB}/jdatasrc.c - ${JPEG_LIB}/jdcoefct.c - ${JPEG_LIB}/jdcol565.c - ${JPEG_LIB}/jdcolor.c - ${JPEG_LIB}/jddctmgr.c - ${JPEG_LIB}/jdhuff.c - ${JPEG_LIB}/jdinput.c - ${JPEG_LIB}/jdmainct.c - ${JPEG_LIB}/jdmarker.c - ${JPEG_LIB}/jdmaster.c - ${JPEG_LIB}/jdmerge.c - ${JPEG_LIB}/jdmrg565.c - ${JPEG_LIB}/jdphuff.c - ${JPEG_LIB}/jdpostct.c - ${JPEG_LIB}/jdsample.c - ${JPEG_LIB}/jdtrans.c - ${JPEG_LIB}/jerror.c - ${JPEG_LIB}/jfdctflt.c - ${JPEG_LIB}/jfdctfst.c - ${JPEG_LIB}/jfdctint.c - ${JPEG_LIB}/jidctflt.c - ${JPEG_LIB}/jidctfst.c - ${JPEG_LIB}/jidctint.c - ${JPEG_LIB}/jidctred.c - ${JPEG_LIB}/jmemmgr.c - ${JPEG_LIB}/jmemnobs.c - ${JPEG_LIB}/jquant1.c - ${JPEG_LIB}/jquant2.c - ${JPEG_LIB}/jsimd_none.c - ${JPEG_LIB}/jstdhuff.c - ${JPEG_LIB}/jutils.c - ${JPEG_LIB}/turbojpeg.c - ${JPEG_LIB}/cderror.h - ${JPEG_LIB}/cdjpeg.h - ${JPEG_LIB}/jdct.h - ${JPEG_LIB}/jinclude.h - ${JPEG_LIB}/jmemsys.h - ${JPEG_LIB}/jpegint.h - ${JPEG_LIB}/jpeg_nbits_table.h - ${JPEG_LIB}/jversion.h - ${JPEG_LIB}/transupp.h + ${JPEG_LIB}/jmemnobs.c + ${JPEG_LIB}/jaricom.c + ${JPEG_LIB}/jcapimin.c + ${JPEG_LIB}/jcapistd.c + ${JPEG_LIB}/jcarith.c + ${JPEG_LIB}/jccoefct.c + ${JPEG_LIB}/jccolor.c + ${JPEG_LIB}/jcdctmgr.c + ${JPEG_LIB}/jchuff.c + ${JPEG_LIB}/jcinit.c + ${JPEG_LIB}/jcmainct.c + ${JPEG_LIB}/jcmarker.c + ${JPEG_LIB}/jcmaster.c + ${JPEG_LIB}/jcomapi.c + ${JPEG_LIB}/jcparam.c + ${JPEG_LIB}/jcphuff.c + ${JPEG_LIB}/jcprepct.c + ${JPEG_LIB}/jcsample.c + ${JPEG_LIB}/jctest.c + ${JPEG_LIB}/jctrans.c + ${JPEG_LIB}/jdapimin.c + ${JPEG_LIB}/jdapistd.c + ${JPEG_LIB}/jdarith.c + ${JPEG_LIB}/jdatadst.c + ${JPEG_LIB}/jdatasrc.c + ${JPEG_LIB}/jdcoefct.c + ${JPEG_LIB}/jdcolor.c + ${JPEG_LIB}/jddctmgr.c + ${JPEG_LIB}/jdhuff.c + ${JPEG_LIB}/jdinput.c + ${JPEG_LIB}/jdmainct.c + ${JPEG_LIB}/jdmarker.c + ${JPEG_LIB}/jdmaster.c + ${JPEG_LIB}/jdmerge.c + ${JPEG_LIB}/jdphuff.c + ${JPEG_LIB}/jdpostct.c + ${JPEG_LIB}/jdsample.c + ${JPEG_LIB}/jdtrans.c + ${JPEG_LIB}/jerror.c + ${JPEG_LIB}/jfdctflt.c + ${JPEG_LIB}/jfdctfst.c + ${JPEG_LIB}/jfdctint.c + ${JPEG_LIB}/jidctflt.c + ${JPEG_LIB}/jidctfst.c + ${JPEG_LIB}/jidctint.c + ${JPEG_LIB}/jidctred.c + ${JPEG_LIB}/jmemmgr.c + ${JPEG_LIB}/jmemnobs.c + ${JPEG_LIB}/jquant1.c + ${JPEG_LIB}/jquant2.c + ${JPEG_LIB}/jsimd_none.c + ${JPEG_LIB}/jutils.c + ${JPEG_LIB}/turbojpeg.c + ${JPEG_LIB}/cderror.h + ${JPEG_LIB}/cdjpeg.h + ${JPEG_LIB}/jdct.h + ${JPEG_LIB}/jinclude.h + ${JPEG_LIB}/jmemsys.h + ${JPEG_LIB}/jpegint.h + ${JPEG_LIB}/jpeg_nbits_table.h + ${JPEG_LIB}/jversion.h + ${JPEG_LIB}/transupp.h ) add_library (bundled_jpeg STATIC ${JPEG_LIB_SRC} ${JPEG_LIB_HEADERS}) diff --git a/jpegturbo/config.h.cmake b/jpegturbo/config.h.cmake new file mode 100644 index 00000000..35644e9f --- /dev/null +++ b/jpegturbo/config.h.cmake @@ -0,0 +1,140 @@ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* use 8 or 12 */ +#undef BITS_IN_JSAMPLE + +/* libjpeg-turbo build number */ +#undef BUILD + +/* Support arithmetic encoding */ +#define C_ARITH_CODING_SUPPORTED + +/* Support arithmetic decoding */ +#define D_ARITH_CODING_SUPPORTED + +/* Define to 1 if you have the header file. */ +#undef HAVE_DLFCN_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_INTTYPES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_JNI_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_LOCALE_H + +/* Define to 1 if you have the `memcpy' function. */ +#undef HAVE_MEMCPY + +/* Define to 1 if you have the header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have the `memset' function. */ +#undef HAVE_MEMSET + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_STDDEF_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_STDLIB_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_UNISTD_H + +/* Define to 1 if the system has the type `unsigned char'. */ +#define HAVE_UNSIGNED_CHAR + +/* Define to 1 if the system has the type `unsigned short'. */ +#define HAVE_UNSIGNED_SHORT + +/* Compiler does not support pointers to undefined structures. */ +#undef INCOMPLETE_TYPES_BROKEN + +/* How to obtain function inlining. */ +#define INLINE __inline + +/* libjpeg API version */ +#define JPEG_LIB_VERSION 80 + +/* libjpeg-turbo version */ +#define LIBJPEG_TURBO_VERSION 0 + +/* Support in-memory source/destination managers */ +#define MEM_SRCDST_SUPPORTED + +/* Define if you have BSD-like bzero and bcopy in rather than + memset/memcpy in . */ +#undef NEED_BSD_STRINGS + +/* Define if you need to include to get size_t. */ +#undef NEED_SYS_TYPES_H + +/* Define to 1 if your C compiler doesn't accept -c and -o together. */ +#undef NO_MINUS_C_MINUS_O + +/* Name of package */ +#undef PACKAGE + +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#undef PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + +/* Define if your (broken) compiler shifts signed values as if they were + unsigned. */ +#undef RIGHT_SHIFT_IS_UNSIGNED + +/* The size of a `long', as computed by sizeof. */ +#undef SIZEOF_LONG + +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + +/* Version number of package */ +#undef VERSION + +/* Use accelerated SIMD routines. */ +#define WITH_SIMD + +/* Define to 1 if type `char' is unsigned and you are not using gcc. */ +#ifndef __CHAR_UNSIGNED__ +# undef __CHAR_UNSIGNED__ +#endif + +/* Define to empty if `const' does not conform to ANSI C. */ +#undef const + +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus +#undef inline __inline +#endif + +/* Define to `unsigned' if does not define. */ +#undef size_t diff --git a/jpegturbo/jconfig.h.cmake b/jpegturbo/jconfig.h.cmake new file mode 100644 index 00000000..dc230716 --- /dev/null +++ b/jpegturbo/jconfig.h.cmake @@ -0,0 +1,70 @@ +/* Version ID for the JPEG library. + * Might be useful for tests like "#if JPEG_LIB_VERSION >= 60". + */ +#define JPEG_LIB_VERSION 80 + +/* libjpeg-turbo version */ +#define LIBJPEG_TURBO_VERSION 0 + +/* Support arithmetic encoding */ +#define C_ARITH_CODING_SUPPORTED + +/* Support arithmetic decoding */ +#define D_ARITH_CODING_SUPPORTED + +/* + * Define BITS_IN_JSAMPLE as either + * 8 for 8-bit sample values (the usual setting) + * 12 for 12-bit sample values + * Only 8 and 12 are legal data precisions for lossy JPEG according to the + * JPEG standard, and the IJG code does not support anything else! + * We do not support run-time selection of data precision, sorry. + */ + +#define BITS_IN_JSAMPLE 8 /* use 8 or 12 */ + +/* Define to 1 if you have the header file. */ +#undef HAVE_LOCALE_H + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_STDDEF_H + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_STDLIB_H + +/* Define to 1 if the system has the type `unsigned char'. */ +#define HAVE_UNSIGNED_CHAR + +/* Define to 1 if the system has the type `unsigned short'. */ +#define HAVE_UNSIGNED_SHORT + +/* Compiler does not support pointers to undefined structures. */ +#undef INCOMPLETE_TYPES_BROKEN + +/* Support in-memory source/destination managers */ +#define MEM_SRCDST_SUPPORTED + +/* Define if you have BSD-like bzero and bcopy in rather than + memset/memcpy in . */ +#undef NEED_BSD_STRINGS + +/* Define if you need to include to get size_t. */ +#undef NEED_SYS_TYPES_H + +/* Define if your (broken) compiler shifts signed values as if they were + unsigned. */ +#undef RIGHT_SHIFT_IS_UNSIGNED + +/* Use accelerated SIMD routines. */ +#define WITH_SIMD + +/* Define to 1 if type `char' is unsigned and you are not using gcc. */ +#ifndef __CHAR_UNSIGNED__ +# undef __CHAR_UNSIGNED__ +#endif + +/* Define to empty if `const' does not conform to ANSI C. */ +#undef const + +/* Define to `unsigned int' if does not define. */ +#undef size_t diff --git a/jpegturbo/jconfigint.h.cmake b/jpegturbo/jconfigint.h.cmake new file mode 100644 index 00000000..ef4e194d --- /dev/null +++ b/jpegturbo/jconfigint.h.cmake @@ -0,0 +1,11 @@ +/* libjpeg-turbo build number */ +#undef BUILD + +/* How to obtain function inlining. */ +#define INLINE __inline + +/* Define to the full name of this package. */ +#undef PACKAGE_NAME + +/* Version number of package */ +#undef VERSION