Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2021-06-13 07:47:28 +0300
committerCampbell Barton <ideasman42@gmail.com>2021-06-13 07:54:54 +0300
commit5181bc46b3f29474ad0040108916d303b013424f (patch)
treeaf3abd88caa64d845b1e0a1a329f5744d5b58f7e /source/blender/datatoc
parent452590571c5d87e9abb3388d83bfee780c28a1c4 (diff)
Cleanup: allocation size mismatch warning
While harmless, use fixed size int type for pixel data.
Diffstat (limited to 'source/blender/datatoc')
-rw-r--r--source/blender/datatoc/datatoc_icon.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/datatoc/datatoc_icon.c b/source/blender/datatoc/datatoc_icon.c
index 0f5b155e343..7f1d90f20ea 100644
--- a/source/blender/datatoc/datatoc_icon.c
+++ b/source/blender/datatoc/datatoc_icon.c
@@ -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,
const char *file_src,
- uint **r_pixels_canvas,
+ uint32_t **r_pixels_canvas,
uint *r_canvas_w,
uint *r_canvas_h)
{
@@ -342,7 +342,7 @@ static bool icon_merge(struct IconMergeContext *context,
uint x, y;
/* canvas */
- uint *pixels_canvas;
+ uint32_t *pixels_canvas;
uint canvas_w, canvas_h;
if (!icon_read(file_src, &head, &pixels)) {
@@ -362,7 +362,7 @@ static bool icon_merge(struct IconMergeContext *context,
/* init once */
*r_canvas_w = head.canvas_w;
*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;
@@ -410,7 +410,7 @@ static bool icondir_to_png(const char *path_src, const char *file_dst)
struct IconMergeContext context;
- uint *pixels_canvas = NULL;
+ uint32_t *pixels_canvas = NULL;
uint canvas_w = 0, canvas_h = 0;
icon_merge_context_init(&context);