diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2009-01-15 21:35:47 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2009-01-15 21:35:47 +0000 |
| commit | 3976c04edc6d4bdb583875176e06f93fc23d869f (patch) | |
| tree | 2d428ebedef97f1548fe2d2252604562e7fed2ea /converter/ppm | |
| parent | 86e28372bb9b28a8d62c33c874f395bbbcd395cf (diff) | |
| download | netpbm-mirror-3976c04edc6d4bdb583875176e06f93fc23d869f.tar.gz netpbm-mirror-3976c04edc6d4bdb583875176e06f93fc23d869f.tar.xz netpbm-mirror-3976c04edc6d4bdb583875176e06f93fc23d869f.zip | |
Release 10.35.58
git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@816 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'converter/ppm')
| -rw-r--r-- | converter/ppm/ilbmtoppm.c | 2 | ||||
| -rw-r--r-- | converter/ppm/leaftoppm.c | 4 | ||||
| -rw-r--r-- | converter/ppm/picttoppm.c | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/converter/ppm/ilbmtoppm.c b/converter/ppm/ilbmtoppm.c index f9f9bac3..fafbd005 100644 --- a/converter/ppm/ilbmtoppm.c +++ b/converter/ppm/ilbmtoppm.c @@ -2349,7 +2349,7 @@ main(int argc, char *argv[]) { cmap_to_ppm(cmap); } else pm_error("no colormap"); - } else if( bodyChunkProcessed ) { + } else if( !bodyChunkProcessed ) { if( HAS_COLORMAP(cmap) ) { pm_message("input is a colormap file"); check_cmap(bmhdP, cmap); diff --git a/converter/ppm/leaftoppm.c b/converter/ppm/leaftoppm.c index 889400f6..bda44494 100644 --- a/converter/ppm/leaftoppm.c +++ b/converter/ppm/leaftoppm.c @@ -88,9 +88,9 @@ leaf_init(FILE * const fp, for (i=0; i < 256; ++i) PPM_PUTR(colors[i], fgetc(fp)); for (i=0; i < 256; ++i) - PPM_PUTR(colors[i], fgetc(fp)); + PPM_PUTG(colors[i], fgetc(fp)); for (i=0; i < 256; ++i) - PPM_PUTR(colors[i], fgetc(fp)); + PPM_PUTB(colors[i], fgetc(fp)); *ncolorsP = ncolors; } else { /* 24-bit image */ diff --git a/converter/ppm/picttoppm.c b/converter/ppm/picttoppm.c index e31d5169..d52963fc 100644 --- a/converter/ppm/picttoppm.c +++ b/converter/ppm/picttoppm.c @@ -1616,8 +1616,6 @@ do_blits(struct rgbPlanes * const planesP) { double lowxscale, highxscale, lowyscale, highyscale; int xscalecalc = 0, yscalecalc = 0; - if (!blit_list) return; - fullres = 0; for (bi = blit_list; bi; bi = bi->next) { |