ryan/mozjpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move INLINE macro into config.h. That's really where it belongs anyhow, since it is used only internally, and putting it in jconfig.h was causing problems with DevIL.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@739 632fc199-4ca6-4c93-a231-07263d6284db
This commit is contained in:
DRC
2012-01-26 22:20:31 +00:00
parent 81a50f71a3
commit a7466c9d86
7 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog.txt
View File

@@ -19,6 +19,11 @@ and pixel formats (TurboJPEG API), which allow applications to specify that,
when decompressing to a 4-component RGB buffer, the unused byte should be set when decompressing to a 4-component RGB buffer, the unused byte should be set
to 0xFF so that it can be interpreted as an opaque alpha channel. to 0xFF so that it can be interpreted as an opaque alpha channel.
[5] Fixed regression issue whereby DevIL failed to build against libjpeg-turbo
because libjpeg-turbo's distributed version of jconfig.h contained an INLINE
macro, which conflicted with a similar macro in DevIL. This macro is used only
internally when building libjpeg-turbo, so it was moved into config.h.
1.1.90 (1.2 beta1) 1.1.90 (1.2 beta1)
================== ==================

1
jccolor.c
View File

@@ -14,6 +14,7 @@
#include "jinclude.h" #include "jinclude.h"
#include "jpeglib.h" #include "jpeglib.h"
#include "jsimd.h" #include "jsimd.h"
#include "config.h"
/* Private subobject */ /* Private subobject */

3
jconfig.h.in
View File

@@ -30,9 +30,6 @@
/* Compiler does not support pointers to unspecified structures. */ /* Compiler does not support pointers to unspecified structures. */
#undef INCOMPLETE_TYPES_BROKEN #undef INCOMPLETE_TYPES_BROKEN
/* How to obtain function inlining. */
#undef INLINE
/* Compiler has <strings.h> rather than standard <string.h>. */ /* Compiler has <strings.h> rather than standard <string.h>. */
#undef NEED_BSD_STRINGS #undef NEED_BSD_STRINGS

1
jdcolor.c
View File

@@ -14,6 +14,7 @@
#include "jinclude.h" #include "jinclude.h"
#include "jpeglib.h" #include "jpeglib.h"
#include "jsimd.h" #include "jsimd.h"
#include "config.h"
/* Private subobject */ /* Private subobject */

1
jdmerge.c
View File

@@ -38,6 +38,7 @@
#include "jinclude.h" #include "jinclude.h"
#include "jpeglib.h" #include "jpeglib.h"
#include "jsimd.h" #include "jsimd.h"
#include "config.h"
#ifdef UPSAMPLE_MERGING_SUPPORTED #ifdef UPSAMPLE_MERGING_SUPPORTED

10
win/config.h.in
View File

@@ -1,3 +1,13 @@
#define VERSION "@VERSION@" #define VERSION "@VERSION@"
#define BUILD "@BUILD@" #define BUILD "@BUILD@"
#define PACKAGE_NAME "@CMAKE_PROJECT_NAME@" #define PACKAGE_NAME "@CMAKE_PROJECT_NAME@"
#ifndef INLINE
#if defined(__GNUC__)
#define INLINE __attribute__((always_inline))
#elif defined(_MSC_VER)
#define INLINE __forceinline
#else
#define INLINE
#endif
#endif

10
win/jconfig.h.in
View File

@@ -33,16 +33,6 @@ typedef signed int INT32;
#endif #endif
#define XMD_H /* prevent jmorecfg.h from redefining it */ #define XMD_H /* prevent jmorecfg.h from redefining it */
#ifndef INLINE
#if defined(__GNUC__)
#define INLINE __attribute__((always_inline))
#elif defined(_MSC_VER)
#define INLINE __forceinline
#else
#define INLINE
#endif
#endif
#ifdef JPEG_INTERNALS #ifdef JPEG_INTERNALS
#undef RIGHT_SHIFT_IS_UNSIGNED #undef RIGHT_SHIFT_IS_UNSIGNED