X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e19291405ff3995a32c965da9694f2f20aa02468..f239a20092359e3c914adb79bd39f3f5d2b2e06f:/src/jpeg/jdmarker.c?ds=sidebyside diff --git a/src/jpeg/jdmarker.c b/src/jpeg/jdmarker.c index f4cca8cc83..39bed54224 100644 --- a/src/jpeg/jdmarker.c +++ b/src/jpeg/jdmarker.c @@ -193,7 +193,7 @@ typedef my_marker_reader * my_marker_ptr; */ -LOCAL(boolean) +LOCAL(wxjpeg_boolean) get_soi (j_decompress_ptr cinfo) /* Process an SOI marker */ { @@ -233,11 +233,11 @@ get_soi (j_decompress_ptr cinfo) } -LOCAL(boolean) -get_sof (j_decompress_ptr cinfo, boolean is_prog, boolean is_arith) +LOCAL(wxjpeg_boolean) +get_sof (j_decompress_ptr cinfo, wxjpeg_boolean is_prog, wxjpeg_boolean is_arith) /* Process a SOFn marker */ { - INT32 length; + JPEG_INT32 length; int c, ci; jpeg_component_info * compptr; INPUT_VARS(cinfo); @@ -297,11 +297,11 @@ get_sof (j_decompress_ptr cinfo, boolean is_prog, boolean is_arith) } -LOCAL(boolean) +LOCAL(wxjpeg_boolean) get_sos (j_decompress_ptr cinfo) /* Process a SOS marker */ { - INT32 length; + JPEG_INT32 length; int i, ci, n, c, cc; jpeg_component_info * compptr; INPUT_VARS(cinfo); @@ -369,11 +369,11 @@ get_sos (j_decompress_ptr cinfo) #ifdef D_ARITH_CODING_SUPPORTED -LOCAL(boolean) +LOCAL(wxjpeg_boolean) get_dac (j_decompress_ptr cinfo) /* Process a DAC marker */ { - INT32 length; + JPEG_INT32 length; int index, val; INPUT_VARS(cinfo); @@ -415,11 +415,11 @@ get_dac (j_decompress_ptr cinfo) #endif /* D_ARITH_CODING_SUPPORTED */ -LOCAL(boolean) +LOCAL(wxjpeg_boolean) get_dht (j_decompress_ptr cinfo) /* Process a DHT marker */ { - INT32 length; + JPEG_INT32 length; UINT8 bits[17]; UINT8 huffval[256]; int i, index, count; @@ -453,7 +453,7 @@ get_dht (j_decompress_ptr cinfo) /* Here we just do minimal validation of the counts to avoid walking * off the end of our table space. jdhuff.c will check more carefully. */ - if (count > 256 || ((INT32) count) > length) + if (count > 256 || ((JPEG_INT32) count) > length) ERREXIT(cinfo, JERR_BAD_HUFF_TABLE); for (i = 0; i < count; i++) @@ -486,11 +486,11 @@ get_dht (j_decompress_ptr cinfo) } -LOCAL(boolean) +LOCAL(wxjpeg_boolean) get_dqt (j_decompress_ptr cinfo) /* Process a DQT marker */ { - INT32 length; + JPEG_INT32 length; int n, i, prec; unsigned int tmp; JQUANT_TBL *quant_ptr; @@ -544,11 +544,11 @@ get_dqt (j_decompress_ptr cinfo) } -LOCAL(boolean) +LOCAL(wxjpeg_boolean) get_dri (j_decompress_ptr cinfo) /* Process a DRI marker */ { - INT32 length; + JPEG_INT32 length; unsigned int tmp; INPUT_VARS(cinfo); @@ -582,13 +582,13 @@ get_dri (j_decompress_ptr cinfo) LOCAL(void) examine_app0 (j_decompress_ptr cinfo, JOCTET FAR * data, - unsigned int datalen, INT32 remaining) + unsigned int datalen, JPEG_INT32 remaining) /* Examine first few bytes from an APP0. * Take appropriate action if it is a JFIF marker. * datalen is # of bytes at data[], remaining is length of rest of marker data. */ { - INT32 totallen = (INT32) datalen + remaining; + JPEG_INT32 totallen = (JPEG_INT32) datalen + remaining; if (datalen >= APP0_DATA_LEN && GETJOCTET(data[0]) == 0x4A && @@ -622,7 +622,7 @@ examine_app0 (j_decompress_ptr cinfo, JOCTET FAR * data, GETJOCTET(data[12]), GETJOCTET(data[13])); totallen -= APP0_DATA_LEN; if (totallen != - ((INT32)GETJOCTET(data[12]) * (INT32)GETJOCTET(data[13]) * (INT32) 3)) + ((JPEG_INT32)GETJOCTET(data[12]) * (JPEG_INT32)GETJOCTET(data[13]) * (JPEG_INT32) 3)) TRACEMS1(cinfo, 1, JTRC_JFIF_BADTHUMBNAILSIZE, (int) totallen); } else if (datalen >= 6 && GETJOCTET(data[0]) == 0x4A && @@ -658,7 +658,7 @@ examine_app0 (j_decompress_ptr cinfo, JOCTET FAR * data, LOCAL(void) examine_app14 (j_decompress_ptr cinfo, JOCTET FAR * data, - unsigned int datalen, INT32 remaining) + unsigned int datalen, JPEG_INT32 remaining) /* Examine first few bytes from an APP14. * Take appropriate action if it is an Adobe marker. * datalen is # of bytes at data[], remaining is length of rest of marker data. @@ -687,11 +687,11 @@ examine_app14 (j_decompress_ptr cinfo, JOCTET FAR * data, } -METHODDEF(boolean) +METHODDEF(wxjpeg_boolean) get_interesting_appn (j_decompress_ptr cinfo) /* Process an APP0 or APP14 marker without saving it */ { - INT32 length; + JPEG_INT32 length; JOCTET b[APPN_DATA_LEN]; unsigned int i, numtoread; INPUT_VARS(cinfo); @@ -735,7 +735,7 @@ get_interesting_appn (j_decompress_ptr cinfo) #ifdef SAVE_MARKERS_SUPPORTED -METHODDEF(boolean) +METHODDEF(wxjpeg_boolean) save_marker (j_decompress_ptr cinfo) /* Save an APPn or COM marker into the marker list */ { @@ -743,7 +743,7 @@ save_marker (j_decompress_ptr cinfo) jpeg_saved_marker_ptr cur_marker = marker->cur_marker; unsigned int bytes_read, data_length; JOCTET FAR * data; - INT32 length = 0; + JPEG_INT32 length = 0; INPUT_VARS(cinfo); if (cur_marker == NULL) { @@ -841,11 +841,11 @@ save_marker (j_decompress_ptr cinfo) #endif /* SAVE_MARKERS_SUPPORTED */ -METHODDEF(boolean) +METHODDEF(wxjpeg_boolean) skip_variable (j_decompress_ptr cinfo) /* Skip over an unknown or uninteresting variable-length marker */ { - INT32 length; + JPEG_INT32 length; INPUT_VARS(cinfo); INPUT_2BYTES(cinfo, length, return FALSE); @@ -870,7 +870,7 @@ skip_variable (j_decompress_ptr cinfo) * but it will never be 0 or FF. */ -LOCAL(boolean) +LOCAL(wxjpeg_boolean) next_marker (j_decompress_ptr cinfo) { int c; @@ -917,7 +917,7 @@ next_marker (j_decompress_ptr cinfo) } -LOCAL(boolean) +LOCAL(wxjpeg_boolean) first_marker (j_decompress_ptr cinfo) /* Like next_marker, but used to obtain the initial SOI marker. */ /* For this marker, we do not allow preceding garbage or fill; otherwise, @@ -1109,7 +1109,7 @@ read_markers (j_decompress_ptr cinfo) * it holds a marker which the decoder will be unable to read past. */ -METHODDEF(boolean) +METHODDEF(wxjpeg_boolean) read_restart_marker (j_decompress_ptr cinfo) { /* Obtain a marker unless we already did. */ @@ -1188,7 +1188,7 @@ read_restart_marker (j_decompress_ptr cinfo) * any other marker would have to be bogus data in that case. */ -GLOBAL(boolean) +GLOBAL(wxjpeg_boolean) jpeg_resync_to_restart (j_decompress_ptr cinfo, int desired) { int marker = cinfo->unread_marker;