summaryrefslogtreecommitdiff
path: root/pngpread.c
diff options
context:
space:
mode:
authorGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2008-02-10 15:29:19 -0600
committerGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2009-04-06 16:16:08 -0500
commita5136b88636bf139c947aa30984cac4af3988b70 (patch)
tree3b8388c7a17fe3856d45a3521a62bcf863e49fbf /pngpread.c
parent913bc38217f35eafb00fe6ec424efa93e17901d8 (diff)
downloadlibpng-a5136b88636bf139c947aa30984cac4af3988b70.tar.gz
Imported from libpng-1.2.25rc02.tarv1.2.25rc02
Diffstat (limited to 'pngpread.c')
-rw-r--r--pngpread.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/pngpread.c b/pngpread.c
index 67dd0ab15..1b004d5b9 100644
--- a/pngpread.c
+++ b/pngpread.c
@@ -1,7 +1,7 @@
/* pngpread.c - read a png file in push mode
*
- * Last changed in libpng 1.2.25 [February 6, 2008]
+ * Last changed in libpng 1.2.25 [February 10, 2008]
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2008 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -1018,7 +1018,7 @@ png_read_push_finish_row(png_structp png_ptr)
png_ptr->rowbytes + 1);
do
{
- png_byte pass;
+ int pass;
pass = png_ptr->pass;
pass++;
if ((pass == 1 && png_ptr->width < 5) ||
@@ -1028,6 +1028,7 @@ png_read_push_finish_row(png_structp png_ptr)
if (pass > 7)
pass--;
+ png_ptr->pass = (png_byte) pass;
if (pass < 7)
{
png_ptr->iwidth = (png_ptr->width +
@@ -1048,7 +1049,6 @@ png_read_push_finish_row(png_structp png_ptr)
}
else
break;
- png_ptr->pass = pass;
} while (png_ptr->iwidth == 0 || png_ptr->num_rows == 0);
}