devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Fix warning and re-order code a bit.

Browse source 
Change-Id: I1d733b3d0bd17cc541218f9a2b7712712ad314dd
This commit is contained in:
Thomas Martitz 2013-12-22 20:15:03 +01:00
parent ef92ed4a6a
commit a62bd9282e
1 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

19
apps/recorder/bmp.c
View file

@ -718,11 +718,11 @@ int read_bmp_fd(int fd,
case 32:
if (compression == 3) { /* BI_BITFIELDS */
bool found;
bool found = false;
int i, j;
/* (i == 0) is 15bit, (i == 1) is 16bit, (i == 2) is 32bit */
for (i = 0; i < ARRAY_SIZE(bitfields); i++) {
for (i = 0; i < ARRAY_SIZE(bitfields) && !found; i++) {
/* for 15bpp and higher numcolors has the number of color masks */
for (j = 0; j < numcolors; j++) {
if (!rgbcmp(&palette[j], &bitfields[i][j])) {
@ -732,16 +732,13 @@ int read_bmp_fd(int fd,
break;
}
}
if (found) {
if (i == 0) /* 15bit */
depth = 15;
else if (i == 3) /* 32bit, ABGR bitmap */
order = ABGR;
break;
}
}
if (found)
break;
if (found) {
if (i == 0) /* 15bit */
depth = 15;
else if (i == 3) /* 32bit, ABGR bitmap */
order = ABGR;
}
} /* else fall through */
default: