about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--doc/HISTORY8
-rw-r--r--editor/pamscale.c5
2 files changed, 10 insertions, 3 deletions
diff --git a/doc/HISTORY b/doc/HISTORY
index 86e3d372..0b7d51b6 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -21,7 +21,13 @@ not yet  BJH  Release 10.51.00
               <afu@wta.att.ne.jp>.
 
               pnmsmooth: fix wild pointer: causes wrong arguments to
-              'pnmconvol'.  Thanks Prophet of the Way <afu@wta.att.ne.jp>.
+              'pnmconvol'.  Introduced in 10.50.  Thanks Prophet of the Way
+              <afu@wta.att.ne.jp>.
+
+              pamscale: fix -reduce.  Introduced in 10.27.
+
+              configure: don't default to /usr/X11R6/lib/libX11.so just because
+              /usr/X11R6 exists.  /usr/X11R6/lib must exist.
 
 10.03.27 BJH  Release 10.50.00
 
diff --git a/editor/pamscale.c b/editor/pamscale.c
index fce76d8c..16c22f76 100644
--- a/editor/pamscale.c
+++ b/editor/pamscale.c
@@ -710,6 +710,7 @@ parseCommandLine(int argc,
     } else if (reduce != -1) {
         cmdlineP->scaleType = SCALE_SEPARATE;
         parseFilespecOnlyParms(argc, argv, cmdlineP);
+        cmdlineP->xsize = cmdlineP->ysize = 0;
         cmdlineP->xscale = cmdlineP->yscale = 
             ((double) 1.0) / ((double) reduce);
         pm_message("reducing by %d gives scale factor of %f.", 
@@ -737,8 +738,8 @@ parseCommandLine(int argc,
 
 static void 
 computeOutputDimensions(struct cmdlineInfo  const cmdline, 
-                        int                 const rows, 
-                        int                 const cols, 
+                        unsigned int        const rows, 
+                        unsigned int        const cols, 
                         int *               const newrowsP, 
                         int *               const newcolsP) {