Fix cleanup corruption causing incorrect output

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

2 files changed, 4 insertions, 1 deletions

diff --git a/doc/HISTORY b/doc/HISTORY
index 911a750a..4f81efd3 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -38,6 +38,9 @@ not yet  BJH  Release 10.79.00
               pnmtojpeg: fix array bounds violation in argument list.  Always
               broken (pnmtojpeg was new to Netpbm in Netpbm 8.2 (March 2000).
 
+              pamcrater: fix incorrect output with non-square image.
+              Introduced in Netpbm 10.69 (December 2014).
+
               libnetpbm: fix bug: pm_system_XXX closes Standard Input if you
               supply a Standard Output accepter but not a Standard Input
               feeder.  Broken since Netpbm 10.40 (September 2007).
diff --git a/generator/pamcrater.c b/generator/pamcrater.c
index c0a851ed..43c27dbc 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];
 }