From ea8192a607f9aab49616c92fce88e0461f9e8fc1 Mon Sep 17 00:00:00 2001
From: giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>
Date: Fri, 31 Oct 2008 22:44:17 +0000
Subject: version 10.35.55

git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@768 9d0c8265-081b-0410-96cb-a4ca84ce46f8
---
 Makefile.version |  2 +-
 doc/HISTORY      |  5 +++++
 editor/pamcomp.c | 21 ---------------------
 3 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/Makefile.version b/Makefile.version
index eb4129bb..cd924631 100644
--- a/Makefile.version
+++ b/Makefile.version
@@ -1,3 +1,3 @@
 NETPBM_MAJOR_RELEASE = 10
 NETPBM_MINOR_RELEASE = 35
-NETPBM_POINT_RELEASE = 54
+NETPBM_POINT_RELEASE = 55
diff --git a/doc/HISTORY b/doc/HISTORY
index 816afbf7..a1a7cd88 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,6 +4,11 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
+08.10.31 BJH  Release 10.35.55
+
+              pamcomp: Fix mysterious doubling of code introduced in 10.35.50
+              which causes build to fail.
+
 08.10.27 BJH  Release 10.35.54
 
               pnm_createBlackTuple(): fix array bounds violation with
diff --git a/editor/pamcomp.c b/editor/pamcomp.c
index fd3147a2..fc43d9c5 100644
--- a/editor/pamcomp.c
+++ b/editor/pamcomp.c
@@ -324,25 +324,6 @@ validateComputableHeight(int const originTop,
 
 
 
-static void
-validateComputableHeight(int const originTop, 
-                         int const overRows) {
-
-    if (originTop < 0) {
-        if (originTop < -INT_MAX)
-            pm_error("Overlay starts too far above the underlay image to be "
-                     "computable.  Overlay can be at most %d rows above "
-                     "the underlay.", INT_MAX);
-    } else {
-        if (INT_MAX - originTop <= overRows)
-            pm_error("Too many total rows involved to be computable.  "
-                     "You must have a shorter overlay image or compose it "
-                     "higher on the underlay image.");
-    }
-}
-
-
-
 static void
 computeOverlayPosition(int                const underCols, 
                        int                const underRows,
@@ -380,8 +361,6 @@ computeOverlayPosition(int                const underCols,
 
     validateComputableHeight(*originTopP, overRows);
 
-    validateComputableHeight(*originTopP, overRows);
-
     warnOutOfFrame(*originLeftP, *originTopP, 
                    overCols, overRows, underCols, underRows);    
 }
-- 
cgit 1.4.1