diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2013-06-15 02:52:20 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2013-06-15 02:52:20 +0000 |
| commit | 1090fcc43865b56f7d5868efe462745a0cfe5f5b (patch) | |
| tree | 12aff83b9fe636bf17853b35c04b5e0a43280203 /converter/ppm/ppmtoxpm.c | |
| parent | f3f8fc6f37c4ad9df8a286697fc4620a236f6c19 (diff) | |
| download | netpbm-mirror-1090fcc43865b56f7d5868efe462745a0cfe5f5b.tar.gz netpbm-mirror-1090fcc43865b56f7d5868efe462745a0cfe5f5b.tar.xz netpbm-mirror-1090fcc43865b56f7d5868efe462745a0cfe5f5b.zip | |
Release 10.62.08
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@1929 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'converter/ppm/ppmtoxpm.c')
| -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 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, |