diff options
| author | ftrvxmtrx <ftrvxmtrx@gmail.com> | 2013-01-24 22:10:27 +0100 |
|---|---|---|
| committer | ftrvxmtrx <ftrvxmtrx@gmail.com> | 2013-01-24 22:10:27 +0100 |
| commit | e00c53cf7433c0a8562190dde75cf17cb9ae7f08 (patch) | |
| tree | b12fb110fe3d48f021f194d1aeaeb0605017c29f /sys/src/cmd | |
| parent | d1225403d777b7294d14214578f369874a6f047c (diff) | |
tga, file: 15-bit tga images
Diffstat (limited to 'sys/src/cmd')
| -rw-r--r-- | sys/src/cmd/file.c | 2 | ||||
| -rw-r--r-- | sys/src/cmd/jpg/readtga.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/sys/src/cmd/file.c b/sys/src/cmd/file.c index 480917168..4256850b0 100644 --- a/sys/src/cmd/file.c +++ b/sys/src/cmd/file.c @@ -1211,7 +1211,7 @@ istga(void) return 0; if((p[14] | p[15]<<8) == 0) /* height */ return 0; - if(p[16] != 8 && p[16] != 16 && p[16] != 24 && p[16] != 32) /* bpp */ + if(p[16] != 8 && p[16] != 15 && p[16] != 16 && p[16] != 24 && p[16] != 32) /* bpp */ return 0; if(((p[2]|(1<<3)) & (~3)) != (1<<3)) /* rle flag */ return 0; diff --git a/sys/src/cmd/jpg/readtga.c b/sys/src/cmd/jpg/readtga.c index 2200fd8e1..afea0fad0 100644 --- a/sys/src/cmd/jpg/readtga.c +++ b/sys/src/cmd/jpg/readtga.c @@ -89,6 +89,7 @@ fixcmap(uchar *cmap, int *cmapbpp, int cmaplen) } break; case 16: + case 15: /* convert to 24-bit colormap */ if((cmap = realloc(cmap, 3*cmaplen)) == nil) return -1; @@ -245,6 +246,7 @@ rgba(Biobuf *bp, int bpp, uchar *r, uchar *g, uchar *b, int num) switch(bpp){ case 16: + case 15: for(i = 0; i < num; i++){ if(Bread(bp, buf, 2) != 2) break; |