commit 73b029f9d39e27db5e423c92a2c553f760997540
author Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Fri Nov 26 17:28:09 2004 -0600
committer Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Mon Apr 06 16:08:13 2009 -0500
tree 520595660c159a31cf92f0cee2b45ce5c031d974
parent 5dd2b8e208855642b692695653c181b2fe7f919d

Imported from libpng-1.2.8rc2.tar

pngpread.c

diff --git a/pngpread.c b/pngpread.c
index 85c5ba5..c735e4f 100644
--- a/pngpread.c
+++ b/pngpread.c
@@ -1,7 +1,7 @@
 
 /* pngpread.c - read a png file in push mode
  *
- * libpng version 1.2.8rc1 - November 24, 2004
+ * libpng version 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)
@@ -815,7 +815,7 @@
    png_memcpy_check(png_ptr, png_ptr->prev_row, png_ptr->row_buf,
       png_ptr->rowbytes + 1);
 
-   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)