about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2014-01-01 21:01:30 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2014-01-01 21:01:30 +0000
commit3f4d8438d5ef2dc79dc8118aa2f3250fe05b4d3b (patch)
tree1492ad280e962f74a40b3623d51fc5810e2c9339
parent044d6d1f1f1364b5502a9a0a255f4d5b4160ef8c (diff)
downloadnetpbm-mirror-3f4d8438d5ef2dc79dc8118aa2f3250fe05b4d3b.tar.gz
netpbm-mirror-3f4d8438d5ef2dc79dc8118aa2f3250fe05b4d3b.tar.xz
netpbm-mirror-3f4d8438d5ef2dc79dc8118aa2f3250fe05b4d3b.zip
Release 10.65.02
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@2094 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--doc/HISTORY5
-rwxr-xr-xeditor/pnmmargin2
-rw-r--r--version.mk2
3 files changed, 7 insertions, 2 deletions
diff --git a/doc/HISTORY b/doc/HISTORY
index a43abcf6..a6253515 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,6 +4,11 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
+13.12.31 BJH  Release 10.65.02
+
+              pnmmargin: fix for size 0 and superfluous "unexpected operator" 
+              message with size != 0.  Introduced in 10.42.
+
 13.12.28 BJH  Release 10.65.01
 
               pstopnm: fix wrong orientation sometimes when you specify
diff --git a/editor/pnmmargin b/editor/pnmmargin
index 51ebebe5..b31deefd 100755
--- a/editor/pnmmargin
+++ b/editor/pnmmargin
@@ -76,7 +76,7 @@ fi
 
 cat $@ > $tmp1
 
-if [ $size == 0 ] ; then
+if [ $size -eq 0 ] ; then
     # Zero margin; just copy input to output
     pamtopnm $plainopt $tmp1;
 else
diff --git a/version.mk b/version.mk
index ea1b5ea7..5c12343c 100644
--- a/version.mk
+++ b/version.mk
@@ -1,4 +1,4 @@
 NETPBM_MAJOR_RELEASE = 10
 NETPBM_MINOR_RELEASE = 65
-NETPBM_POINT_RELEASE = 1
+NETPBM_POINT_RELEASE = 2