diff options
author | dcommander <dcommander@632fc199-4ca6-4c93-a231-07263d6284db> | 2015-04-22 08:39:37 +0000 |
---|---|---|
committer | dcommander <dcommander@632fc199-4ca6-4c93-a231-07263d6284db> | 2015-04-22 08:39:37 +0000 |
commit | ec250624b543aecd0dacd6b2ec9984f19d2d10d9 (patch) | |
tree | 61e71817c89d207c5e42c0f646d69aa54ad0098c | |
parent | 22f5121b5e5e6465044a81abe75ab1551b413bc1 (diff) |
Oops. OS X doesn't define __WORDSIZE unless you include stdint.h, so apparently the Huffman codec hasn't ever been fully accelerated on 64-bit OS X.
git-svn-id: svn://svn.code.sf.net/p/libjpeg-turbo/code/trunk@1540 632fc199-4ca6-4c93-a231-07263d6284db
-rw-r--r-- | ChangeLog.txt | 5 | ||||
-rw-r--r-- | jchuff.c | 5 | ||||
-rw-r--r-- | jdhuff.c | 5 |
3 files changed, 15 insertions, 0 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index 4a147a9..f92e4d9 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -43,6 +43,11 @@ SIMD-enabled libjpeg-turbo MIPS build was executed with the -nosmooth option on a MIPS machine that lacked DSPr2 support. The MIPS SIMD routines for h2v1 and h2v2 merged upsampling were not properly checking for the existence of DSPr2. +[6] Performance has been improved significantly on 64-bit Mac platforms +(particularly compression performance.) Due to an oversight, the 64-bit +version of the accelerated Huffman codec was not being compiled in when +libjpeg-turbo was built on OS X. Oops. + 1.4.0 ===== @@ -21,6 +21,7 @@ #include "jpeglib.h" #include "jchuff.h" /* Declarations shared with jcphuff.c */ #include <limits.h> +#include <stdint.h> /* * NOTE: If USE_CLZ_INTRINSIC is defined, then clz/bsr instructions will be @@ -376,6 +377,10 @@ dump_buffer (working_state * state) } \ } +#if !defined(_WIN32) && !defined(__WORDSIZE) +#error __WORDSIZE is not defined +#endif + #if __WORDSIZE==64 || defined(_WIN64) #define EMIT_BITS(code, size) { \ @@ -22,6 +22,7 @@ #include "jdhuff.h" /* Declarations shared with jdphuff.c */ #include "jpegcomp.h" #include "jstdhuff.c" +#include <stdint.h> /* @@ -419,6 +420,10 @@ jpeg_fill_bit_buffer (bitread_working_state * state, } \ } +#if !defined(_WIN32) && !defined(__WORDSIZE) +#error __WORDSIZE is not defined +#endif + #if __WORDSIZE == 64 || defined(_WIN64) /* Pre-fetch 48 bytes, because the holding register is 64-bit */ |