From a8242fe6fbd0d1de904436c606edc740547b97cc Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Mon, 17 Aug 2015 20:46:27 -0500 Subject: [PATCH] [libng16] Reverted recent mistaken change of 0xnnnn to 0xnnnnUL --- ANNOUNCE | 5 ++- CHANGES | 3 +- example.c | 4 +-- png.c | 94 ++++++++++++++++++++++++++---------------------------- png.h | 10 +++--- pngread.c | 4 +-- pngrtran.c | 8 ++--- pngrutil.c | 15 ++++----- pngset.c | 4 +-- pngwrite.c | 10 +++--- pngwutil.c | 2 +- 11 files changed, 77 insertions(+), 82 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 9db9dbfee..5f389a3cd 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,4 +1,4 @@ -Libpng 1.6.19beta02 - August 17, 2015 +Libpng 1.6.19beta02 - August 18, 2015 This is not intended to be a public release. It will be replaced within a few weeks by a public version or by another test version. @@ -40,7 +40,7 @@ Version 1.6.19beta01 [July 30, 2015] Fixed potential leak of png_pixels in contrib/pngminus/pnm2png.c Fixed uninitialized variable in contrib/gregbook/rpng2-x.c -Version 1.6.19beta02 [August 17, 2015] +Version 1.6.19beta02 [August 18, 2015] Moved config.h.in~ from the "libpng_autotools_files" list to the "libpng_autotools_extra" list in autogen.sh because it was causing a false positive for missing files (bug report by Robert C. Seacord). @@ -48,7 +48,6 @@ Version 1.6.19beta02 [August 17, 2015] to suppress clang warnings (Bug report by Viktor Szakats). Fixed some bad links in the man page. Changed "n bit" to "n-bit" in comments. - Changed 0xnnnn constants to 0xnnnnUL. Added signed/unsigned 16-bit safety net. This removes the dubious 0x8000 flag definitions on 16-bit systems. They aren't supported yet the defs *probably* work, however it seems much safer to do this diff --git a/CHANGES b/CHANGES index 7de2db25e..8cc524d63 100644 --- a/CHANGES +++ b/CHANGES @@ -5320,7 +5320,7 @@ Version 1.6.19beta01 [July 30, 2015] Fixed potential leak of png_pixels in contrib/pngminus/pnm2png.c Fixed uninitialized variable in contrib/gregbook/rpng2-x.c -Version 1.6.19beta02 [August 17, 2015] +Version 1.6.19beta02 [August 18, 2015] Moved config.h.in~ from the "libpng_autotools_files" list to the "libpng_autotools_extra" list in autogen.sh because it was causing a false positive for missing files (bug report by Robert C. Seacord). @@ -5328,7 +5328,6 @@ Version 1.6.19beta02 [August 17, 2015] to suppress clang warnings (Bug report by Viktor Szakats). Fixed some bad links in the man page. Changed "n bit" to "n-bit" in comments. - Changed 0xnnnn constants to 0xnnnnUL. Added signed/unsigned 16-bit safety net. This removes the dubious 0x8000 flag definitions on 16-bit systems. They aren't supported yet the defs *probably* work, however it seems much safer to do this diff --git a/example.c b/example.c index 704ff664b..0a241413b 100644 --- a/example.c +++ b/example.c @@ -271,7 +271,7 @@ void read_png(char *file_name) /* We need to open the file */ { png_structp png_ptr; png_infop info_ptr; - unsigned int sig_read = 0; + int sig_read = 0; png_uint_32 width, height; int bit_depth, color_type, interlace_type; FILE *fp; @@ -280,7 +280,7 @@ void read_png(char *file_name) /* We need to open the file */ return (ERROR); #else no_open_file /* prototype 2 */ -void read_png(FILE *fp, unsigned int sig_read) /* File is already open */ +void read_png(FILE *fp, int sig_read) /* File is already open */ { png_structp png_ptr; png_infop info_ptr; diff --git a/png.c b/png.c index 09dc5c71a..47b9e2deb 100644 --- a/png.c +++ b/png.c @@ -769,13 +769,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.19beta02 - August 17, 2015" PNG_STRING_NEWLINE \ + "libpng version 1.6.19beta02 - August 18, 2015" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2015 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \ "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \ "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \ PNG_STRING_NEWLINE; # else - return "libpng version 1.6.19beta02 - August 17, 2015\ + return "libpng version 1.6.19beta02 - August 18, 2015\ Copyright (c) 1998-2015 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."; @@ -1512,10 +1512,10 @@ png_XYZ_normalize(png_XYZ *XYZ) * safe. */ Y = XYZ->red_Y; - if (0x7fffffffL - Y < XYZ->green_X) + if (0x7fffffff - Y < XYZ->green_X) return 1; Y += XYZ->green_Y; - if (0x7fffffffL - Y < XYZ->blue_X) + if (0x7fffffff - Y < XYZ->blue_X) return 1; Y += XYZ->blue_Y; @@ -1743,7 +1743,7 @@ png_colorspace_set_endpoints(png_const_structrp png_ptr, static char png_icc_tag_char(png_uint_32 byte) { - byte &= 0xffU; + byte &= 0xff; if (byte >= 32 && byte <= 126) return (char)byte; else @@ -1967,7 +1967,7 @@ png_icc_check_header(png_const_structrp png_ptr, png_colorspacerp colorspace, * 16 bits. */ temp = png_get_uint_32(profile+64); - if (temp >= 0xffffUL) /* The ICC limit */ + if (temp >= 0xffff) /* The ICC limit */ return png_icc_profile_error(png_ptr, colorspace, name, temp, "invalid rendering intent"); @@ -1991,7 +1991,7 @@ png_icc_check_header(png_const_structrp png_ptr, png_colorspacerp colorspace, * data.) */ temp = png_get_uint_32(profile+36); /* signature 'ascp' */ - if (temp != 0x61637370UL) + if (temp != 0x61637370) return png_icc_profile_error(png_ptr, colorspace, name, temp, "invalid signature"); @@ -2029,13 +2029,13 @@ png_icc_check_header(png_const_structrp png_ptr, png_colorspacerp colorspace, temp = png_get_uint_32(profile+16); /* data colour space field */ switch (temp) { - case 0x52474220UL: /* 'RGB ' */ + case 0x52474220: /* 'RGB ' */ if ((color_type & PNG_COLOR_MASK_COLOR) == 0) return png_icc_profile_error(png_ptr, colorspace, name, temp, "RGB color space not permitted on grayscale PNG"); break; - case 0x47524159UL: /* 'GRAY' */ + case 0x47524159: /* 'GRAY' */ if ((color_type & PNG_COLOR_MASK_COLOR) != 0) return png_icc_profile_error(png_ptr, colorspace, name, temp, "Gray color space not permitted on RGB PNG"); @@ -2058,19 +2058,19 @@ png_icc_check_header(png_const_structrp png_ptr, png_colorspacerp colorspace, temp = png_get_uint_32(profile+12); /* profile/device class */ switch (temp) { - case 0x73636e72UL: /* 'scnr' */ - case 0x6d6e7472UL: /* 'mntr' */ - case 0x70727472UL: /* 'prtr' */ - case 0x73706163UL: /* 'spac' */ + case 0x73636e72: /* 'scnr' */ + case 0x6d6e7472: /* 'mntr' */ + case 0x70727472: /* 'prtr' */ + case 0x73706163: /* 'spac' */ /* All supported */ break; - case 0x61627374UL: /* 'abst' */ + case 0x61627374: /* 'abst' */ /* May not be embedded in an image */ return png_icc_profile_error(png_ptr, colorspace, name, temp, "invalid embedded Abstract ICC profile"); - case 0x6c696e6bUL: /* 'link' */ + case 0x6c696e6b: /* 'link' */ /* DeviceLink profiles cannot be interpreted in a non-device specific * fashion, if an app uses the AToB0Tag in the profile the results are * undefined unless the result is sent to the intended device, @@ -2080,7 +2080,7 @@ png_icc_check_header(png_const_structrp png_ptr, png_colorspacerp colorspace, return png_icc_profile_error(png_ptr, colorspace, name, temp, "unexpected DeviceLink ICC profile class"); - case 0x6e6d636cUL: /* 'nmcl' */ + case 0x6e6d636c: /* 'nmcl' */ /* A NamedColor profile is also device specific, however it doesn't * contain an AToB0 tag that is open to misinterpretation. Almost * certainly it will fail the tests below. @@ -2106,8 +2106,8 @@ png_icc_check_header(png_const_structrp png_ptr, png_colorspacerp colorspace, temp = png_get_uint_32(profile+20); switch (temp) { - case 0x58595a20UL: /* 'XYZ ' */ - case 0x4c616220UL: /* 'Lab ' */ + case 0x58595a20: /* 'XYZ ' */ + case 0x4c616220: /* 'Lab ' */ break; default: @@ -2184,22 +2184,22 @@ static const struct * all four ICC sRGB profiles from www.color.org. */ /* adler32, crc32, MD5[4], intent, date, length, file-name */ - PNG_ICC_CHECKSUM(0x0a3fd9f6UL, 0x3b8772b9UL, - PNG_MD5(0x29f83ddeUL, 0xaff255aeUL, 0x7842fae4UL, 0xca83390dUL), 0, 0, + PNG_ICC_CHECKSUM(0x0a3fd9f6, 0x3b8772b9, + PNG_MD5(0x29f83dde, 0xaff255ae, 0x7842fae4, 0xca83390d), 0, 0, "2009/03/27 21:36:31", 3048, "sRGB_IEC61966-2-1_black_scaled.icc") /* ICC sRGB v2 perceptual no black-compensation: */ - PNG_ICC_CHECKSUM(0x4909e5e1UL, 0x427ebb21UL, - PNG_MD5(0xc95bd637UL, 0xe95d8a3bUL, 0x0df38f99UL, 0xc1320389UL), 1, 0, + PNG_ICC_CHECKSUM(0x4909e5e1, 0x427ebb21, + PNG_MD5(0xc95bd637, 0xe95d8a3b, 0x0df38f99, 0xc1320389), 1, 0, "2009/03/27 21:37:45", 3052, "sRGB_IEC61966-2-1_no_black_scaling.icc") - PNG_ICC_CHECKSUM(0xfd2144a1UL, 0x306fd8aeUL, - PNG_MD5(0xfc663378UL, 0x37e2886bUL, 0xfd72e983UL, 0x8228f1b8UL), 0, 0, + PNG_ICC_CHECKSUM(0xfd2144a1, 0x306fd8ae, + PNG_MD5(0xfc663378, 0x37e2886b, 0xfd72e983, 0x8228f1b8), 0, 0, "2009/08/10 17:28:01", 60988, "sRGB_v4_ICC_preference_displayclass.icc") /* ICC sRGB v4 perceptual */ - PNG_ICC_CHECKSUM(0x209c35d2UL, 0xbbef7812UL, - PNG_MD5(0x34562abfUL, 0x994ccd06UL, 0x6d2c5721UL, 0xd0d68c5dUL), 0, 0, + PNG_ICC_CHECKSUM(0x209c35d2, 0xbbef7812, + PNG_MD5(0x34562abf, 0x994ccd06, 0x6d2c5721, 0xd0d68c5d), 0, 0, "2007/07/25 00:05:37", 60960, "sRGB_v4_ICC_preference.icc") /* The following profiles have no known MD5 checksum. If there is a match @@ -2207,8 +2207,8 @@ static const struct * a warning is produced. The first two of these profiles have a 'cprt' tag * which suggests that they were also made by Hewlett Packard. */ - PNG_ICC_CHECKSUM(0xa054d762UL, 0x5d5129ceUL, - PNG_MD5(0x00000000UL, 0x00000000UL, 0x00000000UL, 0x00000000UL), 1, 0, + PNG_ICC_CHECKSUM(0xa054d762, 0x5d5129ce, + PNG_MD5(0x00000000, 0x00000000, 0x00000000, 0x00000000), 1, 0, "2004/07/21 18:57:42", 3024, "sRGB_IEC61966-2-1_noBPC.icc") /* This is a 'mntr' (display) profile with a mediaWhitePointTag that does not @@ -2218,14 +2218,12 @@ static const struct * the previous profile except for the mediaWhitePointTag error and a missing * chromaticAdaptationTag. */ - PNG_ICC_CHECKSUM(0xf784f3fbUL, 0x182ea552UL, - PNG_MD5(0x00000000UL, 0x00000000UL, 0x00000000UL, 0x00000000UL), - 0, 1/*broken*/, + PNG_ICC_CHECKSUM(0xf784f3fb, 0x182ea552, + PNG_MD5(0x00000000, 0x00000000, 0x00000000, 0x00000000), 0, 1/*broken*/, "1998/02/09 06:49:00", 3144, "HP-Microsoft sRGB v2 perceptual") - PNG_ICC_CHECKSUM(0x0398f3fcUL, 0xf29e526dUL, - PNG_MD5(0x00000000UL, 0x00000000UL, 0x00000000UL, 0x00000000UL), - 1, 1/*broken*/, + PNG_ICC_CHECKSUM(0x0398f3fc, 0xf29e526d, + PNG_MD5(0x00000000, 0x00000000, 0x00000000, 0x00000000), 1, 1/*broken*/, "1998/02/09 06:49:00", 3144, "HP-Microsoft sRGB v2 media-relative") }; @@ -2242,7 +2240,7 @@ png_compare_ICC_profile_with_sRGB(png_const_structrp png_ptr, */ png_uint_32 length = 0; - png_uint_32 intent = 0x10000UL; /* invalid */ + png_uint_32 intent = 0x10000; /* invalid */ #if PNG_sRGB_PROFILE_CHECKS > 1 uLong crc = 0; /* the value for 0 length data */ #endif @@ -3151,7 +3149,7 @@ png_ascii_from_fixed(png_const_structrp png_ptr, png_charp ascii, else num = fp; - if (num <= 0x80000000UL) /* else overflowed */ + if (num <= 0x80000000) /* else overflowed */ { unsigned int ndigits = 0, first = 16 /* flag value */; char digits[10]; @@ -3285,15 +3283,15 @@ png_muldiv(png_fixed_point_p res, png_fixed_point a, png_int_32 times, /* Following can't overflow because the arguments only * have 31 bits each, however the result may be 32 bits. */ - s16 = (A >> 16) * (T & 0xffffUL) + - (A & 0xffffUL) * (T >> 16); + s16 = (A >> 16) * (T & 0xffff) + + (A & 0xffff) * (T >> 16); /* Can't overflow because the a*times bit is only 30 * bits at most. */ s32 = (A >> 16) * (T >> 16) + (s16 >> 16); - s00 = (A & 0xffffUL) * (T & 0xffffUL); + s00 = (A & 0xffff) * (T & 0xffff); - s16 = (s16 & 0xffffUL) << 16; + s16 = (s16 & 0xffff) << 16; s00 += s16; if (s00 < s16) @@ -3586,19 +3584,19 @@ png_log16bit(png_uint_32 x) unsigned int lg2 = 0; /* As above, but now the input has 16 bits. */ - if ((x &= 0xffffUL) == 0) + if ((x &= 0xffff) == 0) return -1; - if ((x & 0xff00UL) == 0) + if ((x & 0xff00) == 0) lg2 = 8, x <<= 8; - if ((x & 0xf000UL) == 0) + if ((x & 0xf000) == 0) lg2 += 4, x <<= 4; - if ((x & 0xc000UL) == 0) + if ((x & 0xc000) == 0) lg2 += 2, x <<= 2; - if ((x & 0x8000UL) == 0) + if ((x & 0x8000) == 0) lg2 += 1, x <<= 1; /* Calculate the base logarithm from the top 8 bits as a 28-bit fractional @@ -3675,7 +3673,7 @@ for (i=11;i>=0;--i){ print i, " ", (1 - e(-(2^i)/65536*l(2))) * 2^(32-i), "\n"} static png_uint_32 png_exp(png_fixed_point x) { - if (x > 0 && x <= 0xfffffUL) /* Else overflow or zero (underflow) */ + if (x > 0 && x <= 0xfffff) /* Else overflow or zero (underflow) */ { /* Obtain a 4-bit approximation */ png_uint_32 e = png_32bit_exp[(x >> 12) & 0x0f]; @@ -3731,7 +3729,7 @@ png_exp8bit(png_fixed_point lg2) * step. */ x -= x >> 8; - return (png_byte)(((x + 0x7fffffUL) >> 24) & 0xff); + return (png_byte)(((x + 0x7fffffU) >> 24) & 0xff); } #ifdef PNG_16BIT_SUPPORTED @@ -3991,7 +3989,7 @@ png_build_16to8_table(png_structrp png_ptr, png_uint_16pp *ptable, /* And fill in the final entries. */ while (last < (num << 8)) { - table[last & (0xffU >> shift)][last >> (8U - shift)] = 65535U; + table[last & (0xff >> shift)][last >> (8U - shift)] = 65535U; last++; } } diff --git a/png.h b/png.h index 106db7340..c0f1b9c05 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.19beta02, August 17, 2015 + * libpng version 1.6.19beta02, August 18, 2015 * * Copyright (c) 1998-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -12,7 +12,7 @@ * Authors and maintainers: * libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat * libpng versions 0.89, June 1996, through 0.96, May 1997: Andreas Dilger - * libpng versions 0.97, January 1998, through 1.6.19beta02, August 17, 2015: Glenn + * libpng versions 0.97, January 1998, through 1.6.19beta02, August 18, 2015: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -251,7 +251,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.0.7, July 1, 2000, through 1.6.19beta02, August 17, 2015, are + * libpng versions 1.0.7, July 1, 2000, through 1.6.19beta02, August 18, 2015, are * Copyright (c) 2000-2002, 2004, 2006-2015 Glenn Randers-Pehrson, and are * distributed according to the same disclaimer and license as libpng-1.0.6 * with the following individuals added to the list of Contributing Authors: @@ -360,7 +360,7 @@ * Y2K compliance in libpng: * ========================= * - * August 17, 2015 + * August 18, 2015 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -430,7 +430,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.6.19beta02" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.19beta02 - August 17, 2015\n" + " libpng version 1.6.19beta02 - August 18, 2015\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 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); diff --git a/pngrtran.c b/pngrtran.c index e396abc18..284226aeb 100644 --- a/pngrtran.c +++ b/pngrtran.c @@ -3642,7 +3642,7 @@ png_do_compose(png_row_infop row_info, png_bytep row, png_structrp png_ptr) png_uint_16 a = (png_uint_16)(((*(sp + 2)) << 8) + *(sp + 3)); - if (a == (png_uint_16)0xffffL) + if (a == (png_uint_16)0xffff) { png_uint_16 v; @@ -3691,7 +3691,7 @@ png_do_compose(png_row_infop row_info, png_bytep row, png_structrp png_ptr) *(sp + 1) = (png_byte)(png_ptr->background.gray & 0xff); } - else if (a < 0xffffL) + else if (a < 0xffff) { png_uint_16 g, v; @@ -3795,7 +3795,7 @@ png_do_compose(png_row_infop row_info, png_bytep row, png_structrp png_ptr) png_uint_16 a = (png_uint_16)(((png_uint_16)(*(sp + 6)) << 8) + (png_uint_16)(*(sp + 7))); - if (a == (png_uint_16)0xffffL) + if (a == (png_uint_16)0xffff) { png_uint_16 v; @@ -3881,7 +3881,7 @@ png_do_compose(png_row_infop row_info, png_bytep row, png_structrp png_ptr) *(sp + 5) = (png_byte)(png_ptr->background.blue & 0xff); } - else if (a < 0xffffL) + else if (a < 0xffff) { png_uint_16 v; diff --git a/pngrutil.c b/pngrutil.c index 68be1b357..4927d14dd 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -85,10 +85,10 @@ png_int_32 (PNGAPI png_get_int_32)(png_const_bytep buf) { png_uint_32 uval = png_get_uint_32(buf); - if ((uval & 0x80000000UL) == 0) /* non-negative */ + if ((uval & 0x80000000) == 0) /* non-negative */ return uval; - uval = (uval ^ 0xffffffffU) + 1; /* 2's complement: -x = ~x+1 */ + uval = (uval ^ 0xffffffff) + 1; /* 2's complement: -x = ~x+1 */ return -(png_int_32)uval; } @@ -3120,10 +3120,10 @@ png_combine_row(png_const_structrp png_ptr, png_bytep dp, int display) # define PNG_LSR(x,s) ((x)>>(s)) # define PNG_LSL(x,s) ((x)<<(s)) # endif -# define S_COPY(p,x) (((p)<4 ? PNG_LSR(0x80088822UL,(3-(p))*8+(7-(x))) :\ - PNG_LSR(0xaa55ff00UL,(7-(p))*8+(7-(x)))) & 1) -# define B_COPY(p,x) (((p)<4 ? PNG_LSR(0xff0fff33UL,(3-(p))*8+(7-(x))) :\ - PNG_LSR(0xff55ff00UL,(7-(p))*8+(7-(x)))) & 1) +# define S_COPY(p,x) (((p)<4 ? PNG_LSR(0x80088822,(3-(p))*8+(7-(x))) :\ + PNG_LSR(0xaa55ff00,(7-(p))*8+(7-(x)))) & 1) +# define B_COPY(p,x) (((p)<4 ? PNG_LSR(0xff0fff33,(3-(p))*8+(7-(x))) :\ + PNG_LSR(0xff55ff00,(7-(p))*8+(7-(x)))) & 1) /* Return a mask for pass 'p' pixel 'x' at depth 'd'. The mask is * little endian - the first pixel is at bit 0 - however the extra @@ -3143,8 +3143,7 @@ png_combine_row(png_const_structrp png_ptr, png_bytep dp, int display) * cases the result needs replicating, for the 4-bpp case the above * generates a full 32 bits. */ -# define MASK_EXPAND(m,d) \ - ((m)*((d)==1?0x01010101UL:((d)==2?0x00010001UL:1))) +# define MASK_EXPAND(m,d) ((m)*((d)==1?0x01010101:((d)==2?0x00010001:1))) # define S_MASK(p,d,s) MASK_EXPAND(S_MASKx(p,0,d,s) + S_MASKx(p,1,d,s) +\ S_MASKx(p,2,d,s) + S_MASKx(p,3,d,s) + S_MASKx(p,4,d,s) +\ diff --git a/pngset.c b/pngset.c index dd691ec37..6c6beac9f 100644 --- a/pngset.c +++ b/pngset.c @@ -709,7 +709,7 @@ png_set_text_2(png_const_structrp png_ptr, png_inforp info_ptr, { int i; - png_debug1(1, "in %lx storage function", png_ptr == NULL ? 0xabadca11UL : + png_debug1(1, "in %lx storage function", png_ptr == NULL ? 0xabadca11U : (unsigned long)png_ptr->chunk_name); if (png_ptr == NULL || info_ptr == NULL || num_text <= 0 || text_ptr == NULL) @@ -1568,7 +1568,7 @@ png_set_user_limits (png_structrp png_ptr, png_uint_32 user_width_max, { /* Images with dimensions larger than these limits will be * rejected by png_set_IHDR(). To accept any PNG datastream - * regardless of dimensions, set both limits to 0x7ffffffUL. + * regardless of dimensions, set both limits to 0x7ffffff. */ if (png_ptr == NULL) return; diff --git a/pngwrite.c b/pngwrite.c index 9d2d54afb..2da3f01f3 100644 --- a/pngwrite.c +++ b/pngwrite.c @@ -669,8 +669,8 @@ png_do_write_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 = (png_uint_32)((s0 - s1) & 0xffffUL); - png_uint_32 blue = (png_uint_32)((s2 - s1) & 0xffffUL); + png_uint_32 red = (png_uint_32)((s0 - s1) & 0xffffL); + png_uint_32 blue = (png_uint_32)((s2 - s1) & 0xffffL); *(rp ) = (png_byte)(red >> 8); *(rp + 1) = (png_byte)red; *(rp + 4) = (png_byte)(blue >> 8); @@ -1570,7 +1570,7 @@ png_write_image_16bit(png_voidp argument) * is only initialized when required. */ if (alpha > 0 && alpha < 65535) - reciprocal = ((0xffffU<<15)+(alpha>>1))/alpha; + reciprocal = ((0xffff<<15)+(alpha>>1))/alpha; c = channels; do /* always at least one channel */ @@ -1621,7 +1621,7 @@ png_write_image_16bit(png_voidp argument) * calculation can be done to 15 bits of accuracy; however, the output needs to * be scaled in the range 0..255*65535, so include that scaling here. */ -# define UNP_RECIPROCAL(alpha) ((((0xffffU*0xffU)<<7)+(alpha>>1))/alpha) +# define UNP_RECIPROCAL(alpha) ((((0xffff*0xff)<<7)+(alpha>>1))/alpha) static png_byte png_unpremultiply(png_uint_32 component, png_uint_32 alpha, @@ -1836,7 +1836,7 @@ png_image_set_PLTE(png_image_write_control *display) * divided by 128 (i.e. asr 7). */ if (alphabyte > 0 && alphabyte < 255) - reciprocal = (((0xffffU*0xffU)<<7)+(alpha>>1))/alpha; + reciprocal = (((0xffff*0xff)<<7)+(alpha>>1))/alpha; tRNS[i] = alphabyte; if (alphabyte < 255) diff --git a/pngwutil.c b/pngwutil.c index c4360a4fd..957527584 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -237,7 +237,7 @@ png_image_size(png_structrp png_ptr) } else - return 0xffffffffUL; + return 0xffffffffU; } #ifdef PNG_WRITE_OPTIMIZE_CMF_SUPPORTED