diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2013-09-26 03:30:07 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2013-09-26 03:30:07 +0000 |
| commit | 470372222f011c15be1b03f179ed0a26a5875830 (patch) | |
| tree | 1db50025529a92a63b5616112db0df36a2b0a0ee /converter | |
| parent | 0324aa326be3347cdcd39c639917ba3d33a78b14 (diff) | |
| download | netpbm-mirror-470372222f011c15be1b03f179ed0a26a5875830.tar.gz netpbm-mirror-470372222f011c15be1b03f179ed0a26a5875830.tar.xz netpbm-mirror-470372222f011c15be1b03f179ed0a26a5875830.zip | |
Release 10.35.90
git-svn-id: http://svn.code.sf.net/p/netpbm/code/super_stable@2001 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'converter')
| -rw-r--r-- | converter/ppm/ppmtoxpm.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/converter/ppm/ppmtoxpm.c b/converter/ppm/ppmtoxpm.c index 853ae711..630653df 100644 --- a/converter/ppm/ppmtoxpm.c +++ b/converter/ppm/ppmtoxpm.c @@ -634,8 +634,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, |