Imported from libpng-1.2.8rc2.tar

This commit is contained in:
Glenn Randers-Pehrson
2004-11-26 17:28:09 -06:00
parent 5dd2b8e208
commit 73b029f9d3
56 changed files with 113 additions and 105 deletions

View File

@@ -1,7 +1,7 @@
/* pngread.c - read a PNG file
*
* libpng 1.2.8rc1 - November 24, 2004
* libpng 1.2.8rc2 - November 26, 2004
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2004 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -746,7 +746,8 @@ png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row)
}
#endif
if (png_ptr->transformations)
if (png_ptr->transformations || (png_ptr->flags&PNG_FLAG_STRIP_ALPHA))
png_do_read_transformations(png_ptr);
#if defined(PNG_READ_INTERLACING_SUPPORTED)
@@ -805,7 +806,7 @@ png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row)
* not called png_set_interlace_handling(), the display_row buffer will
* be ignored, so pass NULL to it.
*
* [*] png_handle_alpha() does not exist yet, as of libpng version 1.2.8rc1
* [*] png_handle_alpha() does not exist yet, as of libpng version 1.2.8rc2
*/
void PNGAPI
@@ -855,7 +856,7 @@ png_read_rows(png_structp png_ptr, png_bytepp row,
* only call this function once. If you desire to have an image for
* each pass of a interlaced image, use png_read_rows() instead.
*
* [*] png_handle_alpha() does not exist yet, as of libpng version 1.2.8rc1
* [*] png_handle_alpha() does not exist yet, as of libpng version 1.2.8rc2
*/
void PNGAPI
png_read_image(png_structp png_ptr, png_bytepp image)