Rebase Stable series to current Advanced: 10.47.04

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

1 files changed, 5 insertions, 1 deletions

diff --git a/editor/pamscale.c b/editor/pamscale.c
index 94f67414..69861e0e 100644
--- a/editor/pamscale.c
+++ b/editor/pamscale.c
@@ -30,6 +30,7 @@
 #include <string.h>
 #include <assert.h>
 
+#include "pm_c_util.h"
 #include "pam.h"
 #include "shhopt.h"
 #include "mallocvar.h"
@@ -2049,6 +2050,9 @@ scaleWithoutMixing(const struct pam * const inpamP,
     int row;
     int rowInInput;
 
+    assert(outpamP->maxval == inpamP->maxval);
+    assert(outpamP->depth  == inpamP->depth);
+
     tuplerow = pnm_allocpamrow(inpamP); 
     rowInInput = -1;
 
@@ -2131,7 +2135,7 @@ main(int argc, char **argv ) {
         scaleWithoutMixing(&inpam, &outpam, xscale, yscale);
     } else if (!cmdline.filterFunction) {
         if (cmdline.verbose)
-            pm_message("Using regular rescaling method");
+            pm_message("Using simple pixel mixing rescaling method");
         scaleWithMixing(&inpam, &outpam, xscale, yscale, 
                         cmdline.linear, cmdline.verbose);
     } else {