Imported from pngcrush-1.7.39.tarv1.7.39

2 files changed, 20 insertions, 13 deletions

diff --git a/ChangeLog.html b/ChangeLog.html
index be1b982ff..52f799680 100644
--- a/ChangeLog.html
+++ b/ChangeLog.html
@@ -3,13 +3,28 @@
 
 Change log:
 
+Version 1.7.39 (built with libpng-1.5.13 and zlib-1.2.7)
+  Removed "PNGCRUSH_COUNT_COLORS" blocks which I no longer intend to
+    implement because that feature is already available in ImageMagick.  Kept
+    "reduce_to_gray" and "it_is_opaque" flags which I do hope to implement
+    soon.
+  Changed NULL to pngcrush_default_read_data in png_set_read_fn() calls, to fix
+    an insignificant error introduced in pngcrush-1.7.14, that caused most
+    reads to not go through the alternate read function.  Also always set this
+    function, instead of depending on STDIO_SUPPORTED.
+
 Version 1.7.38 (built with libpng-1.5.13 and zlib-1.2.7)
-  Bail out of a trial if byte count exceeds best byte count so far.
+  Bail out of a trial if byte count exceeds best byte count so far.  This
+    avoids wasting CPU time on trial compressions of trials that exceed the
+    best compression found so far.
   Added -bail and -nobail options.  Use -nobail to get a complete report
-    of filesizes.
+    of filesizes; otherwise the report just says ">N" for any trial
+    that exceeds size N where N is the best size achieved so far.
   Added -blacken option, to enable changing the color samples of any
     fully-transparent pixels to zero in PNG files with color-type 4 or 6,
-    potentially improving their compressibility.
+    potentially improving their compressibility.  Note that this is an
+    irreversible lossy change: the underlying colors of all fully transparent
+    pixels are lost, if they were not already black.
 
 Version 1.7.37 (built with libpng-1.5.12 and zlib-1.2.7)
   Reverted pngcrush.c back to 1.7.35 and fixed the bug with PLTE handling.
@@ -147,6 +162,8 @@ Version 1.7.14  (built with libpng-1.5.1beta08 and zlib-1.2.5)
     with bundled libpng-1.5.x.  Pngcrush cannot be built yet with
     a system libpng-1.5.x.
   Dropped most of pngcrush.h, that eliminates various parts of libpng.
+  Renamed png_default_read_data() to pngcrush_default_read_data() and
+    png_crush_pause() to pngcrush_pause()
 
 Version 1.7.13  (built with libpng-1.4.5 and zlib-1.2.5)
 
diff --git a/pngcrush.c b/pngcrush.c
index e37457d6b..922c17e77 100644
--- a/pngcrush.c
+++ b/pngcrush.c
@@ -1639,16 +1639,6 @@ pngcrush_default_read_data(png_structp png_ptr, png_bytep data, png_size_t lengt
    if (check != length)
       png_error(png_ptr, "Read Error");
 
-   if (fix)
-   {
-      int i;
-      printf(" Read %d bytes: ",(int) length);
-      if (length <= 8)
-         for (i=0; i< length; i++)
-            printf(" %c",data[i]);
-      printf("\n");
-   }
-
    /* To do: fix CgBI files */
    if (fix && found_CgBI)
    {