OS/2 patches missing from this version
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -15,11 +15,6 @@
|
|||||||
#include "jinclude.h"
|
#include "jinclude.h"
|
||||||
#include "jpeglib.h"
|
#include "jpeglib.h"
|
||||||
|
|
||||||
#if defined(__VISAGECPP__)
|
|
||||||
/* Visual Age fixups for multiple declarations */
|
|
||||||
# define start_input_pass start_input_pass2 /* already in jcmaint.c */
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Private state */
|
/* Private state */
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
@@ -388,9 +383,3 @@ jinit_input_controller (j_decompress_ptr cinfo)
|
|||||||
inputctl->inheaders = TRUE;
|
inputctl->inheaders = TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(__VISAGECPP__)
|
|
||||||
# ifdef start_input_pass2
|
|
||||||
# undef start_input_pass2
|
|
||||||
# endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
@@ -15,11 +15,6 @@
|
|||||||
#include "jinclude.h"
|
#include "jinclude.h"
|
||||||
#include "jpeglib.h"
|
#include "jpeglib.h"
|
||||||
|
|
||||||
#if defined(__VISAGECPP__)
|
|
||||||
/* Visual Age fixups for multiple declarations */
|
|
||||||
# define start_input_pass start_input_pass2 /* already in jcmaint.c */
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Private state */
|
/* Private state */
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
@@ -560,9 +555,3 @@ jinit_master_decompress (j_decompress_ptr cinfo)
|
|||||||
master_selection(cinfo);
|
master_selection(cinfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(__VISAGECPP__)
|
|
||||||
# ifdef start_input_pass2
|
|
||||||
# undef start_input_pass2
|
|
||||||
# endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
@@ -142,11 +142,6 @@ struct jpeg_decomp_master {
|
|||||||
boolean is_dummy_pass; /* True during 1st pass for 2-pass quant */
|
boolean is_dummy_pass; /* True during 1st pass for 2-pass quant */
|
||||||
};
|
};
|
||||||
|
|
||||||
#if defined(__VISAGECPP__)
|
|
||||||
/* Visual Age fixups for multiple declarations */
|
|
||||||
# define start_input_pass start_input_pass2 /* already in jcmaint.c */
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Input control module */
|
/* Input control module */
|
||||||
struct jpeg_input_controller {
|
struct jpeg_input_controller {
|
||||||
JMETHOD(int, consume_input, (j_decompress_ptr cinfo));
|
JMETHOD(int, consume_input, (j_decompress_ptr cinfo));
|
||||||
@@ -159,12 +154,6 @@ struct jpeg_input_controller {
|
|||||||
boolean eoi_reached; /* True when EOI has been consumed */
|
boolean eoi_reached; /* True when EOI has been consumed */
|
||||||
};
|
};
|
||||||
|
|
||||||
#if defined(__VISAGECPP__)
|
|
||||||
# ifdef start_input_pass2
|
|
||||||
# undef start_input_pass2
|
|
||||||
# endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Main buffer control (downsampled-data buffer) */
|
/* Main buffer control (downsampled-data buffer) */
|
||||||
struct jpeg_d_main_controller {
|
struct jpeg_d_main_controller {
|
||||||
JMETHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
|
JMETHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
|
||||||
|
Reference in New Issue
Block a user