Changed some code found by Clang Tidy and Coverity

1 files changed, 113 insertions, 115 deletions

diff --git a/modules/bmp/image_loader_bmp.cpp b/modules/bmp/image_loader_bmp.cpp
index 5a32fa1c2c..8708430257 100644
--- a/modules/bmp/image_loader_bmp.cpp
+++ b/modules/bmp/image_loader_bmp.cpp
@@ -63,139 +63,137 @@ Error ImageLoaderBMP::convert_to_image(Ref<Image> p_image,
 
 			ERR_FAIL_V(ERR_UNAVAILABLE);
 		}
-		if (err == OK) {
 
-			// Image data (might be indexed)
-			PoolVector<uint8_t> data;
-			int data_len = 0;
+		// Image data (might be indexed)
+		PoolVector<uint8_t> data;
+		int data_len = 0;
 
-			if (bits_per_pixel <= 8) { // indexed
-				data_len = width * height;
-			} else { // color
-				data_len = width * height * 4;
-			}
-			ERR_FAIL_COND_V(data_len == 0, ERR_BUG);
-			err = data.resize(data_len);
-
-			PoolVector<uint8_t>::Write data_w = data.write();
-			uint8_t *write_buffer = data_w.ptr();
-
-			const uint32_t width_bytes = width * bits_per_pixel / 8;
-			const uint32_t line_width = (width_bytes + 3) & ~3;
-
-			// The actual data traversal is determined by
-			// the data width in case of 8/4/1 bit images
-			const uint32_t w = bits_per_pixel >= 24 ? width : width_bytes;
-			const uint8_t *line = p_buffer + (line_width * (height - 1));
-
-			for (unsigned int i = 0; i < height; i++) {
-				const uint8_t *line_ptr = line;
-
-				for (unsigned int j = 0; j < w; j++) {
-					switch (bits_per_pixel) {
-						case 1: {
-							uint8_t color_index = *line_ptr;
-
-							write_buffer[index + 0] = (color_index >> 7) & 1;
-							write_buffer[index + 1] = (color_index >> 6) & 1;
-							write_buffer[index + 2] = (color_index >> 5) & 1;
-							write_buffer[index + 3] = (color_index >> 4) & 1;
-							write_buffer[index + 4] = (color_index >> 3) & 1;
-							write_buffer[index + 5] = (color_index >> 2) & 1;
-							write_buffer[index + 6] = (color_index >> 1) & 1;
-							write_buffer[index + 7] = (color_index >> 0) & 1;
-
-							index += 8;
-							line_ptr += 1;
-						} break;
-						case 4: {
-							uint8_t color_index = *line_ptr;
-
-							write_buffer[index + 0] = (color_index >> 4) & 0x0f;
-							write_buffer[index + 1] = color_index & 0x0f;
-
-							index += 2;
-							line_ptr += 1;
-						} break;
-						case 8: {
-							uint8_t color_index = *line_ptr;
-
-							write_buffer[index] = color_index;
-
-							index += 1;
-							line_ptr += 1;
-						} break;
-						case 24: {
-							uint32_t color = *((uint32_t *)line_ptr);
-
-							write_buffer[index + 2] = color & 0xff;
-							write_buffer[index + 1] = (color >> 8) & 0xff;
-							write_buffer[index + 0] = (color >> 16) & 0xff;
-							write_buffer[index + 3] = 0xff;
-
-							index += 4;
-							line_ptr += 3;
-						} break;
-						case 32: {
-							uint32_t color = *((uint32_t *)line_ptr);
-
-							write_buffer[index + 2] = color & 0xff;
-							write_buffer[index + 1] = (color >> 8) & 0xff;
-							write_buffer[index + 0] = (color >> 16) & 0xff;
-							write_buffer[index + 3] = color >> 24;
-
-							index += 4;
-							line_ptr += 4;
-						} break;
-					}
+		if (bits_per_pixel <= 8) { // indexed
+			data_len = width * height;
+		} else { // color
+			data_len = width * height * 4;
+		}
+		ERR_FAIL_COND_V(data_len == 0, ERR_BUG);
+		err = data.resize(data_len);
+
+		PoolVector<uint8_t>::Write data_w = data.write();
+		uint8_t *write_buffer = data_w.ptr();
+
+		const uint32_t width_bytes = width * bits_per_pixel / 8;
+		const uint32_t line_width = (width_bytes + 3) & ~3;
+
+		// The actual data traversal is determined by
+		// the data width in case of 8/4/1 bit images
+		const uint32_t w = bits_per_pixel >= 24 ? width : width_bytes;
+		const uint8_t *line = p_buffer + (line_width * (height - 1));
+
+		for (uint64_t i = 0; i < height; i++) {
+			const uint8_t *line_ptr = line;
+
+			for (unsigned int j = 0; j < w; j++) {
+				switch (bits_per_pixel) {
+					case 1: {
+						uint8_t color_index = *line_ptr;
+
+						write_buffer[index + 0] = (color_index >> 7) & 1;
+						write_buffer[index + 1] = (color_index >> 6) & 1;
+						write_buffer[index + 2] = (color_index >> 5) & 1;
+						write_buffer[index + 3] = (color_index >> 4) & 1;
+						write_buffer[index + 4] = (color_index >> 3) & 1;
+						write_buffer[index + 5] = (color_index >> 2) & 1;
+						write_buffer[index + 6] = (color_index >> 1) & 1;
+						write_buffer[index + 7] = (color_index >> 0) & 1;
+
+						index += 8;
+						line_ptr += 1;
+					} break;
+					case 4: {
+						uint8_t color_index = *line_ptr;
+
+						write_buffer[index + 0] = (color_index >> 4) & 0x0f;
+						write_buffer[index + 1] = color_index & 0x0f;
+
+						index += 2;
+						line_ptr += 1;
+					} break;
+					case 8: {
+						uint8_t color_index = *line_ptr;
+
+						write_buffer[index] = color_index;
+
+						index += 1;
+						line_ptr += 1;
+					} break;
+					case 24: {
+						uint32_t color = *((uint32_t *)line_ptr);
+
+						write_buffer[index + 2] = color & 0xff;
+						write_buffer[index + 1] = (color >> 8) & 0xff;
+						write_buffer[index + 0] = (color >> 16) & 0xff;
+						write_buffer[index + 3] = 0xff;
+
+						index += 4;
+						line_ptr += 3;
+					} break;
+					case 32: {
+						uint32_t color = *((uint32_t *)line_ptr);
+
+						write_buffer[index + 2] = color & 0xff;
+						write_buffer[index + 1] = (color >> 8) & 0xff;
+						write_buffer[index + 0] = (color >> 16) & 0xff;
+						write_buffer[index + 3] = color >> 24;
+
+						index += 4;
+						line_ptr += 4;
+					} break;
 				}
-				line -= line_width;
 			}
+			line -= line_width;
+		}
 
-			if (p_color_buffer == NULL || color_table_size == 0) { // regular pixels
+		if (p_color_buffer == NULL || color_table_size == 0) { // regular pixels
 
-				p_image->create(width, height, 0, Image::FORMAT_RGBA8, data);
+			p_image->create(width, height, 0, Image::FORMAT_RGBA8, data);
 
-			} else { // data is in indexed format, extend it
+		} else { // data is in indexed format, extend it
 
-				// Palette data
-				PoolVector<uint8_t> palette_data;
-				palette_data.resize(color_table_size * 4);
+			// Palette data
+			PoolVector<uint8_t> palette_data;
+			palette_data.resize(color_table_size * 4);
 
-				PoolVector<uint8_t>::Write palette_data_w = palette_data.write();
-				uint8_t *pal = palette_data_w.ptr();
+			PoolVector<uint8_t>::Write palette_data_w = palette_data.write();
+			uint8_t *pal = palette_data_w.ptr();
 
-				const uint8_t *cb = p_color_buffer;
+			const uint8_t *cb = p_color_buffer;
 
-				for (unsigned int i = 0; i < color_table_size; ++i) {
-					uint32_t color = *((uint32_t *)cb);
+			for (unsigned int i = 0; i < color_table_size; ++i) {
+				uint32_t color = *((uint32_t *)cb);
 
-					pal[i * 4 + 0] = (color >> 16) & 0xff;
-					pal[i * 4 + 1] = (color >> 8) & 0xff;
-					pal[i * 4 + 2] = (color)&0xff;
-					pal[i * 4 + 3] = 0xff;
+				pal[i * 4 + 0] = (color >> 16) & 0xff;
+				pal[i * 4 + 1] = (color >> 8) & 0xff;
+				pal[i * 4 + 2] = (color)&0xff;
+				pal[i * 4 + 3] = 0xff;
 
-					cb += 4;
-				}
-				// Extend palette to image
-				PoolVector<uint8_t> extended_data;
-				extended_data.resize(data.size() * 4);
+				cb += 4;
+			}
+			// Extend palette to image
+			PoolVector<uint8_t> extended_data;
+			extended_data.resize(data.size() * 4);
 
-				PoolVector<uint8_t>::Write ex_w = extended_data.write();
-				uint8_t *dest = ex_w.ptr();
+			PoolVector<uint8_t>::Write ex_w = extended_data.write();
+			uint8_t *dest = ex_w.ptr();
 
-				const int num_pixels = width * height;
+			const int num_pixels = width * height;
 
-				for (int i = 0; i < num_pixels; i++) {
-					dest[0] = pal[write_buffer[i] * 4 + 0];
-					dest[1] = pal[write_buffer[i] * 4 + 1];
-					dest[2] = pal[write_buffer[i] * 4 + 2];
-					dest[3] = pal[write_buffer[i] * 4 + 3];
+			for (int i = 0; i < num_pixels; i++) {
+				dest[0] = pal[write_buffer[i] * 4 + 0];
+				dest[1] = pal[write_buffer[i] * 4 + 1];
+				dest[2] = pal[write_buffer[i] * 4 + 2];
+				dest[3] = pal[write_buffer[i] * 4 + 3];
 
-					dest += 4;
-				}
-				p_image->create(width, height, 0, Image::FORMAT_RGBA8, extended_data);
+				dest += 4;
 			}
+			p_image->create(width, height, 0, Image::FORMAT_RGBA8, extended_data);
 		}
 	}
 	return err;