diff options
| author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2013-02-22 14:55:27 -0600 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2013-05-12 12:12:08 -0500 |
| commit | ae8174d9a35605148e9b5ddcc02e4608d8739a65 (patch) | |
| tree | 2d0a8aa3f9d0b3e627bc797f71d1f3d74f8fd849 /pngrutil.c | |
| parent | a3bece6bb79b34c0b70a963fc7543dbdd5d11bb5 (diff) | |
| download | libpng-ae8174d9a35605148e9b5ddcc02e4608d8739a65.tar.gz | |
[libpng15] Imported from libpng-1.5.15beta06.tar
Diffstat (limited to 'pngrutil.c')
| -rw-r--r-- | pngrutil.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pngrutil.c b/pngrutil.c index 844c6d8b0..5ee452d57 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,7 +1,7 @@ /* pngrutil.c - utilities to read a PNG file * - * Last changed in libpng 1.5.15 [March 28, 2013] + * Last changed in libpng 1.5.14 [January 24, 2013] * Copyright (c) 1998-2013 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) @@ -18,6 +18,8 @@ #ifdef PNG_READ_SUPPORTED +#define png_strtod(p,a,b) strtod(a,b) + png_uint_32 PNGAPI png_get_uint_31(png_structp png_ptr, png_const_bytep buf) { @@ -3159,7 +3161,7 @@ png_combine_row(png_structp png_ptr, png_bytep dp, int display) { png_uint_32p dp32 = (png_uint_32p)dp; png_const_uint_32p sp32 = (png_const_uint_32p)sp; - size_t skip = (bytes_to_jump-bytes_to_copy) / + unsigned int skip = (bytes_to_jump-bytes_to_copy) / sizeof (png_uint_32); do @@ -3200,7 +3202,7 @@ png_combine_row(png_structp png_ptr, png_bytep dp, int display) { png_uint_16p dp16 = (png_uint_16p)dp; png_const_uint_16p sp16 = (png_const_uint_16p)sp; - size_t skip = (bytes_to_jump-bytes_to_copy) / + unsigned int skip = (bytes_to_jump-bytes_to_copy) / sizeof (png_uint_16); do |