Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build fixes for MSVC

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48826 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-09-20 00:16:14 +00:00
parent 4c1c25a778
commit d24f0fab26
2 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/tiff/libtiff/tif_jpeg.c
View File

@@ -84,9 +84,20 @@ int TIFFFillTile(TIFF*, ttile_t);
# define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */ # define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */
#endif #endif
#ifdef wxHACK_BOOLEAN
#include "wx/defs.h"
#define XMD_H 1
#define HAVE_BOOLEAN
#define boolean wxHACK_BOOLEAN
#endif
#include "jpeglib.h" #include "jpeglib.h"
#include "jerror.h" #include "jerror.h"
#ifndef HAVE_WXJPEG_BOOLEAN
typedef boolean wxjpeg_boolean;
#endif
/* /*
* We are using width_in_blocks which is supposed to be private to * We are using width_in_blocks which is supposed to be private to
* libjpeg. Unfortunately, the libjpeg delivered with Cygwin has * libjpeg. Unfortunately, the libjpeg delivered with Cygwin has
@@ -288,20 +299,20 @@ TIFFjpeg_set_colorspace(JPEGState* sp, J_COLOR_SPACE colorspace)
} }
static int static int
TIFFjpeg_set_quality(JPEGState* sp, int quality, boolean force_baseline) TIFFjpeg_set_quality(JPEGState* sp, int quality, wxjpeg_boolean force_baseline)
{ {
return CALLVJPEG(sp, return CALLVJPEG(sp,
jpeg_set_quality(&sp->cinfo.c, quality, force_baseline)); jpeg_set_quality(&sp->cinfo.c, quality, force_baseline));
} }
static int static int
TIFFjpeg_suppress_tables(JPEGState* sp, boolean suppress) TIFFjpeg_suppress_tables(JPEGState* sp, wxjpeg_boolean suppress)
{ {
return CALLVJPEG(sp, jpeg_suppress_tables(&sp->cinfo.c, suppress)); return CALLVJPEG(sp, jpeg_suppress_tables(&sp->cinfo.c, suppress));
} }
static int static int
TIFFjpeg_start_compress(JPEGState* sp, boolean write_all_tables) TIFFjpeg_start_compress(JPEGState* sp, wxjpeg_boolean write_all_tables)
{ {
return CALLVJPEG(sp, return CALLVJPEG(sp,
jpeg_start_compress(&sp->cinfo.c, write_all_tables)); jpeg_start_compress(&sp->cinfo.c, write_all_tables));
@@ -334,7 +345,7 @@ TIFFjpeg_write_tables(JPEGState* sp)
} }
static int static int
TIFFjpeg_read_header(JPEGState* sp, boolean require_image) TIFFjpeg_read_header(JPEGState* sp, wxjpeg_boolean require_image)
{ {
return CALLJPEG(sp, -1, jpeg_read_header(&sp->cinfo.d, require_image)); return CALLJPEG(sp, -1, jpeg_read_header(&sp->cinfo.d, require_image));
} }
@@ -402,7 +413,7 @@ std_init_destination(j_compress_ptr cinfo)
sp->dest.free_in_buffer = (size_t) tif->tif_rawdatasize; sp->dest.free_in_buffer = (size_t) tif->tif_rawdatasize;
} }
static boolean static wxjpeg_boolean
std_empty_output_buffer(j_compress_ptr cinfo) std_empty_output_buffer(j_compress_ptr cinfo)
{ {
JPEGState* sp = (JPEGState*) cinfo; JPEGState* sp = (JPEGState*) cinfo;
@@ -453,7 +464,7 @@ tables_init_destination(j_compress_ptr cinfo)
sp->dest.free_in_buffer = (size_t) sp->jpegtables_length; sp->dest.free_in_buffer = (size_t) sp->jpegtables_length;
} }
static boolean static wxjpeg_boolean
tables_empty_output_buffer(j_compress_ptr cinfo) tables_empty_output_buffer(j_compress_ptr cinfo)
{ {
JPEGState* sp = (JPEGState*) cinfo; JPEGState* sp = (JPEGState*) cinfo;
@@ -519,7 +530,7 @@ std_init_source(j_decompress_ptr cinfo)
sp->src.bytes_in_buffer = (size_t) tif->tif_rawcc; sp->src.bytes_in_buffer = (size_t) tif->tif_rawcc;
} }
static boolean static wxjpeg_boolean
std_fill_input_buffer(j_decompress_ptr cinfo) std_fill_input_buffer(j_decompress_ptr cinfo)
{ {
JPEGState* sp = (JPEGState* ) cinfo; JPEGState* sp = (JPEGState* ) cinfo;

6
src/tiff/libtiff/tiffiop.h
View File

@@ -30,7 +30,11 @@
* ``Library-private'' definitions. * ``Library-private'' definitions.
*/ */
#include "tif_config.h" #ifdef _MSC_VER
# include "tif_config.h.vc"
#else
# include "tif_config.h"
#endif
#ifdef HAVE_FCNTL_H #ifdef HAVE_FCNTL_H
# include <fcntl.h> # include <fcntl.h>