godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Silence 'w' may be used uninitialized in image.cpp warning.

Browse Source 
Rename `w` to the more meaningful `data_write`
This commit is contained in:
Marcel Admiraal 2020-05-13 13:09:56 +01:00
parent 27b4915fa8
commit 6c4c1bf53d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/image.cpp
View File

@ -2055,7 +2055,7 @@ void Image::create(const char **p_xpm) {
HashMap<String, Color> colormap; HashMap<String, Color> colormap;
int colormap_size = 0; int colormap_size = 0;
uint32_t pixel_size = 0; uint32_t pixel_size = 0;
uint8_t *w; uint8_t *data_write = nullptr;
while (status != DONE) { while (status != DONE) {
@ -2158,7 +2158,7 @@ void Image::create(const char **p_xpm) {
status = READING_PIXELS; status = READING_PIXELS;
create(size_width, size_height, false, has_alpha ? FORMAT_RGBA8 : FORMAT_RGB8); create(size_width, size_height, false, has_alpha ? FORMAT_RGBA8 : FORMAT_RGB8);
w = data.ptrw(); data_write = data.ptrw();
pixel_size = has_alpha ? 4 : 3; pixel_size = has_alpha ? 4 : 3;
} }
} break; } break;
@ -2177,7 +2177,7 @@ void Image::create(const char **p_xpm) {
for (uint32_t i = 0; i < pixel_size; i++) { for (uint32_t i = 0; i < pixel_size; i++) {
pixel[i] = CLAMP((*colorptr)[i] * 255, 0, 255); pixel[i] = CLAMP((*colorptr)[i] * 255, 0, 255);
} }
_put_pixelb(x, y, pixel_size, w, pixel); _put_pixelb(x, y, pixel_size, data_write, pixel);
} }
if (y == (size_height - 1)) if (y == (size_height - 1))