about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2017-05-27 02:52:33 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2017-05-27 02:52:33 +0000
commit3b7ef037562cdd48e79ae588c69a6713da6e7b16 (patch)
treea7fd583e9a1e286d50e2a2fabbcf7f2f4422adac
parent6988fb13dd16f750c7336e3a7fd7422114a44e75 (diff)
downloadnetpbm-mirror-3b7ef037562cdd48e79ae588c69a6713da6e7b16.tar.gz
netpbm-mirror-3b7ef037562cdd48e79ae588c69a6713da6e7b16.tar.xz
netpbm-mirror-3b7ef037562cdd48e79ae588c69a6713da6e7b16.zip
Release 10.73.11
git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@2985 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--doc/HISTORY5
-rw-r--r--generator/pamcrater.c2
-rw-r--r--version.mk2
3 files changed, 7 insertions, 2 deletions
diff --git a/doc/HISTORY b/doc/HISTORY
index 53605e14..5b6c78b8 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,6 +4,11 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
+17.05.27 BJH  Release 10.73.11
+
+              pamcrater: fix incorrect output with non-square image.
+              Introduced in Netpbm 10.69 (December 2014).
+
 17.04.30 BJH  Release 10.73.10
 
               libnetpbm: fix bug: pm_system_XXX closes Standard Input if you
diff --git a/generator/pamcrater.c b/generator/pamcrater.c
index 50745501..8c1fda40 100644
--- a/generator/pamcrater.c
+++ b/generator/pamcrater.c
@@ -215,7 +215,7 @@ terrainModP(struct pam * const pamP,
    would be a pointer to the sample at Column 2 or Row 2.  If they are both
    -1, we would point to Column 9, Row 9.
 -----------------------------------------------------------------------------*/
-    return &terrain[mod(x, pamP->height)][mod(y, pamP->width)][0];
+    return &terrain[mod(y, pamP->height)][mod(x, pamP->width)][0];
 }
 
 
diff --git a/version.mk b/version.mk
index 025585c7..8c6be845 100644
--- a/version.mk
+++ b/version.mk
@@ -1,3 +1,3 @@
 NETPBM_MAJOR_RELEASE = 10
 NETPBM_MINOR_RELEASE = 73
-NETPBM_POINT_RELEASE = 10
+NETPBM_POINT_RELEASE = 11