commit 305ada66720ec62a0fef258a8243e9e429185481
author Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Fri Oct 30 12:48:07 2015 -0500
committer Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Fri Oct 30 12:48:07 2015 -0500
tree 3d31e69509ec25e47ce192b491cbb9cfed64f15b
parent 1bef8e97995c33123665582e57d3ed40b57d5978
parent 896c3cfb768b6f7bde8e303f785ae9b92beb18cd

Merge branch 'libpng16' of https://github.com/jbowler/libpng-1 into libpng16

pngrtran.c

diff --git a/pngrtran.c b/pngrtran.c
index 284226a..0d37a72 100644
--- a/pngrtran.c
+++ b/pngrtran.c
@@ -2097,10 +2097,10 @@
 defined(PNG_READ_USER_TRANSFORM_SUPPORTED)
    if ((png_ptr->transformations & PNG_USER_TRANSFORM) != 0)
    {
-      if (info_ptr->bit_depth < png_ptr->user_transform_depth)
+      if (png_ptr->user_transform_depth != 0)
          info_ptr->bit_depth = png_ptr->user_transform_depth;
 
-      if (info_ptr->channels < png_ptr->user_transform_channels)
+      if (png_ptr->user_transform_channels != 0)
          info_ptr->channels = png_ptr->user_transform_channels;
    }
 #endif