about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2017-03-25 21:29:34 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2017-03-25 21:29:34 +0000
commit8b32628b4c65cdd2b09e877150bbc4bcdd9b6ba7 (patch)
tree29dd7a9b2a32f5372fd8e6f2621792928cf29f0d
parent53501b361d00b707514a68ce298a6af1d017717a (diff)
downloadnetpbm-mirror-8b32628b4c65cdd2b09e877150bbc4bcdd9b6ba7.tar.gz
netpbm-mirror-8b32628b4c65cdd2b09e877150bbc4bcdd9b6ba7.tar.xz
netpbm-mirror-8b32628b4c65cdd2b09e877150bbc4bcdd9b6ba7.zip
Release 10.77.04
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@2926 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--converter/other/tifftopnm.c7
-rw-r--r--doc/HISTORY7
-rw-r--r--version.mk2
3 files changed, 7 insertions, 9 deletions
diff --git a/converter/other/tifftopnm.c b/converter/other/tifftopnm.c
index 5c0797fc..aabf9d09 100644
--- a/converter/other/tifftopnm.c
+++ b/converter/other/tifftopnm.c
@@ -547,12 +547,6 @@ analyzeImageType(TIFF *             const tif,
 
     bool grayscale; 
 
-    if (bps == 1 && spp == 1) {
-        if (cmdline.headerdump)
-            pm_message("bilevel");
-        grayscale = TRUE;
-        *maxvalP = 1;
-    } else {
         /* How come we don't deal with the photometric for the monochrome 
            case (make sure it's one we know)?  -Bryan 00.03.04
         */
@@ -658,7 +652,6 @@ analyzeImageType(TIFF *             const tif,
         default:
             pm_error("unknown photometric: %d", photomet);
         }
-    }
     if (*maxvalP > PNM_OVERALLMAXVAL)
         pm_error("bits/sample (%d) in the input image is too large.",
                  bps);
diff --git a/doc/HISTORY b/doc/HISTORY
index 1ca1c957..df95e9c1 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,13 +4,18 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
+17.03.25 BJH  Release 10.77.04
+
+              tifftonm: Fix incorrect PBM output with two-color paletted TIFF
+              image.  Broken in primordial Netpbm, ca 1990.
+
 17.03.19 BJH  Release 10.77.03
 
               tifftopnmcmyk: Default rows per strip to the TIFF library
               default instead of whatever yields 8K strips.
 
               tifftopnmcmyk: Fix bug: fails with very wide images and no
-              -rowsperstrip.  Always broken.  (Tifftocmyk was new in Netpbm
+              -rowsperstrip.  Always broken.  (Tifftopnmcmyk was new in Netpbm
               8.2 (March 2000).
 
               libnetpbm: ppmd_fill_path: remove debug trace.  Always broken
diff --git a/version.mk b/version.mk
index 0768e5d9..6b662432 100644
--- a/version.mk
+++ b/version.mk
@@ -1,3 +1,3 @@
 NETPBM_MAJOR_RELEASE = 10
 NETPBM_MINOR_RELEASE = 77
-NETPBM_POINT_RELEASE = 3
+NETPBM_POINT_RELEASE = 4