diff options
| author | John Bowler <jbowler@acm.org> | 2011-02-16 06:13:46 -0600 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2011-02-16 06:13:46 -0600 |
| commit | 9616ad9828e9d881007f4c503c17bb1d6d1c1567 (patch) | |
| tree | 8648d1b04a97b12d0b788474c838922b47220f24 /pngtrans.c | |
| parent | 8ea598b1d10edc365e8c10eb6e254fa6911ac09b (diff) | |
| download | libpng-9616ad9828e9d881007f4c503c17bb1d6d1c1567.tar.gz | |
[devel] Revert png_get_current_row_number() to previous (1.5.2beta01) behavior.
Diffstat (limited to 'pngtrans.c')
| -rw-r--r-- | pngtrans.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/pngtrans.c b/pngtrans.c index 8cec44ef4..c58112a3e 100644 --- a/pngtrans.c +++ b/pngtrans.c @@ -652,16 +652,11 @@ png_get_user_transform_ptr(png_const_structp png_ptr) png_uint_32 PNGAPI png_get_current_row_number(png_const_structp png_ptr) { - /* This API returns the row in output, not the input row: */ + /* See the comments in png.h - this is the sub-image row when reading and + * interlaced image. + */ if (png_ptr != NULL) - { - if (png_ptr->interlaced == PNG_INTERLACE_NONE) - return png_ptr->row_number; - else if (png_ptr->interlaced == PNG_INTERLACE_ADAM7) - return PNG_ROW_FROM_PASS_ROW(png_ptr->row_number, png_ptr->pass); - - /* Else something bad is happening: */ - } + return png_ptr->row_number; return PNG_UINT_32_MAX; /* help the app not to fail silently */ } |