cleanup

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

2 files changed, 5 insertions, 4 deletions

diff --git a/other/pamarith.c b/other/pamarith.c
index d79f1e60..7d973222 100644
--- a/other/pamarith.c
+++ b/other/pamarith.c
@@ -508,7 +508,7 @@ sampleMean(sample       const operands[],
         if (UINT_MAX - operands[i] < sum)
             pm_error("Arithmetic overflow adding samples for mean");
     }
-    return (sum + operandCt/2) / operandCt;
+    return ROUNDDIV(sum, operandCt);
 }
 
 
@@ -656,7 +656,7 @@ applyUnNormalizedFunction(enum function const function,
         break;
     case FN_DIVIDE:
         result = (operands[1] > operands[0]) ?
-            (operands[0] * maxval + operands[1]/2) / operands[1] : maxval;
+            ROUNDDIV(operands[0] * maxval, operands[1]) : maxval;
         break;
 
     case FN_AND:
diff --git a/other/pamdepth.c b/other/pamdepth.c
index 0c4490ed..ee59a408 100644
--- a/other/pamdepth.c
+++ b/other/pamdepth.c
@@ -11,8 +11,9 @@
 =============================================================================*/
 #include <assert.h>
 
-#include "shhopt.h"
+#include "pm_c_util.h"
 #include "mallocvar.h"
+#include "shhopt.h"
 #include "pam.h"
 
 struct cmdlineInfo {
@@ -89,7 +90,7 @@ createSampleMap(sample   const oldMaxval,
     MALLOCARRAY_NOFAIL(sampleMap, oldMaxval+1);
 
     for (i = 0; i <= oldMaxval; ++i)
-        sampleMap[i] = (i * newMaxval + oldMaxval / 2) / oldMaxval;
+        sampleMap[i] = ROUNDDIV(i * newMaxval, oldMaxval);
 
     *sampleMapP = sampleMap;
 }