From 0ab7868d8ad67c0b4f346520f2c112ec1d57594f Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Mon, 18 May 2009 15:28:44 -0500 Subject: [PATCH] Restore png_combine_row() to progressive-read-only builds. --- ANNOUNCE | 4 ++-- CHANGES | 4 ++-- pngrutil.c | 2 -- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 8623181c8..510984288 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -455,8 +455,8 @@ version 1.4.0beta59 [May 15, 2009] Relocated misplaced #endif in pngwrite.c, sCAL chunk handler. version 1.4.0beta60 [May 18, 2009] - Conditionally compile png_combine_row() and png_read_finish_row() - which are not used by progressive readers. + Conditionally compile png_read_finish_row() which is not used by + progressive readers. version 1.4.0betaN [future] Build shared libraries with -lz and sometimes -lm. diff --git a/CHANGES b/CHANGES index 4d4e5f3b1..3674958de 100644 --- a/CHANGES +++ b/CHANGES @@ -2132,8 +2132,8 @@ version 1.4.0beta59 [May 15, 2009] Relocated misplaced #endif in pngwrite.c, sCAL chunk handler. version 1.4.0beta60 [May 18, 2009] - Conditionally compile png_combine_row() and png_read_finish_row() - which are not used by progressive readers. + Conditionally compile png_read_finish_row() which is not used by + progressive readers. version 1.4.0betaN [future] Build shared libraries with -lz and sometimes -lm. diff --git a/pngrutil.c b/pngrutil.c index 24b4eb281..4c792250c 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -2404,7 +2404,6 @@ png_check_chunk_name(png_structp png_ptr, png_bytep chunk_name) } } -#ifndef PNG_NO_SEQUENTIAL_READ_SUPPORTED /* Combines the row recently read in with the existing pixels in the row. This routine takes care of alpha and transparency if requested. This routine also handles the two methods of progressive display @@ -2616,7 +2615,6 @@ png_combine_row(png_structp png_ptr, png_bytep row, int mask) } } } -#endif /* PNG_NO_SEQUENTIAL_READ_SUPPORTED */ #ifdef PNG_READ_INTERLACING_SUPPORTED /* OLD pre-1.0.9 interface: