fixed Xcode 1.2 warnings; code cleanup

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

diff --git a/src/jpeg/jidctflt.c b/src/jpeg/jidctflt.c
index 0188ce3dfcd2ce2ebaa57c17da22101de01b6f2a..a0f22c295cf2b5affaa38eaff5ff44c62cb5e93f 100644 (file)
--- a/src/jpeg/jidctflt.c
+++ b/src/jpeg/jidctflt.c
@@ -218,21 +218,21 @@ jpeg_idct_float (j_decompress_ptr cinfo, jpeg_component_info * compptr,
 
     /* Final output stage: scale down by a factor of 8 and range-limit */
 
 
     /* Final output stage: scale down by a factor of 8 and range-limit */
 

-    outptr[0] = range_limit[(int) DESCALE((INT32) (tmp0 + tmp7), 3)
+    outptr[0] = range_limit[(int) DESCALE((JPEG_INT32) (tmp0 + tmp7), 3)

                            & RANGE_MASK];
                            & RANGE_MASK];

-    outptr[7] = range_limit[(int) DESCALE((INT32) (tmp0 - tmp7), 3)
+    outptr[7] = range_limit[(int) DESCALE((JPEG_INT32) (tmp0 - tmp7), 3)

                            & RANGE_MASK];
                            & RANGE_MASK];

-    outptr[1] = range_limit[(int) DESCALE((INT32) (tmp1 + tmp6), 3)
+    outptr[1] = range_limit[(int) DESCALE((JPEG_INT32) (tmp1 + tmp6), 3)

                            & RANGE_MASK];
                            & RANGE_MASK];

-    outptr[6] = range_limit[(int) DESCALE((INT32) (tmp1 - tmp6), 3)
+    outptr[6] = range_limit[(int) DESCALE((JPEG_INT32) (tmp1 - tmp6), 3)

                            & RANGE_MASK];
                            & RANGE_MASK];

-    outptr[2] = range_limit[(int) DESCALE((INT32) (tmp2 + tmp5), 3)
+    outptr[2] = range_limit[(int) DESCALE((JPEG_INT32) (tmp2 + tmp5), 3)

                            & RANGE_MASK];
                            & RANGE_MASK];

-    outptr[5] = range_limit[(int) DESCALE((INT32) (tmp2 - tmp5), 3)
+    outptr[5] = range_limit[(int) DESCALE((JPEG_INT32) (tmp2 - tmp5), 3)

                            & RANGE_MASK];
                            & RANGE_MASK];

-    outptr[4] = range_limit[(int) DESCALE((INT32) (tmp3 + tmp4), 3)
+    outptr[4] = range_limit[(int) DESCALE((JPEG_INT32) (tmp3 + tmp4), 3)

                            & RANGE_MASK];
                            & RANGE_MASK];

-    outptr[3] = range_limit[(int) DESCALE((INT32) (tmp3 - tmp4), 3)
+    outptr[3] = range_limit[(int) DESCALE((JPEG_INT32) (tmp3 - tmp4), 3)

                            & RANGE_MASK];
     
     wsptr += DCTSIZE;          /* advance pointer to next row */
                            & RANGE_MASK];
     
     wsptr += DCTSIZE;          /* advance pointer to next row */