diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-01-31 15:11:56 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-01-31 15:11:56 +0400 |
commit | f07f59c760eeb2466f9f1bc74c6b4d6ba4b348d3 (patch) | |
tree | 21f3adc21819a2c7a3255f0ae2e864a5d121d6ad /source/blender | |
parent | 54dc5f16543a796bf400d26a4aa3dea469cd1bdb (diff) |
Cache limiter will now work properly with limits >= 4Gb
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/imbuf/intern/moviecache.c | 8 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_files.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/imbuf/intern/moviecache.c b/source/blender/imbuf/intern/moviecache.c index b19b88248f4..fd0a0372a9c 100644 --- a/source/blender/imbuf/intern/moviecache.c +++ b/source/blender/imbuf/intern/moviecache.c @@ -147,10 +147,10 @@ static void IMB_moviecache_destructor(void *p) } /* approximate size of ImBuf in memory */ -static intptr_t IMB_get_size_in_memory(ImBuf *ibuf) +static size_t IMB_get_size_in_memory(ImBuf *ibuf) { int a; - intptr_t size= 0, channel_size= 0; + size_t size= 0, channel_size= 0; size+= sizeof(ImBuf); @@ -176,9 +176,9 @@ static intptr_t IMB_get_size_in_memory(ImBuf *ibuf) return size; } -static intptr_t get_item_size (void *p) +static size_t get_item_size (void *p) { - intptr_t size= sizeof(MovieCacheItem); + size_t size= sizeof(MovieCacheItem); MovieCacheItem *item= (MovieCacheItem *) p; if(item->ibuf) diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index 1df7f3228a0..a4c90888b74 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -277,7 +277,7 @@ static void wm_window_match_do(bContext *C, ListBase *oldwmlist) static void wm_init_userdef(bContext *C) { UI_init_userdef(); - MEM_CacheLimiter_set_maximum(U.memcachelimit * 1024 * 1024); + MEM_CacheLimiter_set_maximum(((size_t)U.memcachelimit) * 1024 * 1024); sound_init(CTX_data_main(C)); /* needed so loading a file from the command line respects user-pref [#26156] */ |