diff options
| author | cinap_lenrek <cinap_lenrek@gmx.de> | 2013-01-21 11:09:47 +0100 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@gmx.de> | 2013-01-21 11:09:47 +0100 |
| commit | e18b9f6fd2f37013abc6a1a2ae3b06f88df6426e (patch) | |
| tree | 27e516987a17e779bb840a5323182737c1ade62e | |
| parent | d789b1cc917839f70f582a7bf90c28099fbca8db (diff) | |
| download | plan9front-e18b9f6fd2f37013abc6a1a2ae3b06f88df6426e.tar.xz | |
tga: fix bad output channel descriptor for grayscale images and -9 flag, revert page work arround
| -rw-r--r-- | sys/src/cmd/jpg/tga.c | 5 | ||||
| -rw-r--r-- | sys/src/cmd/page.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sys/src/cmd/jpg/tga.c b/sys/src/cmd/jpg/tga.c index f4f729d17..940d76d88 100644 --- a/sys/src/cmd/jpg/tga.c +++ b/sys/src/cmd/jpg/tga.c @@ -154,9 +154,10 @@ show(int fd, char *name) if(outchan == CMAP8) c = torgbv(r, !eflag); else{ - if(outchan==GREY8 || (r->chandesc==CY && threeflag==0)) + if(outchan==GREY8 || (r->chandesc==CY && threeflag==0)){ c = totruecolor(r, CY); - else + outchan = GREY8; + }else c = totruecolor(r, CRGB24); } if(c == nil){ diff --git a/sys/src/cmd/page.c b/sys/src/cmd/page.c index 7e040f31c..c7170cc3e 100644 --- a/sys/src/cmd/page.c +++ b/sys/src/cmd/page.c @@ -294,7 +294,7 @@ popenimg(Page *p) if(strcmp(p->ext, "ico") == 0) snprint(nam, sizeof(nam), "%s -c", p->ext); else - snprint(nam, sizeof(nam), "%s -t39", p->ext); + snprint(nam, sizeof(nam), "%s -t9", p->ext); pipeline(fd, "%s", nam); } |