Releaes 10.86.04

git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@3632 9d0c8265-081b-0410-96cb-a4ca84ce46f8

5 files changed, 16 insertions, 9 deletions

diff --git a/converter/pbm/pbmtozinc.c b/converter/pbm/pbmtozinc.c
index 66ec5582..a89b8c9f 100644
--- a/converter/pbm/pbmtozinc.c
+++ b/converter/pbm/pbmtozinc.c
@@ -92,7 +92,9 @@ packer_init(Packer * const packerP) {
 
 
 static void
-packer_putitem(Packer * const packerP) {
+packer_putitem(Packer *      const packerP,
+               unsigned char const hi,
+               unsigned char const lo) {
 
     if (packerP->firstitem)
         packerP->firstitem = 0;
@@ -107,7 +109,8 @@ packer_putitem(Packer * const packerP) {
         putchar(' ');
 
     ++packerP->itemsperline;
-    printf ("0x%02x%02x", packerP->item & 255, packerP->item >> 8);
+
+    printf ("0x%02x%02x", hi, lo);
 
 }
 
@@ -119,7 +122,7 @@ writeRaster(FILE *       const ifP,
             unsigned int const cols,
             int          const format) {
 
-    bit * const bitrow = pbm_allocrow_packed(cols + 8);
+    unsigned char * const bitrow = pbm_allocrow_packed(cols + 8);
 
     Packer packer;
     unsigned int row;
@@ -129,7 +132,6 @@ writeRaster(FILE *       const ifP,
     bitrow[pbm_packed_bytes(cols+8) -1 ] = 0x00;
 
     for (row = 0; row < rows; ++row) {
-        uint16_t * const itemrow = (uint16_t *) bitrow;
         unsigned int const itemCt = (cols + 15 ) / 16;
 
         unsigned int i;
@@ -139,8 +141,7 @@ writeRaster(FILE *       const ifP,
         pbm_cleanrowend_packed(bitrow, cols);
 
         for (i = 0; i < itemCt; ++i) {
-            packer.item = itemrow[i];
-            packer_putitem(&packer);
+            packer_putitem(&packer, bitrow[2*i+0], bitrow[2*i+1]);
         }
     }
     pbm_freerow_packed(bitrow);
diff --git a/doc/HISTORY b/doc/HISTORY
index 0cc8a44e..308f903b 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,6 +4,13 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
+19.06.15 BJH  Release 10.86.04
+
+              pamtris: Fix bug: debug trace left in
+
+              pbmtozinc: Fix wrong output on big-endian machines.  Broken in
+              Netpbm 10.71 (June 2015).
+
 19.05.04 BJH  Release 10.86.03
 
               pnmtopng: Fix bug: Defaults to no filters.  Should be all
diff --git a/doc/INSTALL b/doc/INSTALL
index 39bbc0a5..aad0a5e5 100644
--- a/doc/INSTALL
+++ b/doc/INSTALL
@@ -126,7 +126,7 @@ Furthermore, as version information, the modification datetime of the source
 code is often more useful than the build datetime.
 
 For these reasons, it is possible to change this timestamping behavior by
-setting the environment variable 'SOURCE_DATA_EPOCH'.  That is supposed to be
+setting the environment variable 'SOURCE_DATE_EPOCH'.  That is supposed to be
 the POSIX datetime value (decimal number of seconds since 1969, excluding leap
 seconds) for when the source code was last modified.  When you set this,
 before doing 'make' for the first time in a clean build tree, the resulting
diff --git a/generator/pamtris/input.c b/generator/pamtris/input.c
index ef79be07..ffb2a859 100644
--- a/generator/pamtris/input.c
+++ b/generator/pamtris/input.c
@@ -635,7 +635,6 @@ input_process_next_command(Input *                const inputP,
 
     noMoreCommands = false;  /* initial assumption */
 
-    pm_message("command '%s'", nt.begin);
     switch (nt.begin[0]) {
     case 'm':
         processM(&nt, &state, &unrecognizedCmd, &error);
diff --git a/version.mk b/version.mk
index 2d39bc86..f1ae314e 100644
--- a/version.mk
+++ b/version.mk
@@ -1,3 +1,3 @@
 NETPBM_MAJOR_RELEASE = 10
 NETPBM_MINOR_RELEASE = 86
-NETPBM_POINT_RELEASE = 3
+NETPBM_POINT_RELEASE = 4