Eliminate dependency on color dictionary when user does not specify colors by name

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

1 files changed, 7 insertions, 3 deletions

diff --git a/converter/other/pgmtoppm.c b/converter/other/pgmtoppm.c
index 2c0d5524..62a388c2 100644
--- a/converter/other/pgmtoppm.c
+++ b/converter/other/pgmtoppm.c
@@ -82,9 +82,13 @@ parseCommandLine(int argc, char ** argv,
         }
     } else {
         /* Arguments are color or color range and file name */
+        /* For defaults, we use "rgbi:..." instead of the simpler "black"
+           and "white" so that we don't have unnecessary dependency on a
+           color dictionary being available.
+        */
         if (argc-1 < 1) {
-            cmdlineP->colorBlack = "black";
-            cmdlineP->colorWhite = "white";
+            cmdlineP->colorBlack = "rgbi:0/0/0";
+            cmdlineP->colorWhite = "rgbi:1/1/1";
         } else {
             char * buffer = strdup(argv[1]);
             char * hyphenPos = strchr(buffer, '-');
@@ -93,7 +97,7 @@ parseCommandLine(int argc, char ** argv,
                 cmdlineP->colorBlack = buffer;
                 cmdlineP->colorWhite = hyphenPos+1;
             } else {
-                cmdlineP->colorBlack = "black";
+                cmdlineP->colorBlack = "rgbi:0/0/0";
                 cmdlineP->colorWhite = buffer;
             }
         }