summaryrefslogtreecommitdiff
path: root/pngread.c
diff options
context:
space:
mode:
authorGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2015-08-17 20:46:27 -0500
committerGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2015-08-17 20:46:27 -0500
commita8242fe6fbd0d1de904436c606edc740547b97cc (patch)
treeb3392e7bd4782b2bc9d1fe37d9ce576e29feb0b9 /pngread.c
parent15e69748f11d4948798f11bb00df9ff7626fde85 (diff)
downloadlibpng-a8242fe6fbd0d1de904436c606edc740547b97cc.tar.gz
[libng16] Reverted recent mistaken change of 0xnnnn to 0xnnnnUL
Diffstat (limited to 'pngread.c')
-rw-r--r--pngread.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/pngread.c b/pngread.c
index 1366140e7..48aae8488 100644
--- a/pngread.c
+++ b/pngread.c
@@ -359,8 +359,8 @@ png_do_read_intrapixel(png_row_infop row_info, png_bytep row)
png_uint_32 s0 = (*(rp ) << 8) | *(rp + 1);
png_uint_32 s1 = (*(rp + 2) << 8) | *(rp + 3);
png_uint_32 s2 = (*(rp + 4) << 8) | *(rp + 5);
- png_uint_32 red = (s0 + s1 + 65536) & 0xffffUL;
- png_uint_32 blue = (s2 + s1 + 65536) & 0xffffUL;
+ png_uint_32 red = (s0 + s1 + 65536) & 0xffff;
+ png_uint_32 blue = (s2 + s1 + 65536) & 0xffff;
*(rp ) = (png_byte)((red >> 8) & 0xff);
*(rp + 1) = (png_byte)(red & 0xff);
*(rp + 4) = (png_byte)((blue >> 8) & 0xff);