about summary refs log tree commit diff
path: root/editor
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2008-05-24 20:36:09 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2008-05-24 20:36:09 +0000
commit67e41068ab7531b3bd5bf40036d0d9a36071d036 (patch)
treec1a978a7631df53cac54e476562a84500cd9cc4e /editor
parent03b79250b42b1c7bfbfe975c61e68f8422a6caf3 (diff)
downloadnetpbm-mirror-67e41068ab7531b3bd5bf40036d0d9a36071d036.tar.gz
netpbm-mirror-67e41068ab7531b3bd5bf40036d0d9a36071d036.tar.xz
netpbm-mirror-67e41068ab7531b3bd5bf40036d0d9a36071d036.zip
Release 10.35.44
git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@633 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'editor')
-rw-r--r--editor/pamscale.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/editor/pamscale.c b/editor/pamscale.c
index 229fce42..94f67414 100644
--- a/editor/pamscale.c
+++ b/editor/pamscale.c
@@ -2095,7 +2095,7 @@ main(int argc, char **argv ) {
     outpam = inpam;  /* initial value */
     outpam.file = stdout;
 
-    if (PNM_FORMAT_TYPE(inpam.format) == PBM_TYPE) {
+    if (PNM_FORMAT_TYPE(inpam.format) == PBM_TYPE && !cmdline.nomix) {
         outpam.format = PGM_TYPE;
         outpam.maxval = PGM_MAXMAXVAL;
         pm_message("promoting from PBM to PGM");