diff options
| author | Monique <mdewanchand@atmind.nl> | 2022-09-13 20:08:34 +0300 |
|---|---|---|
| committer | Monique <mdewanchand@atmind.nl> | 2022-09-13 20:08:34 +0300 |
| commit | e449a9bb5e11c07b315f9eb2dcb7de0237f37c02 (patch) | |
| tree | 6a7eeddd3738701a1a8a0b78135965f02d30ccbc /source/blender/imbuf/intern/readimage.c | |
| parent | 22d1673b927e041838cd49e3d13615365bbdafdd (diff) | |
| parent | 08a8de739d8c7fa60f257ed171d292879edae013 (diff) | |
Merge branch 'master' into temp-T73411-add-scene-parameterstemp-T73411-add-scene-parameters
Diffstat (limited to 'source/blender/imbuf/intern/readimage.c')
| -rw-r--r-- | source/blender/imbuf/intern/readimage.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/source/blender/imbuf/intern/readimage.c b/source/blender/imbuf/intern/readimage.c index b33e9dc4e0e..a9b79ad6d19 100644 --- a/source/blender/imbuf/intern/readimage.c +++ b/source/blender/imbuf/intern/readimage.c @@ -81,11 +81,8 @@ static void imb_handle_alpha(ImBuf *ibuf, colormanage_imbuf_make_linear(ibuf, effective_colorspace); } -ImBuf *IMB_ibImageFromMemory(const unsigned char *mem, - size_t size, - int flags, - char colorspace[IM_MAX_SPACE], - const char *descr) +ImBuf *IMB_ibImageFromMemory( + const uchar *mem, size_t size, int flags, char colorspace[IM_MAX_SPACE], const char *descr) { ImBuf *ibuf; const ImFileType *type; @@ -157,7 +154,7 @@ ImBuf *IMB_loadifffile( int file, const char *filepath, int flags, char colorspace[IM_MAX_SPACE], const char *descr) { ImBuf *ibuf; - unsigned char *mem; + uchar *mem; size_t size; if (file == -1) { @@ -319,9 +316,9 @@ ImBuf *IMB_testiffname(const char *filepath, int flags) return ibuf; } -static void imb_loadtilefile(ImBuf *ibuf, int file, int tx, int ty, unsigned int *rect) +static void imb_loadtilefile(ImBuf *ibuf, int file, int tx, int ty, uint *rect) { - unsigned char *mem; + uchar *mem; size_t size; if (file == -1) { @@ -352,7 +349,7 @@ static void imb_loadtilefile(ImBuf *ibuf, int file, int tx, int ty, unsigned int imb_mmap_unlock(); } -void imb_loadtile(ImBuf *ibuf, int tx, int ty, unsigned int *rect) +void imb_loadtile(ImBuf *ibuf, int tx, int ty, uint *rect) { int file; |