summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2013-12-22 20:15:03 +0100
committerThomas Martitz <kugel@rockbox.org>2013-12-22 20:15:03 +0100
commita62bd9282e8cebe4e34c1930da04670695f8974b (patch)
treec00deab2f76e7e7bac958eefc08f5cef43ee88cb
parentef92ed4a6a997524944f42aa7abffddca7bef05e (diff)
downloadrockbox-a62bd92.tar.gz
rockbox-a62bd92.tar.bz2
rockbox-a62bd92.zip
Fix warning and re-order code a bit.
Change-Id: I1d733b3d0bd17cc541218f9a2b7712712ad314dd
-rw-r--r--apps/recorder/bmp.c19
1 files changed, 8 insertions, 11 deletions
diff --git a/apps/recorder/bmp.c b/apps/recorder/bmp.c
index 75d82b449f..58393bfc11 100644
--- a/apps/recorder/bmp.c
+++ b/apps/recorder/bmp.c
@@ -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: