When building libjpeg-turbo on Un*x systems, INT32 is usually typedef'ed to long...

This patch also removes an unneeded macro from jdmerge.c.

git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/branches/1.4.x@1403 632fc199-4ca6-4c93-a231-07263d6284db

diff --git a/jdcolor.c b/jdcolor.c
index 272e855690034387d7919dce8bc7efbc16270b21..779fa51ffc9c45ef1eb5e83e764639a05083f5fe 100644 (file)
--- a/jdcolor.c
+++ b/jdcolor.c
@@ -559,7 +559,7 @@ ycck_cmyk_convert (j_decompress_ptr cinfo,
 
 #define PACK_NEED_ALIGNMENT(ptr)     (((size_t)(ptr)) & 3)
 
-#define WRITE_TWO_ALIGNED_PIXELS(addr, pixels)  ((*(INT32 *)(addr)) = pixels)
+#define WRITE_TWO_ALIGNED_PIXELS(addr, pixels)  ((*(int *)(addr)) = pixels)
 
 #define DITHER_565_R(r, dither)  ((r) + ((dither) & 0xFF))
 #define DITHER_565_G(g, dither)  ((g) + (((dither) & 0xFF) >> 1))

diff --git a/jdmerge.c b/jdmerge.c
index 77e93ad6483131eff1322340ece069fdf2fa946c..e13adb9f2122dfc0eeccc190d7f7e5a3100f39ff 100644 (file)
--- a/jdmerge.c
+++ b/jdmerge.c
@@ -443,8 +443,6 @@ h2v2_merged_upsample (j_decompress_ptr cinfo,
   ((INT16*)(addr))[0] = (pixels) >> 16;  \
 }
 
-#define WRITE_TWO_ALIGNED_PIXELS(addr, pixels)  ((*(INT32 *)(addr)) = pixels)
-
 #define DITHER_565_R(r, dither)  ((r) + ((dither) & 0xFF))
 #define DITHER_565_G(g, dither)  ((g) + (((dither) & 0xFF) >> 1))
 #define DITHER_565_B(b, dither)  ((b) + ((dither) & 0xFF))