X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e19291405ff3995a32c965da9694f2f20aa02468..7d6a4d96961eac84d05db8bb24c64d39003f6e54:/src/jpeg/jctrans.c diff --git a/src/jpeg/jctrans.c b/src/jpeg/jctrans.c index 0e6d70769d..c5bb27f321 100644 --- a/src/jpeg/jctrans.c +++ b/src/jpeg/jctrans.c @@ -21,6 +21,12 @@ LOCAL(void) transencode_master_selection LOCAL(void) transencode_coef_controller JPP((j_compress_ptr cinfo, jvirt_barray_ptr * coef_arrays)); +#if defined(__VISAGECPP__) +/* Visual Age fixups for multiple declarations */ +# define start_pass_coef start_pass_coef2 /* already in jccoeft.c */ +# define compress_output compress_output2 /* already in jccoeft.c */ +#endif + /* * Compression initialization for writing raw-coefficient data. @@ -246,7 +252,6 @@ start_iMCU_row (j_compress_ptr cinfo) coef->MCU_vert_offset = 0; } - /* * Initialize for a processing pass. */ @@ -274,7 +279,7 @@ start_pass_coef (j_compress_ptr cinfo, J_BUF_MODE pass_mode) * NB: input_buf is ignored; it is likely to be a NULL pointer. */ -METHODDEF(boolean) +METHODDEF(wxjpeg_boolean) compress_output (j_compress_ptr cinfo, JSAMPIMAGE input_buf) { my_coef_ptr coef = (my_coef_ptr) cinfo->coef; @@ -386,3 +391,12 @@ transencode_coef_controller (j_compress_ptr cinfo, coef->dummy_buffer[i] = buffer + i; } } + +#if defined(__VISAGECPP__) +# ifdef start_pass_coef2 +# undef start_pass_coef2 +# endif +# ifdef compress_output2 +# undef compress_output2 +# endif +#endif