[Bf-blender-cvs] [4305950] master: GHash: use reinsert instead of remove/insert

[Campbell Barton]

Commit: 4305950fc0f2e60c1c5e6a3d6ce73fb59c485865
Author: Campbell Barton
Date:   Thu Jan 8 19:58:01 2015 +1100
Branches: master
https://developer.blender.org/rB4305950fc0f2e60c1c5e6a3d6ce73fb59c485865

GHash: use reinsert instead of remove/insert

===================================================================

M	source/blender/blenkernel/intern/tracking_util.c
M	source/blender/imbuf/intern/moviecache.c

===================================================================

diff --git a/source/blender/blenkernel/intern/tracking_util.c b/source/blender/blenkernel/intern/tracking_util.c
index 17e4a3c..882a6fa 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 8589ce0..cb789cc 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);