diff options
Diffstat (limited to 'converter')
| -rw-r--r-- | converter/other/giftopnm.c | 1 | ||||
| -rw-r--r-- | converter/ppm/ppmtoxpm.c | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/converter/other/giftopnm.c b/converter/other/giftopnm.c index abfdb0ba..7d517aad 100644 --- a/converter/other/giftopnm.c +++ b/converter/other/giftopnm.c @@ -1218,6 +1218,7 @@ lzwReadByte(struct decompressor * const decompP, *endOfImageP = TRUE; *errorP = NULL; } else { + *endOfImageP = FALSE; expandCodeOntoStack(decompP, code, errorP); if (!*errorP) *dataReadP = popStack(&decompP->stack); 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, |