summaryrefslogtreecommitdiff
path: root/pngread.c
diff options
context:
space:
mode:
authorGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2009-08-15 22:02:26 -0500
committerGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2009-08-15 22:02:26 -0500
commitc81bb8a4639e37d8e186b05f3096bea6e1b77f16 (patch)
tree5961dad3ad385d6f940ede8aafc2a377857fe48f /pngread.c
parentb3ce365d911e05faae92f50597a182058878dbc4 (diff)
downloadlibpng-c81bb8a4639e37d8e186b05f3096bea6e1b77f16.tar.gz
[devel] Relocate some png_debug() statements
Putting them ahead of the test for png_ptr==NULL so the debug statements accuratly reflect the fact that the function was entered.
Diffstat (limited to 'pngread.c')
-rw-r--r--pngread.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/pngread.c b/pngread.c
index 3b4b72f74..4da7224ed 100644
--- a/pngread.c
+++ b/pngread.c
@@ -1,7 +1,7 @@
/* pngread.c - read a PNG file
*
- * Last changed in libpng 1.4.0 [August 15, 2009]
+ * Last changed in libpng 1.4.0 [August 16, 2009]
* Copyright (c) 1998-2009 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.)
@@ -199,11 +199,11 @@ png_create_read_struct_2(png_const_charp user_png_ver, png_voidp error_ptr,
void PNGAPI
png_read_info(png_structp png_ptr, png_infop info_ptr)
{
+ png_debug(1, "in png_read_info");
+
if (png_ptr == NULL || info_ptr == NULL)
return;
- png_debug(1, "in png_read_info");
-
/* If we haven't checked all of the PNG signature bytes, do so now. */
if (png_ptr->sig_bytes < 8)
{
@@ -454,11 +454,12 @@ png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row)
PNG_CONST int png_pass_mask[7] = {0x80, 0x08, 0x88, 0x22, 0xaa, 0x55, 0xff};
#endif
int ret;
+
+ png_debug2(1, "in png_read_row (row %lu, pass %d)",
+
if (png_ptr == NULL)
return;
- png_debug2(1, "in png_read_row (row %lu, pass %d)",
-
(unsigned long) png_ptr->row_number, png_ptr->pass);
if (!(png_ptr->flags & PNG_FLAG_ROW_INIT))
png_read_start_row(png_ptr);