cheng/libpng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Restore png_combine_row() to progressive-read-only builds.

Browse Source
This commit is contained in:
Glenn Randers-Pehrson 2009-05-18 15:28:44 -05:00
parent 5902059c7c
commit 0ab7868d8a
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ANNOUNCE
View File

@ -455,8 +455,8 @@ version 1.4.0beta59 [May 15, 2009]
Relocated misplaced #endif in pngwrite.c, sCAL chunk handler. Relocated misplaced #endif in pngwrite.c, sCAL chunk handler.
version 1.4.0beta60 [May 18, 2009] version 1.4.0beta60 [May 18, 2009]
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.
version 1.4.0betaN [future] version 1.4.0betaN [future]
Build shared libraries with -lz and sometimes -lm. Build shared libraries with -lz and sometimes -lm.

4
CHANGES
View File

@ -2132,8 +2132,8 @@ version 1.4.0beta59 [May 15, 2009]
Relocated misplaced #endif in pngwrite.c, sCAL chunk handler. Relocated misplaced #endif in pngwrite.c, sCAL chunk handler.
version 1.4.0beta60 [May 18, 2009] version 1.4.0beta60 [May 18, 2009]
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.
version 1.4.0betaN [future] version 1.4.0betaN [future]
Build shared libraries with -lz and sometimes -lm. Build shared libraries with -lz and sometimes -lm.

2
pngrutil.c
View File

@ -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 /* 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
@ -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 #ifdef PNG_READ_INTERLACING_SUPPORTED
/* OLD pre-1.0.9 interface: /* OLD pre-1.0.9 interface: