diff options
Diffstat (limited to 'source/blender/imbuf')
-rw-r--r-- | source/blender/imbuf/intern/cineon/cineonlib.c | 2 | ||||
-rw-r--r-- | source/blender/imbuf/intern/cineon/dpxlib.c | 2 | ||||
-rw-r--r-- | source/blender/imbuf/intern/colormanagement.c | 6 | ||||
-rw-r--r-- | source/blender/imbuf/intern/moviecache.c | 12 |
4 files changed, 11 insertions, 11 deletions
diff --git a/source/blender/imbuf/intern/cineon/cineonlib.c b/source/blender/imbuf/intern/cineon/cineonlib.c index 880df0ce5c3..0e71206517e 100644 --- a/source/blender/imbuf/intern/cineon/cineonlib.c +++ b/source/blender/imbuf/intern/cineon/cineonlib.c @@ -135,7 +135,7 @@ LogImageFile *cineonOpen(const unsigned char *byteStuff, int fromMemory, size_t { CineonMainHeader header; LogImageFile *cineon = (LogImageFile *)MEM_mallocN(sizeof(LogImageFile), __func__); - char *filename = (char *)byteStuff; + const char *filename = (const char *)byteStuff; int i; unsigned int dataOffset; diff --git a/source/blender/imbuf/intern/cineon/dpxlib.c b/source/blender/imbuf/intern/cineon/dpxlib.c index 626d05b05c5..e561101ecb3 100644 --- a/source/blender/imbuf/intern/cineon/dpxlib.c +++ b/source/blender/imbuf/intern/cineon/dpxlib.c @@ -134,7 +134,7 @@ LogImageFile *dpxOpen(const unsigned char *byteStuff, int fromMemory, size_t buf { DpxMainHeader header; LogImageFile *dpx = (LogImageFile *)MEM_mallocN(sizeof(LogImageFile), __func__); - char *filename = (char *)byteStuff; + const char *filename = (const char *)byteStuff; int i; if (dpx == NULL) { diff --git a/source/blender/imbuf/intern/colormanagement.c b/source/blender/imbuf/intern/colormanagement.c index 43b766f161b..049d8bdcff1 100644 --- a/source/blender/imbuf/intern/colormanagement.c +++ b/source/blender/imbuf/intern/colormanagement.c @@ -243,7 +243,7 @@ static ColormnaageCacheData *colormanage_cachedata_get(const ImBuf *ibuf) static unsigned int colormanage_hashhash(const void *key_v) { - ColormanageCacheKey *key = (ColormanageCacheKey *)key_v; + const ColormanageCacheKey *key = key_v; unsigned int rval = (key->display << 16) | (key->view % 0xffff); @@ -252,8 +252,8 @@ static unsigned int colormanage_hashhash(const void *key_v) static bool colormanage_hashcmp(const void *av, const void *bv) { - const ColormanageCacheKey *a = (ColormanageCacheKey *) av; - const ColormanageCacheKey *b = (ColormanageCacheKey *) bv; + const ColormanageCacheKey *a = av; + const ColormanageCacheKey *b = bv; return ((a->view != b->view) || (a->display != b->display)); diff --git a/source/blender/imbuf/intern/moviecache.c b/source/blender/imbuf/intern/moviecache.c index 1641bd3089b..8589ce09b9e 100644 --- a/source/blender/imbuf/intern/moviecache.c +++ b/source/blender/imbuf/intern/moviecache.c @@ -99,22 +99,22 @@ typedef struct MovieCacheItem { static unsigned int moviecache_hashhash(const void *keyv) { - MovieCacheKey *key = (MovieCacheKey *)keyv; + const MovieCacheKey *key = keyv; return key->cache_owner->hashfp(key->userkey); } static bool moviecache_hashcmp(const void *av, const void *bv) { - const MovieCacheKey *a = (MovieCacheKey *)av; - const MovieCacheKey *b = (MovieCacheKey *)bv; + const MovieCacheKey *a = av; + const MovieCacheKey *b = bv; return a->cache_owner->cmpfp(a->userkey, b->userkey); } static void moviecache_keyfree(void *val) { - MovieCacheKey *key = (MovieCacheKey *)val; + MovieCacheKey *key = val; BLI_mempool_free(key->cache_owner->userkeys_pool, key->userkey); @@ -167,8 +167,8 @@ static void check_unused_keys(MovieCache *cache) static int compare_int(const void *av, const void *bv) { - const int *a = (int *)av; - const int *b = (int *)bv; + const int *a = av; + const int *b = bv; return *a - *b; } |