[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48631] branches/soc-2011-tomato/source/ blender/imbuf: Color management: remove unused code

[Sergey Sharybin]

Revision: 48631
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48631
Author:   nazgul
Date:     2012-07-05 09:41:07 +0000 (Thu, 05 Jul 2012)
Log Message:
-----------
Color management: remove unused code

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/imbuf/IMB_moviecache.h
    branches/soc-2011-tomato/source/blender/imbuf/intern/moviecache.c

Modified: branches/soc-2011-tomato/source/blender/imbuf/IMB_moviecache.h
===================================================================
--- branches/soc-2011-tomato/source/blender/imbuf/IMB_moviecache.h      
2012-07-05 09:41:00 UTC (rev 48630)
+++ branches/soc-2011-tomato/source/blender/imbuf/IMB_moviecache.h      
2012-07-05 09:41:07 UTC (rev 48631)
@@ -43,8 +43,6 @@
 struct MovieCache;
 
 typedef void (*MovieCacheGetKeyDataFP) (void *userkey, int *framenr, int 
*proxy, int *render_flags);
-typedef void (*MovieCacheKeyDeleterFP) (void *userkey);
-typedef int (*MovieCacheCheckKeyUnusedFP) (void *userkey);
 
 typedef void  *(*MovieCacheGetPriorityDataFP) (void *userkey);
 typedef int    (*MovieCacheGetItemPriorityFP) (void *last_userkey, void 
*priority_data);
@@ -54,9 +52,7 @@
 void IMB_moviecache_destruct(void);
 
 struct MovieCache *IMB_moviecache_create(const char *name, int keysize, 
GHashHashFP hashfp, GHashCmpFP cmpfp);
-void IMB_moviecache_set_key_deleter_callback(struct MovieCache *cache, 
MovieCacheKeyDeleterFP keydeleterfp);
 void IMB_moviecache_set_getdata_callback(struct MovieCache *cache, 
MovieCacheGetKeyDataFP getdatafp);
-void IMB_moviecache_set_check_unused_callback(struct MovieCache *cache, 
MovieCacheCheckKeyUnusedFP checkkeyunusedfp);
 void IMB_moviecache_set_priority_callback(struct MovieCache *cache, 
MovieCacheGetPriorityDataFP getprioritydatafp,
                                           MovieCacheGetItemPriorityFP 
getitempriorityfp,
                                           MovieCachePriorityDeleterFP 
prioritydeleterfp);

Modified: branches/soc-2011-tomato/source/blender/imbuf/intern/moviecache.c
===================================================================
--- branches/soc-2011-tomato/source/blender/imbuf/intern/moviecache.c   
2012-07-05 09:41:00 UTC (rev 48630)
+++ branches/soc-2011-tomato/source/blender/imbuf/intern/moviecache.c   
2012-07-05 09:41:07 UTC (rev 48631)
@@ -63,11 +63,9 @@
        char name[64];
 
        GHash *hash;
-       MovieCacheKeyDeleterFP keydeleterfp;
        GHashHashFP hashfp;
        GHashCmpFP cmpfp;
        MovieCacheGetKeyDataFP getdatafp;
-       MovieCacheCheckKeyUnusedFP checkkeyunusedfp;
 
        MovieCacheGetPriorityDataFP getprioritydatafp;
        MovieCacheGetItemPriorityFP getitempriorityfp;
@@ -116,10 +114,6 @@
 {
        MovieCacheKey *key = (MovieCacheKey *)val;
 
-       if (key->cache_owner->keydeleterfp) {
-               key->cache_owner->keydeleterfp(key->userkey);
-       }
-
        BLI_mempool_free(key->cache_owner->userkeys_pool, key->userkey);
 
        BLI_mempool_free(key->cache_owner->keys_pool, key);
@@ -161,13 +155,6 @@
                if (remove)
                        PRINT("%s: cache '%s' remove item %p without buffer\n", 
__func__, cache->name, item);
 
-               if (!remove && cache->checkkeyunusedfp) {
-                       remove = cache->checkkeyunusedfp(key->userkey);
-
-                       if (remove)
-                               PRINT("%s: cache '%s' remove unused item %p\n", 
__func__, cache->name, item);
-               }
-
                if (remove)
                        BLI_ghash_remove(cache->hash, key, moviecache_keyfree, 
moviecache_valfree);
        }
@@ -299,21 +286,11 @@
        return cache;
 }
 
-void IMB_moviecache_set_key_deleter_callback(MovieCache *cache, 
MovieCacheKeyDeleterFP keydeleterfp)
-{
-       cache->keydeleterfp = keydeleterfp;
-}
-
 void IMB_moviecache_set_getdata_callback(MovieCache *cache, 
MovieCacheGetKeyDataFP getdatafp)
 {
        cache->getdatafp = getdatafp;
 }
 
-void IMB_moviecache_set_check_unused_callback(MovieCache *cache, 
MovieCacheCheckKeyUnusedFP checkkeyunusedfp)
-{
-       cache->checkkeyunusedfp = checkkeyunusedfp;
-}
-
 void IMB_moviecache_set_priority_callback(struct MovieCache *cache, 
MovieCacheGetPriorityDataFP getprioritydatafp,
                                           MovieCacheGetItemPriorityFP 
getitempriorityfp,
                                           MovieCachePriorityDeleterFP 
prioritydeleterfp)

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs