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-08-06 06:59:38 +0300
committerCampbell Barton <ideasman42@gmail.com>2021-08-06 07:24:16 +0300
commitbc97d7832906318a1185b3fb460b1d8d89020ba0 (patch)
tree096969472b2a5ad82c56d8f616cd398f47840bdf /source/blender/imbuf
parent99738fbfdc8b4639d95c796bcc8711bd89c1aaa4 (diff)
Cleanup: use MEM_SAFE_FREE macro
Diffstat (limited to 'source/blender/imbuf')
-rw-r--r--source/blender/imbuf/intern/colormanagement.c6
-rw-r--r--source/blender/imbuf/intern/moviecache.c16
2 files changed, 4 insertions, 18 deletions
diff --git a/source/blender/imbuf/intern/colormanagement.c b/source/blender/imbuf/intern/colormanagement.c
index 2cc44ebc67b..8b2ac2ed22d 100644
--- a/source/blender/imbuf/intern/colormanagement.c
+++ b/source/blender/imbuf/intern/colormanagement.c
@@ -759,11 +759,7 @@ static bool colormanage_use_look(const char *look, const char *view_name)
void colormanage_cache_free(ImBuf *ibuf)
{
- if (ibuf->display_buffer_flags) {
- MEM_freeN(ibuf->display_buffer_flags);
-
- ibuf->display_buffer_flags = NULL;
- }
+ MEM_SAFE_FREE(ibuf->display_buffer_flags);
if (ibuf->colormanage_cache) {
ColormanageCacheData *cache_data = colormanage_cachedata_get(ibuf);
diff --git a/source/blender/imbuf/intern/moviecache.c b/source/blender/imbuf/intern/moviecache.c
index e395222a214..6cc1932eff6 100644
--- a/source/blender/imbuf/intern/moviecache.c
+++ b/source/blender/imbuf/intern/moviecache.c
@@ -179,10 +179,7 @@ static void IMB_moviecache_destructor(void *p)
item->c_handle = NULL;
/* force cached segments to be updated */
- if (cache->points) {
- MEM_freeN(cache->points);
- cache->points = NULL;
- }
+ MEM_SAFE_FREE(cache->points);
}
}
@@ -355,10 +352,7 @@ static void do_moviecache_put(MovieCache *cache, void *userkey, ImBuf *ibuf, boo
/* cache limiter can't remove unused keys which points to destroyed values */
check_unused_keys(cache);
- if (cache->points) {
- MEM_freeN(cache->points);
- cache->points = NULL;
- }
+ MEM_SAFE_FREE(cache->points);
}
void IMB_moviecache_put(MovieCache *cache, void *userkey, ImBuf *ibuf)
@@ -488,11 +482,7 @@ void IMB_moviecache_get_cache_segments(
}
if (cache->proxy != proxy || cache->render_flags != render_flags) {
- if (cache->points) {
- MEM_freeN(cache->points);
- }
-
- cache->points = NULL;
+ MEM_SAFE_FREE(cache->points);
}
if (cache->points) {