archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: allocation size mismatch warning

Browse Source 
While harmless, use fixed size int type for pixel data.
This commit is contained in:
Campbell Barton
2021-06-13 14:47:28 +10:00
parent 452590571c
commit 5181bc46b3
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/datatoc/datatoc_icon.c
View File

@@ -332,7 +332,7 @@ static bool icon_read(const char *file_src, struct IconHead *r_head, uint **r_pi
static bool icon_merge(struct IconMergeContext *context, static bool icon_merge(struct IconMergeContext *context,
const char *file_src, const char *file_src,
uint **r_pixels_canvas, uint32_t **r_pixels_canvas,
uint *r_canvas_w, uint *r_canvas_w,
uint *r_canvas_h) uint *r_canvas_h)
{ {
@@ -342,7 +342,7 @@ static bool icon_merge(struct IconMergeContext *context,
uint x, y; uint x, y;
/* canvas */ /* canvas */
uint *pixels_canvas; uint32_t *pixels_canvas;
uint canvas_w, canvas_h; uint canvas_w, canvas_h;
if (!icon_read(file_src, &head, &pixels)) { if (!icon_read(file_src, &head, &pixels)) {
@@ -362,7 +362,7 @@ static bool icon_merge(struct IconMergeContext *context,
/* init once */ /* init once */
*r_canvas_w = head.canvas_w; *r_canvas_w = head.canvas_w;
*r_canvas_h = head.canvas_h; *r_canvas_h = head.canvas_h;
*r_pixels_canvas = calloc(1, (head.canvas_w * head.canvas_h) * sizeof(const unsigned char[4])); *r_pixels_canvas = calloc(1, (head.canvas_w * head.canvas_h) * sizeof(uint32_t));
} }
canvas_w = *r_canvas_w; canvas_w = *r_canvas_w;
@@ -410,7 +410,7 @@ static bool icondir_to_png(const char *path_src, const char *file_dst)
struct IconMergeContext context; struct IconMergeContext context;
uint *pixels_canvas = NULL; uint32_t *pixels_canvas = NULL;
uint canvas_w = 0, canvas_h = 0; uint canvas_w = 0, canvas_h = 0;
icon_merge_context_init(&context); icon_merge_context_init(&context);