diff options
| author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2015-08-17 20:46:27 -0500 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2015-08-17 20:46:27 -0500 |
| commit | a8242fe6fbd0d1de904436c606edc740547b97cc (patch) | |
| tree | b3392e7bd4782b2bc9d1fe37d9ce576e29feb0b9 /pngwrite.c | |
| parent | 15e69748f11d4948798f11bb00df9ff7626fde85 (diff) | |
[libng16] Reverted recent mistaken change of 0xnnnn to 0xnnnnUL
Diffstat (limited to 'pngwrite.c')
| -rw-r--r-- | pngwrite.c | 10 |
1 files changed, 5 insertions, 5 deletions
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) |