diff options
| author | cinap_lenrek <cinap_lenrek@gmx.de> | 2013-01-25 14:20:53 +0100 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@gmx.de> | 2013-01-25 14:20:53 +0100 |
| commit | 358f72266a774d291c3b9c569b29152ca5595ee7 (patch) | |
| tree | 88fc54d5e3f4971380c7345a45b1686b79c4a649 /sys | |
| parent | 9888ead0425a9acc90853cd865b3a131534544fe (diff) | |
| parent | e00c53cf7433c0a8562190dde75cf17cb9ae7f08 (diff) | |
merge
Diffstat (limited to 'sys')
| -rwxr-xr-x | sys/man/3/cons | 1 | ||||
| -rw-r--r-- | sys/src/cmd/file.c | 2 | ||||
| -rw-r--r-- | sys/src/cmd/jpg/readtga.c | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/sys/man/3/cons b/sys/man/3/cons index 61ee62172..7ecb9ffb2 100755 --- a/sys/man/3/cons +++ b/sys/man/3/cons @@ -14,6 +14,7 @@ cons \- console, clocks, process/process group ids, user, null, reboot, etc. .B /dev/hostowner .B /dev/kmesg .B /dev/kprint +.B /dev/mordor .B /dev/null .B /dev/osversion .B /dev/pgrpid 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; |