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/imbuf | |
| parent | a38313c3bdf1a250fb7dc93fefd8f89e81965a1e (diff) | |
Cleanup: pass const image data to IMB_ibImageFromMemory
Diffstat (limited to 'source/blender/imbuf')
| -rw-r--r-- | source/blender/imbuf/IMB_imbuf.h | 4 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/anim_movie.c | 2 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/readimage.c | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/source/blender/imbuf/IMB_imbuf.h b/source/blender/imbuf/IMB_imbuf.h index 81050841550..03d07844ec8 100644 --- a/source/blender/imbuf/IMB_imbuf.h +++ b/source/blender/imbuf/IMB_imbuf.h @@ -95,7 +95,9 @@ void IMB_exit(void); * * \attention Defined in readimage.c */ -struct ImBuf *IMB_ibImageFromMemory(unsigned char *mem, size_t size, int flags, char colorspace[IM_MAX_SPACE], const char *descr); +struct ImBuf *IMB_ibImageFromMemory( + const unsigned char *mem, size_t size, int flags, + char colorspace[IM_MAX_SPACE], const char *descr); /** * diff --git a/source/blender/imbuf/intern/anim_movie.c b/source/blender/imbuf/intern/anim_movie.c index f5b3cab2024..43d91dc0d8e 100644 --- a/source/blender/imbuf/intern/anim_movie.c +++ b/source/blender/imbuf/intern/anim_movie.c @@ -425,7 +425,7 @@ static ImBuf *avi_fetchibuf(struct anim *anim, int position) if (anim->pgf) { lpbi = AVIStreamGetFrame(anim->pgf, position + AVIStreamStart(anim->pavi[anim->firstvideo])); if (lpbi) { - ibuf = IMB_ibImageFromMemory((unsigned char *) lpbi, 100, IB_rect, anim->colorspace, "<avi_fetchibuf>"); + ibuf = IMB_ibImageFromMemory((const unsigned char *) lpbi, 100, IB_rect, anim->colorspace, "<avi_fetchibuf>"); //Oh brother... } } diff --git a/source/blender/imbuf/intern/readimage.c b/source/blender/imbuf/intern/readimage.c index feb75bed831..ad4e07030d1 100644 --- a/source/blender/imbuf/intern/readimage.c +++ b/source/blender/imbuf/intern/readimage.c @@ -92,7 +92,9 @@ static void imb_handle_alpha(ImBuf *ibuf, int flags, char colorspace[IM_MAX_SPAC colormanage_imbuf_make_linear(ibuf, effective_colorspace); } -ImBuf *IMB_ibImageFromMemory(unsigned char *mem, size_t size, int flags, char colorspace[IM_MAX_SPACE], const char *descr) +ImBuf *IMB_ibImageFromMemory( + const unsigned char *mem, size_t size, int flags, + char colorspace[IM_MAX_SPACE], const char *descr) { ImBuf *ibuf; const ImFileType *type; |