bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Color management: remove unused code

Browse Source
This commit is contained in:
Sergey Sharybin 2012-07-05 09:41:07 +00:00
parent 83758c4154
commit 8b1f1be3ae
2 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/imbuf/IMB_moviecache.h
View File

@ -43,8 +43,6 @@ struct ImBuf;
struct MovieCache; struct MovieCache;
typedef void (*MovieCacheGetKeyDataFP) (void *userkey, int *framenr, int *proxy, int *render_flags); 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 void *(*MovieCacheGetPriorityDataFP) (void *userkey);
typedef int (*MovieCacheGetItemPriorityFP) (void *last_userkey, void *priority_data); typedef int (*MovieCacheGetItemPriorityFP) (void *last_userkey, void *priority_data);
@ -54,9 +52,7 @@ void IMB_moviecache_init(void);
void IMB_moviecache_destruct(void); void IMB_moviecache_destruct(void);
struct MovieCache *IMB_moviecache_create(const char *name, int keysize, GHashHashFP hashfp, GHashCmpFP cmpfp); 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_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, void IMB_moviecache_set_priority_callback(struct MovieCache *cache, MovieCacheGetPriorityDataFP getprioritydatafp,
MovieCacheGetItemPriorityFP getitempriorityfp, MovieCacheGetItemPriorityFP getitempriorityfp,
MovieCachePriorityDeleterFP prioritydeleterfp); MovieCachePriorityDeleterFP prioritydeleterfp);

23
source/blender/imbuf/intern/moviecache.c
View File

@ -63,11 +63,9 @@ typedef struct MovieCache {
char name[64]; char name[64];
GHash *hash; GHash *hash;
MovieCacheKeyDeleterFP keydeleterfp;
GHashHashFP hashfp; GHashHashFP hashfp;
GHashCmpFP cmpfp; GHashCmpFP cmpfp;
MovieCacheGetKeyDataFP getdatafp; MovieCacheGetKeyDataFP getdatafp;
MovieCacheCheckKeyUnusedFP checkkeyunusedfp;
MovieCacheGetPriorityDataFP getprioritydatafp; MovieCacheGetPriorityDataFP getprioritydatafp;
MovieCacheGetItemPriorityFP getitempriorityfp; MovieCacheGetItemPriorityFP getitempriorityfp;
@ -116,10 +114,6 @@ static void moviecache_keyfree(void *val)
{ {
MovieCacheKey *key = (MovieCacheKey *)val; 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->userkeys_pool, key->userkey);
BLI_mempool_free(key->cache_owner->keys_pool, key); BLI_mempool_free(key->cache_owner->keys_pool, key);
@ -161,13 +155,6 @@ static void check_unused_keys(MovieCache *cache)
if (remove) if (remove)
PRINT("%s: cache '%s' remove item %p without buffer\n", __func__, cache->name, item); 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) if (remove)
BLI_ghash_remove(cache->hash, key, moviecache_keyfree, moviecache_valfree); BLI_ghash_remove(cache->hash, key, moviecache_keyfree, moviecache_valfree);
} }
@ -299,21 +286,11 @@ MovieCache *IMB_moviecache_create(const char *name, int keysize, GHashHashFP has
return cache; 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) void IMB_moviecache_set_getdata_callback(MovieCache *cache, MovieCacheGetKeyDataFP getdatafp)
{ {
cache->getdatafp = 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, void IMB_moviecache_set_priority_callback(struct MovieCache *cache, MovieCacheGetPriorityDataFP getprioritydatafp,
MovieCacheGetItemPriorityFP getitempriorityfp, MovieCacheGetItemPriorityFP getitempriorityfp,
MovieCachePriorityDeleterFP prioritydeleterfp) MovieCachePriorityDeleterFP prioritydeleterfp)