xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

merge

Browse source
This commit is contained in:
cinap_lenrek 2013-01-25 14:20:53 +01:00
commit 358f72266a
3 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
sys/man/3/cons
View file

@ -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

2
sys/src/cmd/file.c
View file

@ -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;

2
sys/src/cmd/jpg/readtga.c
View file

@ -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;