[mojosetup] stb_image: Fix some misleading 'for' indentation warnings.
Francois Gouget
fgouget at codeweavers.com
Mon Aug 10 13:19:29 EDT 2020
gcc -Wmisleading-indentation does not like it when a 'break;' follows a
for's simple statement because that makes it look like the break is part
of the for.
In fact it does not quite look that way because the for is inside a
macro! Still, add braces around the for statement to avoid any
ambiguity.
Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
---
stb_image.c | 52 ++++++++++++++++++++++++++--------------------------
1 file changed, 26 insertions(+), 26 deletions(-)
diff --git a/stb_image.c b/stb_image.c
index 7f6f4b5..c30c498 100644
--- a/stb_image.c
+++ b/stb_image.c
@@ -807,18 +807,18 @@ static unsigned char *convert_format(unsigned char *data, int img_n, int req_com
// convert source image with img_n components to one with req_comp components;
// avoid switch per pixel, so use switch per scanline and massive macros
switch(COMBO(img_n, req_comp)) {
- CASE(1,2) dest[0]=src[0], dest[1]=255; break;
- CASE(1,3) dest[0]=dest[1]=dest[2]=src[0]; break;
- CASE(1,4) dest[0]=dest[1]=dest[2]=src[0], dest[3]=255; break;
- CASE(2,1) dest[0]=src[0]; break;
- CASE(2,3) dest[0]=dest[1]=dest[2]=src[0]; break;
- CASE(2,4) dest[0]=dest[1]=dest[2]=src[0], dest[3]=src[1]; break;
- CASE(3,4) dest[0]=src[0],dest[1]=src[1],dest[2]=src[2],dest[3]=255; break;
- CASE(3,1) dest[0]=compute_y(src[0],src[1],src[2]); break;
- CASE(3,2) dest[0]=compute_y(src[0],src[1],src[2]), dest[1] = 255; break;
- CASE(4,1) dest[0]=compute_y(src[0],src[1],src[2]); break;
- CASE(4,2) dest[0]=compute_y(src[0],src[1],src[2]), dest[1] = src[3]; break;
- CASE(4,3) dest[0]=src[0],dest[1]=src[1],dest[2]=src[2]; break;
+ CASE(1,2) { dest[0]=src[0], dest[1]=255; } break;
+ CASE(1,3) { dest[0]=dest[1]=dest[2]=src[0]; } break;
+ CASE(1,4) { dest[0]=dest[1]=dest[2]=src[0], dest[3]=255; } break;
+ CASE(2,1) { dest[0]=src[0]; } break;
+ CASE(2,3) { dest[0]=dest[1]=dest[2]=src[0]; } break;
+ CASE(2,4) { dest[0]=dest[1]=dest[2]=src[0], dest[3]=src[1]; } break;
+ CASE(3,4) { dest[0]=src[0],dest[1]=src[1],dest[2]=src[2],dest[3]=255; } break;
+ CASE(3,1) { dest[0]=compute_y(src[0],src[1],src[2]); } break;
+ CASE(3,2) { dest[0]=compute_y(src[0],src[1],src[2]), dest[1] = 255; } break;
+ CASE(4,1) { dest[0]=compute_y(src[0],src[1],src[2]); } break;
+ CASE(4,2) { dest[0]=compute_y(src[0],src[1],src[2]), dest[1] = src[3]; } break;
+ CASE(4,3) { dest[0]=src[0],dest[1]=src[1],dest[2]=src[2]; } break;
default: assert(0);
}
#undef CASE
@@ -2334,13 +2334,13 @@ static int create_png_image(uint8 *raw, uint32 raw_len, int out_n)
for (i=1; i < img_x; ++i, raw+=img_n,cur+=img_n,prior+=img_n) \
for (k=0; k < img_n; ++k)
switch(filter) {
- CASE(F_none) cur[k] = raw[k]; break;
- CASE(F_sub) cur[k] = raw[k] + cur[k-img_n]; break;
- CASE(F_up) cur[k] = raw[k] + prior[k]; break;
- CASE(F_avg) cur[k] = raw[k] + ((prior[k] + cur[k-img_n])>>1); break;
- CASE(F_paeth) cur[k] = (uint8) (raw[k] + paeth(cur[k-img_n],prior[k],prior[k-img_n])); break;
- CASE(F_avg_first) cur[k] = raw[k] + (cur[k-img_n] >> 1); break;
- CASE(F_paeth_first) cur[k] = (uint8) (raw[k] + paeth(cur[k-img_n],0,0)); break;
+ CASE(F_none) { cur[k] = raw[k]; } break;
+ CASE(F_sub) { cur[k] = raw[k] + cur[k-img_n]; } break;
+ CASE(F_up) { cur[k] = raw[k] + prior[k]; } break;
+ CASE(F_avg) { cur[k] = raw[k] + ((prior[k] + cur[k-img_n])>>1); } break;
+ CASE(F_paeth) { cur[k] = (uint8) (raw[k] + paeth(cur[k-img_n],prior[k],prior[k-img_n])); } break;
+ CASE(F_avg_first) { cur[k] = raw[k] + (cur[k-img_n] >> 1); } break;
+ CASE(F_paeth_first) { cur[k] = (uint8) (raw[k] + paeth(cur[k-img_n],0,0)); } break;
}
#undef CASE
} else {
@@ -2350,13 +2350,13 @@ static int create_png_image(uint8 *raw, uint32 raw_len, int out_n)
for (i=1; i < img_x; ++i, cur[img_n]=255,raw+=img_n,cur+=out_n,prior+=out_n) \
for (k=0; k < img_n; ++k)
switch(filter) {
- CASE(F_none) cur[k] = raw[k]; break;
- CASE(F_sub) cur[k] = raw[k] + cur[k-out_n]; break;
- CASE(F_up) cur[k] = raw[k] + prior[k]; break;
- CASE(F_avg) cur[k] = raw[k] + ((prior[k] + cur[k-out_n])>>1); break;
- CASE(F_paeth) cur[k] = (uint8) (raw[k] + paeth(cur[k-out_n],prior[k],prior[k-out_n])); break;
- CASE(F_avg_first) cur[k] = raw[k] + (cur[k-out_n] >> 1); break;
- CASE(F_paeth_first) cur[k] = (uint8) (raw[k] + paeth(cur[k-out_n],0,0)); break;
+ CASE(F_none) { cur[k] = raw[k]; } break;
+ CASE(F_sub) { cur[k] = raw[k] + cur[k-out_n]; } break;
+ CASE(F_up) { cur[k] = raw[k] + prior[k]; } break;
+ CASE(F_avg) { cur[k] = raw[k] + ((prior[k] + cur[k-out_n])>>1); } break;
+ CASE(F_paeth) { cur[k] = (uint8) (raw[k] + paeth(cur[k-out_n],prior[k],prior[k-out_n])); } break;
+ CASE(F_avg_first) { cur[k] = raw[k] + (cur[k-out_n] >> 1); } break;
+ CASE(F_paeth_first) { cur[k] = (uint8) (raw[k] + paeth(cur[k-out_n],0,0)); } break;
}
#undef CASE
}
--
2.20.1
More information about the mojosetup
mailing list