summaryrefslogtreecommitdiff
path: root/sys/src/cmd/jpg
diff options
context:
space:
mode:
authorcinap_lenrek <cinap_lenrek@gmx.de>2013-01-25 14:20:53 +0100
committercinap_lenrek <cinap_lenrek@gmx.de>2013-01-25 14:20:53 +0100
commit358f72266a774d291c3b9c569b29152ca5595ee7 (patch)
tree88fc54d5e3f4971380c7345a45b1686b79c4a649 /sys/src/cmd/jpg
parent9888ead0425a9acc90853cd865b3a131534544fe (diff)
parente00c53cf7433c0a8562190dde75cf17cb9ae7f08 (diff)
merge
Diffstat (limited to 'sys/src/cmd/jpg')
-rw-r--r--sys/src/cmd/jpg/readtga.c2
1 files changed, 2 insertions, 0 deletions
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;