From 1090fcc43865b56f7d5868efe462745a0cfe5f5b Mon Sep 17 00:00:00 2001
From: giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>
Date: Sat, 15 Jun 2013 02:52:20 +0000
Subject: Release 10.62.08

git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@1929 9d0c8265-081b-0410-96cb-a4ca84ce46f8
---
 converter/ppm/ppmtoxpm.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'converter/ppm/ppmtoxpm.c')

diff --git a/converter/ppm/ppmtoxpm.c b/converter/ppm/ppmtoxpm.c
index ff47359b..38d99972 100644
--- a/converter/ppm/ppmtoxpm.c
+++ b/converter/ppm/ppmtoxpm.c
@@ -636,8 +636,10 @@ main(int argc, char *argv[]) {
 
     if (cmdline.hexonly)
         colornameHash = NULL;
+    else if (cmdline.rgb)
+        ppm_readcolornamefile(cmdline.rgb, TRUE, &colornameHash, &colornames);
     else
-        ppm_readcolornamefile(cmdline.rgb, FALSE, &colornameHash, &colornames);
+        ppm_readcolornamefile(NULL, FALSE, &colornameHash, &colornames);
 
     /* Now generate the character-pixel colormap table. */
     genCmap(chv, ncolors, maxval, 
-- 
cgit 1.4.1