1. fixed compilation after wxList::compatibility_iterator changes

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

diff --git a/src/jpeg/jfdctint.c b/src/jpeg/jfdctint.c
index 0a78b64aee8ffd7fc6c3469495ec577a59d44ed1..4543b2e86173284d3902fdb45c5ce8a42571a1ea 100644 (file)
--- a/src/jpeg/jfdctint.c
+++ b/src/jpeg/jfdctint.c
@@ -90,18 +90,18 @@
  */
 
 #if CONST_BITS == 13
-#define FIX_0_298631336  ((INT32)  2446)       /* FIX(0.298631336) */
-#define FIX_0_390180644  ((INT32)  3196)       /* FIX(0.390180644) */
-#define FIX_0_541196100  ((INT32)  4433)       /* FIX(0.541196100) */
-#define FIX_0_765366865  ((INT32)  6270)       /* FIX(0.765366865) */
-#define FIX_0_899976223  ((INT32)  7373)       /* FIX(0.899976223) */
-#define FIX_1_175875602  ((INT32)  9633)       /* FIX(1.175875602) */
-#define FIX_1_501321110  ((INT32)  12299)      /* FIX(1.501321110) */
-#define FIX_1_847759065  ((INT32)  15137)      /* FIX(1.847759065) */
-#define FIX_1_961570560  ((INT32)  16069)      /* FIX(1.961570560) */
-#define FIX_2_053119869  ((INT32)  16819)      /* FIX(2.053119869) */
-#define FIX_2_562915447  ((INT32)  20995)      /* FIX(2.562915447) */
-#define FIX_3_072711026  ((INT32)  25172)      /* FIX(3.072711026) */
+#define FIX_0_298631336  ((JPEG_INT32)  2446)  /* FIX(0.298631336) */
+#define FIX_0_390180644  ((JPEG_INT32)  3196)  /* FIX(0.390180644) */
+#define FIX_0_541196100  ((JPEG_INT32)  4433)  /* FIX(0.541196100) */
+#define FIX_0_765366865  ((JPEG_INT32)  6270)  /* FIX(0.765366865) */
+#define FIX_0_899976223  ((JPEG_INT32)  7373)  /* FIX(0.899976223) */
+#define FIX_1_175875602  ((JPEG_INT32)  9633)  /* FIX(1.175875602) */
+#define FIX_1_501321110  ((JPEG_INT32)  12299) /* FIX(1.501321110) */
+#define FIX_1_847759065  ((JPEG_INT32)  15137) /* FIX(1.847759065) */
+#define FIX_1_961570560  ((JPEG_INT32)  16069) /* FIX(1.961570560) */
+#define FIX_2_053119869  ((JPEG_INT32)  16819) /* FIX(2.053119869) */
+#define FIX_2_562915447  ((JPEG_INT32)  20995) /* FIX(2.562915447) */
+#define FIX_3_072711026  ((JPEG_INT32)  25172) /* FIX(3.072711026) */
 #else
 #define FIX_0_298631336  FIX(0.298631336)
 #define FIX_0_390180644  FIX(0.390180644)
@@ -139,9 +139,9 @@
 GLOBAL(void)
 jpeg_fdct_islow (DCTELEM * data)
 {
-  INT32 tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;
-  INT32 tmp10, tmp11, tmp12, tmp13;
-  INT32 z1, z2, z3, z4, z5;
+  JPEG_INT32 tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;
+  JPEG_INT32 tmp10, tmp11, tmp12, tmp13;
+  JPEG_INT32 z1, z2, z3, z4, z5;
   DCTELEM *dataptr;
   int ctr;
   SHIFT_TEMPS