Restored compiling png_combine_row() for progressive readers.

Only png_read_finish_row() can be omitted.
This commit is contained in:
Glenn Randers-Pehrson 2009-05-18 13:40:23 -05:00
parent 6b60a31ebf
commit 286467db82
3 changed files with 4 additions and 6 deletions

View File

@ -54,8 +54,8 @@ version 1.2.37beta01 [May 14, 2009]
version 1.2.37beta02 [May 18, 2009] version 1.2.37beta02 [May 18, 2009]
Fixed typo in libpng documentation (FILTER_AVE should be FILTER_AVG) Fixed typo in libpng documentation (FILTER_AVE should be FILTER_AVG)
Relocated misplaced #endif in pngwrite.c, sCAL chunk handler. Relocated misplaced #endif in pngwrite.c, sCAL chunk handler.
Conditionally compile png_combine_row() and png_read_finish_row() Conditionally png_read_finish_row() which is not used by progressive
which are not used by progressive readers. readers.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net

View File

@ -2379,8 +2379,8 @@ version 1.2.37beta01 [May 14, 2009]
version 1.2.37beta02 [May 18, 2009] version 1.2.37beta02 [May 18, 2009]
Fixed typo in libpng documentation (FILTER_AVE should be FILTER_AVG) Fixed typo in libpng documentation (FILTER_AVE should be FILTER_AVG)
Relocated misplaced #endif in pngwrite.c, sCAL chunk handler. Relocated misplaced #endif in pngwrite.c, sCAL chunk handler.
Conditionally compile png_combine_row() and png_read_finish_row() Conditionally compile png_read_finish_row() which is not used by
which are not used by progressive readers. progressive readers.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

View File

@ -2325,7 +2325,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 /* Combines the row recently read in with the existing pixels in the
row. This routine takes care of alpha and transparency if requested. row. This routine takes care of alpha and transparency if requested.
This routine also handles the two methods of progressive display This routine also handles the two methods of progressive display
@ -2537,7 +2536,6 @@ png_combine_row(png_structp png_ptr, png_bytep row, int mask)
} }
} }
} }
#endif /* PNG_NO_SEQUENTIAL_READ_SUPPORTED */
#ifdef PNG_READ_INTERLACING_SUPPORTED #ifdef PNG_READ_INTERLACING_SUPPORTED
/* OLD pre-1.0.9 interface: /* OLD pre-1.0.9 interface: