diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-01-08 11:58:01 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-01-08 11:58:01 +0300 |
commit | 4305950fc0f2e60c1c5e6a3d6ce73fb59c485865 (patch) | |
tree | f2cd41bb2871d565ac93f2c6c672c8eee8b37c04 /source | |
parent | 9fadacfd0f8e35e09b4db61e8a37259d88287d2d (diff) |
GHash: use reinsert instead of remove/insert
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/intern/tracking_util.c | 3 | ||||
-rw-r--r-- | source/blender/imbuf/intern/moviecache.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/tracking_util.c b/source/blender/blenkernel/intern/tracking_util.c index 17e4a3c73c3..882a6fabef1 100644 --- a/source/blender/blenkernel/intern/tracking_util.c +++ b/source/blender/blenkernel/intern/tracking_util.c @@ -172,8 +172,7 @@ void tracks_map_merge(TracksMap *map, MovieTracking *tracking) MovieTrackingTrack *new_track = BKE_tracking_track_duplicate(track); /* Update old-new track mapping */ - BLI_ghash_remove(map->hash, track, NULL, NULL); - BLI_ghash_insert(map->hash, track, new_track); + BLI_ghash_reinsert(map->hash, track, new_track, NULL, NULL); BLI_addtail(&tracks, new_track); } diff --git a/source/blender/imbuf/intern/moviecache.c b/source/blender/imbuf/intern/moviecache.c index 8589ce09b9e..cb789cc8491 100644 --- a/source/blender/imbuf/intern/moviecache.c +++ b/source/blender/imbuf/intern/moviecache.c @@ -363,8 +363,7 @@ static void do_moviecache_put(MovieCache *cache, void *userkey, ImBuf *ibuf, boo item->priority_data = cache->getprioritydatafp(userkey); } - BLI_ghash_remove(cache->hash, key, moviecache_keyfree, moviecache_valfree); - BLI_ghash_insert(cache->hash, key, item); + BLI_ghash_reinsert(cache->hash, key, item, moviecache_keyfree, moviecache_valfree); if (cache->last_userkey) { memcpy(cache->last_userkey, userkey, cache->keysize); |