i18n files are installed as part of wxBase (and should be ideally part of separate...

[wxWidgets.git] / src / jpeg / jdmarker.c

diff --git a/src/jpeg/jdmarker.c b/src/jpeg/jdmarker.c
index f4cca8cc835c271ce14920ca790461ffc7ba4640..e2163be96beb3327035948110d1c35b24782311c 100644 (file)
--- a/src/jpeg/jdmarker.c
+++ b/src/jpeg/jdmarker.c
@@ -237,7 +237,7 @@ LOCAL(boolean)
 get_sof (j_decompress_ptr cinfo, boolean is_prog, boolean is_arith)
 /* Process a SOFn marker */
 {
 get_sof (j_decompress_ptr cinfo, boolean is_prog, boolean is_arith)
 /* Process a SOFn marker */
 {

-  INT32 length;
+  JPEG_INT32 length;

   int c, ci;
   jpeg_component_info * compptr;
   INPUT_VARS(cinfo);
   int c, ci;
   jpeg_component_info * compptr;
   INPUT_VARS(cinfo);


@@ -301,7 +301,7 @@ LOCAL(boolean)
 get_sos (j_decompress_ptr cinfo)
 /* Process a SOS marker */
 {
 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);
   int i, ci, n, c, cc;
   jpeg_component_info * compptr;
   INPUT_VARS(cinfo);


@@ -373,7 +373,7 @@ LOCAL(boolean)
 get_dac (j_decompress_ptr cinfo)
 /* Process a DAC marker */
 {
 get_dac (j_decompress_ptr cinfo)
 /* Process a DAC marker */
 {

-  INT32 length;
+  JPEG_INT32 length;

   int index, val;
   INPUT_VARS(cinfo);
 
   int index, val;
   INPUT_VARS(cinfo);
 


@@ -419,7 +419,7 @@ LOCAL(boolean)
 get_dht (j_decompress_ptr cinfo)
 /* Process a DHT marker */
 {
 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;
   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.
      */
     /* 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++)
       ERREXIT(cinfo, JERR_BAD_HUFF_TABLE);
 
     for (i = 0; i < count; i++)


@@ -490,7 +490,7 @@ LOCAL(boolean)
 get_dqt (j_decompress_ptr cinfo)
 /* Process a DQT marker */
 {
 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;
   int n, i, prec;
   unsigned int tmp;
   JQUANT_TBL *quant_ptr;


@@ -548,7 +548,7 @@ LOCAL(boolean)
 get_dri (j_decompress_ptr cinfo)
 /* Process a DRI marker */
 {
 get_dri (j_decompress_ptr cinfo)
 /* Process a DRI marker */
 {

-  INT32 length;
+  JPEG_INT32 length;

   unsigned int tmp;
   INPUT_VARS(cinfo);
 
   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,
 
 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.
  */
 {
 /* 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 &&
 
   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 !=
               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 &&
       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,
 
 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.
 /* 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.


@@ -691,7 +691,7 @@ METHODDEF(boolean)
 get_interesting_appn (j_decompress_ptr cinfo)
 /* Process an APP0 or APP14 marker without saving it */
 {
 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);
   JOCTET b[APPN_DATA_LEN];
   unsigned int i, numtoread;
   INPUT_VARS(cinfo);


@@ -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;
   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) {
   INPUT_VARS(cinfo);
 
   if (cur_marker == NULL) {


@@ -845,7 +845,7 @@ METHODDEF(boolean)
 skip_variable (j_decompress_ptr cinfo)
 /* Skip over an unknown or uninteresting variable-length marker */
 {
 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);
   INPUT_VARS(cinfo);
 
   INPUT_2BYTES(cinfo, length, return FALSE);