Use wxjpeg_boolean in libtiff sources.
This fixes compilation problem when using libtiff with the built-in modified version of libjpeg that uses wxjpeg_boolean instead of boolean as it doesn't define boolean at all in its headers, but just wxjpeg_boolean. Closes #15179. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -217,6 +217,10 @@ static const TIFFField ojpegFields[] = {
|
||||
#include "jpeglib.h"
|
||||
#include "jerror.h"
|
||||
|
||||
#ifndef HAVE_WXJPEG_BOOLEAN
|
||||
typedef boolean wxjpeg_boolean;
|
||||
#endif
|
||||
|
||||
typedef struct jpeg_error_mgr jpeg_error_mgr;
|
||||
typedef struct jpeg_common_struct jpeg_common_struct;
|
||||
typedef struct jpeg_decompress_struct jpeg_decompress_struct;
|
||||
@@ -410,9 +414,9 @@ static void jpeg_encap_unwind(TIFF* tif);
|
||||
static void OJPEGLibjpegJpegErrorMgrOutputMessage(jpeg_common_struct* cinfo);
|
||||
static void OJPEGLibjpegJpegErrorMgrErrorExit(jpeg_common_struct* cinfo);
|
||||
static void OJPEGLibjpegJpegSourceMgrInitSource(jpeg_decompress_struct* cinfo);
|
||||
static boolean OJPEGLibjpegJpegSourceMgrFillInputBuffer(jpeg_decompress_struct* cinfo);
|
||||
static wxjpeg_boolean OJPEGLibjpegJpegSourceMgrFillInputBuffer(jpeg_decompress_struct* cinfo);
|
||||
static void OJPEGLibjpegJpegSourceMgrSkipInputData(jpeg_decompress_struct* cinfo, long num_bytes);
|
||||
static boolean OJPEGLibjpegJpegSourceMgrResyncToRestart(jpeg_decompress_struct* cinfo, int desired);
|
||||
static wxjpeg_boolean OJPEGLibjpegJpegSourceMgrResyncToRestart(jpeg_decompress_struct* cinfo, int desired);
|
||||
static void OJPEGLibjpegJpegSourceMgrTermSource(jpeg_decompress_struct* cinfo);
|
||||
|
||||
int
|
||||
@@ -2442,7 +2446,7 @@ OJPEGLibjpegJpegSourceMgrInitSource(jpeg_decompress_struct* cinfo)
|
||||
(void)cinfo;
|
||||
}
|
||||
|
||||
static boolean
|
||||
static wxjpeg_boolean
|
||||
OJPEGLibjpegJpegSourceMgrFillInputBuffer(jpeg_decompress_struct* cinfo)
|
||||
{
|
||||
TIFF* tif=(TIFF*)cinfo->client_data;
|
||||
@@ -2468,7 +2472,7 @@ OJPEGLibjpegJpegSourceMgrSkipInputData(jpeg_decompress_struct* cinfo, long num_b
|
||||
jpeg_encap_unwind(tif);
|
||||
}
|
||||
|
||||
static boolean
|
||||
static wxjpeg_boolean
|
||||
OJPEGLibjpegJpegSourceMgrResyncToRestart(jpeg_decompress_struct* cinfo, int desired)
|
||||
{
|
||||
TIFF* tif=(TIFF*)cinfo->client_data;
|
||||
|
Reference in New Issue
Block a user