Release 10.36.0

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

1 files changed, 12 insertions, 6 deletions

diff --git a/editor/pnmcrop.c b/editor/pnmcrop.c
index 5fafbaac..4ef778c3 100644
--- a/editor/pnmcrop.c
+++ b/editor/pnmcrop.c
@@ -338,13 +338,19 @@ findBordersInFile(const char *   const borderFileName,
 
 
 
+static const char *
+ending(unsigned int const n) {
+
+    return n > 1 ? "s" : "";
+}
+
+
+
 static void
 reportOneEdge(unsigned int const oldBorderSize,
               unsigned int const newBorderSize,
               const char * const place) {
 
-#define ending(n) (((n) > 1) ? "s" : "")
-
     if (newBorderSize > oldBorderSize)
         pm_message("Adding %u pixel%s to the %u-pixel %s border",
                    newBorderSize - oldBorderSize,
@@ -376,10 +382,10 @@ reportCroppingParameters(unsigned int const oldLeftBorderSize,
         oldTopBorderSize == 0 && oldBottomBorderSize == 0)
         pm_message("No Border found.");
 
-    reportOneEdge(oldLeftBorderSize,   newLeftBorderSize,   "left"   );
-    reportOneEdge(oldRightBorderSize,  newRightBorderSize,  "right"  );
-    reportOneEdge(oldTopBorderSize,    newTopBorderSize,    "top"    );
-    reportOneEdge(oldBottomBorderSize, newBottomBorderSize, "bottom" );
+    reportOneEdge(oldLeftBorderSize,   newLeftBorderSize,   "left"  );
+    reportOneEdge(oldRightBorderSize,  newRightBorderSize,  "right" );
+    reportOneEdge(oldTopBorderSize,    newTopBorderSize,    "top"   );
+    reportOneEdge(oldBottomBorderSize, newBottomBorderSize, "bottom");
 }