oleaut32: Include the system jpeg and png headers before the Windows headers.
This commit is contained in:
parent
86a0643df8
commit
1894d708a4
|
@ -45,6 +45,22 @@
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
|
#ifdef SONAME_LIBJPEG
|
||||||
|
/* This is a hack, so jpeglib.h does not redefine INT32 and the like*/
|
||||||
|
#define XMD_H
|
||||||
|
#define UINT8 JPEG_UINT8
|
||||||
|
#define UINT16 JPEG_UINT16
|
||||||
|
#define boolean jpeg_boolean
|
||||||
|
# include <jpeglib.h>
|
||||||
|
#undef UINT8
|
||||||
|
#undef UINT16
|
||||||
|
#undef boolean
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef HAVE_PNG_H
|
||||||
|
#include <png.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Must be before wine includes, the header has things conflicting with
|
/* Must be before wine includes, the header has things conflicting with
|
||||||
* WINE headers.
|
* WINE headers.
|
||||||
*/
|
*/
|
||||||
|
@ -67,23 +83,6 @@
|
||||||
|
|
||||||
#include "wine/wingdi16.h"
|
#include "wine/wingdi16.h"
|
||||||
|
|
||||||
#ifdef SONAME_LIBJPEG
|
|
||||||
/* This is a hack, so jpeglib.h does not redefine INT32 and the like*/
|
|
||||||
#define XMD_H
|
|
||||||
#define UINT8 JPEG_UINT8
|
|
||||||
#define UINT16 JPEG_UINT16
|
|
||||||
#undef FAR
|
|
||||||
#define boolean jpeg_boolean
|
|
||||||
# include <jpeglib.h>
|
|
||||||
#undef jpeg_boolean
|
|
||||||
#undef UINT16
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef HAVE_PNG_H
|
|
||||||
#undef FAR
|
|
||||||
#include <png.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "ungif.h"
|
#include "ungif.h"
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
||||||
|
@ -1008,7 +1007,7 @@ static void *load_libjpeg(void)
|
||||||
/* for the jpeg decompressor source manager. */
|
/* for the jpeg decompressor source manager. */
|
||||||
static void _jpeg_init_source(j_decompress_ptr cinfo) { }
|
static void _jpeg_init_source(j_decompress_ptr cinfo) { }
|
||||||
|
|
||||||
static boolean _jpeg_fill_input_buffer(j_decompress_ptr cinfo) {
|
static jpeg_boolean _jpeg_fill_input_buffer(j_decompress_ptr cinfo) {
|
||||||
ERR("(), should not get here.\n");
|
ERR("(), should not get here.\n");
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
@ -1019,7 +1018,7 @@ static void _jpeg_skip_input_data(j_decompress_ptr cinfo,long num_bytes) {
|
||||||
cinfo->src->bytes_in_buffer -= num_bytes;
|
cinfo->src->bytes_in_buffer -= num_bytes;
|
||||||
}
|
}
|
||||||
|
|
||||||
static boolean _jpeg_resync_to_restart(j_decompress_ptr cinfo, int desired) {
|
static jpeg_boolean _jpeg_resync_to_restart(j_decompress_ptr cinfo, int desired) {
|
||||||
ERR("(desired=%d), should not get here.\n",desired);
|
ERR("(desired=%d), should not get here.\n",desired);
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue