merged 2.4 branch into the trunk
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -175,7 +175,15 @@ struct jpeg_d_main_controller {
|
||||
|
||||
/* Coefficient buffer control */
|
||||
struct jpeg_d_coef_controller {
|
||||
#if defined(__VISAGECPP__)
|
||||
/* the start input pass in jdcoeft must have a different name than the
|
||||
// one in jdtrans under VisualAge or else we get a dup symbol error
|
||||
*/
|
||||
JMETHOD(void, start_input_pass2, (j_decompress_ptr cinfo));
|
||||
#else
|
||||
JMETHOD(void, start_input_pass, (j_decompress_ptr cinfo));
|
||||
#endif
|
||||
|
||||
JMETHOD(int, consume_data, (j_decompress_ptr cinfo));
|
||||
JMETHOD(void, start_output_pass, (j_decompress_ptr cinfo));
|
||||
JMETHOD(int, decompress_data, (j_decompress_ptr cinfo,
|
||||
|
||||
Reference in New Issue
Block a user