[Bf-blender-cvs] [af17873] multiview: Remove unused function (BKE_image_cache_count and IMB_moviecache_count)
Dalai Felinto
noreply at git.blender.org
Wed Sep 10 17:04:09 CEST 2014
Commit: af178735adfe692f1995587d09d021159ea06614
Author: Dalai Felinto
Date: Wed Sep 10 14:31:05 2014 +0200
Branches: multiview
https://developer.blender.org/rBaf178735adfe692f1995587d09d021159ea06614
Remove unused function (BKE_image_cache_count and IMB_moviecache_count)
===================================================================
M source/blender/blenkernel/BKE_image.h
M source/blender/blenkernel/intern/image.c
M source/blender/imbuf/IMB_moviecache.h
M source/blender/imbuf/intern/moviecache.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_image.h b/source/blender/blenkernel/BKE_image.h
index 4207b4f..068ad6a 100644
--- a/source/blender/blenkernel/BKE_image.h
+++ b/source/blender/blenkernel/BKE_image.h
@@ -53,7 +53,6 @@ struct ReportList;
void BKE_images_init(void);
void BKE_images_exit(void);
-int BKE_image_cache_count(struct Image *image);
void BKE_image_free_packedfiles(struct Image *image);
void BKE_image_free_views(struct Image *image);
void BKE_image_free_buffers(struct Image *image);
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index 267ed0d..96e6472 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -259,14 +259,6 @@ static void image_free_cahced_frames(Image *image)
}
}
-int BKE_image_cache_count(Image *image)
-{
- if (image->cache)
- return IMB_moviecache_count(image->cache);
- else
- return 0;
-}
-
static void image_free_packedfiles(Image *ima)
{
while (ima->packedfiles.last) {
diff --git a/source/blender/imbuf/IMB_moviecache.h b/source/blender/imbuf/IMB_moviecache.h
index 9d31561..0c72d1b 100644
--- a/source/blender/imbuf/IMB_moviecache.h
+++ b/source/blender/imbuf/IMB_moviecache.h
@@ -77,5 +77,4 @@ void IMB_moviecacheIter_step(struct MovieCacheIter *iter);
struct ImBuf *IMB_moviecacheIter_getImBuf(struct MovieCacheIter *iter);
void *IMB_moviecacheIter_getUserKey(struct MovieCacheIter *iter);
-size_t IMB_moviecache_count(struct MovieCache *cache);
#endif
diff --git a/source/blender/imbuf/intern/moviecache.c b/source/blender/imbuf/intern/moviecache.c
index 3a54e85..ea75673 100644
--- a/source/blender/imbuf/intern/moviecache.c
+++ b/source/blender/imbuf/intern/moviecache.c
@@ -619,18 +619,3 @@ void *IMB_moviecacheIter_getUserKey(struct MovieCacheIter *iter)
MovieCacheKey *key = BLI_ghashIterator_getKey((GHashIterator *) iter);
return key->userkey;
}
-
-size_t IMB_moviecache_count(MovieCache *cache)
-{
- GHashIterator *iter;
- size_t tot = 0;
-
- iter = BLI_ghashIterator_new(cache->hash);
- while (!BLI_ghashIterator_done(iter)) {
- BLI_ghashIterator_step(iter);
- tot++;
- }
-
- BLI_ghashIterator_free(iter);
- return tot;
-}
More information about the Bf-blender-cvs
mailing list