Merge pull request #100405 from BlueCube3310/bcdec-fix-v200

akien-mga · akien-mga · commit 863a24ac8673 · 2024-12-14T18:25:49.000+01:00
bcdec: Fix logic for detecting incomplete blocks
diff --git a/modules/bcdec/image_decompress_bcdec.cpp b/modules/bcdec/image_decompress_bcdec.cpp
@@ -64,7 +64,7 @@ static void decompress_image(BCdecFormat format, const void *src, void *dst, con
 			const uint32_t yblock = MIN(height - y, 4ul);                                                                                             \
 			const uint32_t xblock = MIN(width - x, 4ul);                                                                                              \
                                                                                                                                                       \
-			const bool incomplete = yblock < 4 && xblock < 4;                                                                                         \
+			const bool incomplete = yblock < 4 || xblock < 4;                                                                                         \
 			uint8_t *dec_out = incomplete ? output : &dec_blocks[y * 4 * width + x * color_bytesize];                                                 \
                                                                                                                                                       \
 			func(&src_blocks[src_pos], dec_out, 4 * color_components);                                                                                \

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ static void decompress_image(BCdecFormat format, const void src, void dst, con`
`64`	`64`	`const uint32_t yblock = MIN(height - y, 4ul); \`
`65`	`65`	`const uint32_t xblock = MIN(width - x, 4ul); \`
`66`	`66`	`\`
`67`		`- const bool incomplete = yblock < 4 && xblock < 4; \`
	`67`	`+ const bool incomplete = yblock < 4 \|\| xblock < 4; \`
`68`	`68`	`uint8_t dec_out = incomplete ? output : &dec_blocks[y 4 * width + x * color_bytesize]; \`
`69`	`69`	`\`
`70`	`70`	`func(&src_blocks[src_pos], dec_out, 4 * color_components); \`