about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--Makefile.version2
-rwxr-xr-xbuildtools/stamp-date2
-rw-r--r--converter/other/pnmtops.c2
-rw-r--r--doc/HISTORY9
4 files changed, 12 insertions, 3 deletions
diff --git a/Makefile.version b/Makefile.version
index fc720c62..dd525d6e 100644
--- a/Makefile.version
+++ b/Makefile.version
@@ -1,3 +1,3 @@
 NETPBM_MAJOR_RELEASE = 10
 NETPBM_MINOR_RELEASE = 35
-NETPBM_POINT_RELEASE = 97
+NETPBM_POINT_RELEASE = 98
diff --git a/buildtools/stamp-date b/buildtools/stamp-date
index 808bab79..5fb6c13a 100755
--- a/buildtools/stamp-date
+++ b/buildtools/stamp-date
@@ -12,7 +12,7 @@
 DATE=`date`
 LOGNAME_OR_UNKNOWN=${LOGNAME:-UNKNOWN}
 USER=${USER:-$LOGNAME_OR_UNKNOWN}
-if [ $USER = "UNKNOWN" ]; then
+if [ "$USER" = "UNKNOWN" ]; then
     USER=`whoami`
 fi
 
diff --git a/converter/other/pnmtops.c b/converter/other/pnmtops.c
index d2280557..fb4d7648 100644
--- a/converter/other/pnmtops.c
+++ b/converter/other/pnmtops.c
@@ -1145,7 +1145,7 @@ convertPage(FILE * const ifP,
             bool   const dict,
             bool   const vmreclaim,
             bool   const levelIsGiven,
-            bool   const levelGiven) {
+            unsigned int const levelGiven) {
     
     struct pam inpam;
     tuple* tuplerow;
diff --git a/doc/HISTORY b/doc/HISTORY
index 212a652c..3071a207 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,6 +4,15 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
+15.12.25 BJH  Release 10.35.98
+
+              pnmtops: fix bug: always things -level=N is -level=1.
+              Introduced after Netpbm 10.26 (January 2005) but before 10.35
+              (August 2006).  Manifests only with recent compilers.
+
+              Build: fix superfluous error message when USER environment
+              variable contains whitespace.  Broken since primordial Netpbm.
+
 15.09.26 BJH  Release 10.35.97
 
               sbigtopgm: Fix detection of camera type.  Broken in