about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2024-10-08 16:52:44 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2024-10-08 16:52:44 +0000
commitc713f21f968f56f2cab2881a7784b735bbc219a8 (patch)
tree3c642cc9688d6ff9ca14d95e3e192802a4489e80
parent8402b4628d3842a1fd5a4ea0806801448413db69 (diff)
downloadnetpbm-mirror-c713f21f968f56f2cab2881a7784b735bbc219a8.tar.gz
netpbm-mirror-c713f21f968f56f2cab2881a7784b735bbc219a8.tar.xz
netpbm-mirror-c713f21f968f56f2cab2881a7784b735bbc219a8.zip
Fix bug in prior commit
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@4961 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--converter/pbm/pbmtoascii.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/converter/pbm/pbmtoascii.c b/converter/pbm/pbmtoascii.c
index 1683d51f..632ff3f2 100644
--- a/converter/pbm/pbmtoascii.c
+++ b/converter/pbm/pbmtoascii.c
@@ -65,11 +65,10 @@ parseCommandLine(int argc, const char ** argv,
 
     if (opt1x2Spec && opt2x4Spec)
         pm_error("You cannot specify both -1x2 and -2x4");
-    else if (opt1x2Spec)
-        cmdlineP->resolution = RESOLUTION_1X2;
-    else
+    else if (opt2x4Spec)
         cmdlineP->resolution = RESOLUTION_2X4;
-
+    else
+        cmdlineP->resolution = RESOLUTION_1X2;
 
     if (argc-1 < 1)
         cmdlineP->inputFileName = "-";