summaryrefslogtreecommitdiff
path: root/pngwrite.c
diff options
context:
space:
mode:
authorGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2012-06-14 06:28:09 -0500
committerGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2012-06-14 12:53:06 -0500
commit981560ae6094f0b0557e82c33d7ae5f7d81ca0ea (patch)
tree972aa901c8053ad474bfd63b4a75e364d5617dc2 /pngwrite.c
parentd5a80e094465b2feb448e8d291ea696dc408a097 (diff)
downloadlibpng-baserock/morph.tar.gz
[master] Imported from libpng-1.5.11.tarbaserock/morph
Diffstat (limited to 'pngwrite.c')
-rw-r--r--pngwrite.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/pngwrite.c b/pngwrite.c
index b587f1b99..2a72ad33f 100644
--- a/pngwrite.c
+++ b/pngwrite.c
@@ -1,7 +1,7 @@
/* pngwrite.c - general routines to write a PNG file
*
- * Last changed in libpng 1.5.10 [March 8, 2012]
+ * Last changed in libpng 1.5.11 [June 14, 2012]
* Copyright (c) 1998-2012 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -806,7 +806,8 @@ png_write_row(png_structp png_ptr, png_const_bytep row)
/* Added at libpng-1.5.10 */
#ifdef PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED
/* Check for out-of-range palette index */
- if(row_info.color_type == PNG_COLOR_TYPE_PALETTE)
+ if (row_info.color_type == PNG_COLOR_TYPE_PALETTE &&
+ png_ptr->num_palette_max >= 0)
png_do_check_palette_indexes(png_ptr, &row_info);
#endif