commit 1eb14e95d3ba4a23c17abf4a80eeec24b6fe57ab
author Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Wed Dec 10 07:14:45 2008 -0600
committer Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Mon Apr 06 16:10:55 2009 -0500
tree 105e8eb17abe2aa516cbd34f01f00bc69d8191e7
parent 65a0992f0d93e6cfa136ea0691442e06e05539f1

Imported from libpng-1.4.0beta46.tar

pngwrite.c

diff --git a/pngwrite.c b/pngwrite.c
index 77a54a3..68ecc2e 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.4.0 [December 9, 2008]
+ * Last changed in libpng 1.4.0 [December 10, 2008]
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998-2008 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -1439,9 +1439,10 @@
 #if defined(PNG_WRITE_FILLER_SUPPORTED)
    /* Pack XRGB/RGBX/ARGB/RGBA into * RGB (4 channels -> 3 channels).
     */
-   if (transforms & PNG_TRANSFORM_STRIP_FILLER)
-     if (!(png_ptr->transformations & PNG_TRANSFORM_STRIP_FILLER))
-         png_set_filler(png_ptr, 0, PNG_FILLER_BEFORE);
+  if (transforms & PNG_TRANSFORM_STRIP_FILLER_AFTER)
+      png_set_filler(png_ptr, 0, PNG_FILLER_AFTER);
+  else if (transforms & PNG_TRANSFORM_STRIP_FILLER_BEFORE)
+      png_set_filler(png_ptr, 0, PNG_FILLER_BEFORE);
 #endif
 
 #if defined(PNG_WRITE_BGR_SUPPORTED)