diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-03-25 01:08:29 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-03-25 01:08:29 +0300 |
| commit | 72ede30d0f970fe7d6774ce0851e3aacc82e23d8 (patch) | |
| tree | 67116106c9b27f1f6b00eff373004691c1e8f086 /source/blender/editors | |
| parent | a38313c3bdf1a250fb7dc93fefd8f89e81965a1e (diff) | |
Cleanup: pass const image data to IMB_ibImageFromMemory
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/interface/interface_icons.c | 6 | ||||
| -rw-r--r-- | source/blender/editors/space_file/filelist.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c index ae9ee152d0f..8606779d5fd 100644 --- a/source/blender/editors/interface/interface_icons.c +++ b/source/blender/editors/interface/interface_icons.c @@ -92,7 +92,7 @@ typedef struct IconImage { int w; int h; uint *rect; - uchar *datatoc_rect; + const uchar *datatoc_rect; int datatoc_size; } IconImage; @@ -719,13 +719,13 @@ static void init_internal_icons(void) } #endif if (b16buf == NULL) - b16buf = IMB_ibImageFromMemory((uchar *)datatoc_blender_icons16_png, + b16buf = IMB_ibImageFromMemory((const uchar *)datatoc_blender_icons16_png, datatoc_blender_icons16_png_size, IB_rect, NULL, "<blender icons>"); if (b16buf) IMB_premultiply_alpha(b16buf); if (b32buf == NULL) - b32buf = IMB_ibImageFromMemory((uchar *)datatoc_blender_icons32_png, + b32buf = IMB_ibImageFromMemory((const uchar *)datatoc_blender_icons32_png, datatoc_blender_icons32_png_size, IB_rect, NULL, "<blender icons>"); if (b32buf) IMB_premultiply_alpha(b32buf); diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c index eec30adff10..623442b753a 100644 --- a/source/blender/editors/space_file/filelist.c +++ b/source/blender/editors/space_file/filelist.c @@ -787,7 +787,7 @@ void filelist_init_icons(void) #ifdef WITH_HEADLESS bbuf = NULL; #else - bbuf = IMB_ibImageFromMemory((unsigned char *)datatoc_prvicons_png, datatoc_prvicons_png_size, IB_rect, NULL, "<splash>"); + bbuf = IMB_ibImageFromMemory((const uchar *)datatoc_prvicons_png, datatoc_prvicons_png_size, IB_rect, NULL, "<splash>"); #endif if (bbuf) { for (y = 0; y < SPECIAL_IMG_ROWS; y++) { |