Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
jpeg_memsrcdest: extend feature check
libjpeg.h in OpenEmbedded master (from libjpeg-turbo 1.5.0) provides these methods if "JPEG_LIB_VERSION >= 80 || defined(MEM_SRCDST_SUPPORTED)". The support for the jpeg_mem functions was added even when not emulating the libjpeg8 API, controlled via the MEM_SRCDST_SUPPORTED define, so checking for the version alone is not enough anymore. See libjpeg-turbo/libjpeg-turbo@ab70623 This fixes errors about conflicting declarations (signed vs. unsigned char). Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
- Loading branch information
Showing
4 changed files
with
12 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,13 @@ | ||
#include <jpeglib.h> | ||
|
||
#if JPEG_LIB_VERSION < 80 && !defined(MEM_SRCDST_SUPPORTED) | ||
|
||
void | ||
jpeg_mem_src (j_decompress_ptr cinfo, unsigned char * buffer, | ||
unsigned long bufsize); | ||
|
||
void | ||
jpeg_mem_dest (j_compress_ptr cinfo, unsigned char ** outbuffer, | ||
unsigned long * outsize); | ||
|
||
#endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,13 @@ | ||
#include <jpeglib.h> | ||
|
||
#if JPEG_LIB_VERSION < 80 && !defined(MEM_SRCDST_SUPPORTED) | ||
|
||
void | ||
jpeg_mem_src (j_decompress_ptr cinfo, unsigned char * buffer, | ||
unsigned long bufsize); | ||
|
||
void | ||
jpeg_mem_dest (j_compress_ptr cinfo, unsigned char ** outbuffer, | ||
unsigned long * outsize); | ||
|
||
#endif |