diff options
| author | John Bowler <jbowler@acm.org> | 2011-09-09 17:21:44 -0500 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2011-09-09 17:21:44 -0500 |
| commit | 751561218ffa1cfdd60a83236642a8e16f071130 (patch) | |
| tree | 966755b0c694f8d4ab59c1b077964f4848f4e3ed /pngrtran.c | |
| parent | f0c19e6455d54340949ec9f85c9b386225bbbee0 (diff) | |
| download | libpng-751561218ffa1cfdd60a83236642a8e16f071130.tar.gz | |
[libpng15] Constant changes for 64-bit compatibility (removal of L suffixes).
The 16-bit cases still use "L" as we don't have a 16-bit test system.
Diffstat (limited to 'pngrtran.c')
| -rw-r--r-- | pngrtran.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pngrtran.c b/pngrtran.c index 151ac16e4..c6dd28808 100644 --- a/pngrtran.c +++ b/pngrtran.c @@ -973,8 +973,8 @@ png_set_rgb_to_gray_fixed(png_structp png_ptr, int error_action, * overwrites the coefficients, regardless of whether they have been * defaulted or set already. */ - red_int = (png_uint_16)(((png_uint_32)red*32768L)/100000L); - green_int = (png_uint_16)(((png_uint_32)green*32768L)/100000L); + red_int = (png_uint_16)(((png_uint_32)red*32768)/100000); + green_int = (png_uint_16)(((png_uint_32)green*32768)/100000); png_ptr->rgb_to_gray_red_coeff = red_int; png_ptr->rgb_to_gray_green_coeff = green_int; @@ -4917,8 +4917,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 = (png_uint_32)((s0 + s1 + 65536L) & 0xffffL); - png_uint_32 blue = (png_uint_32)((s2 + s1 + 65536L) & 0xffffL); + 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); |