diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-09-26 15:16:27 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-09-26 15:16:27 +0400 |
| commit | 9e96295ddbe0ee67b7a2706eb951d3d8f6cfb65d (patch) | |
| tree | 4f3a6f02480e49d77d0c36ceff492a46b1a5d79e /source/blender/imbuf | |
| parent | e2baa41ec71b3b0f942a24d532c0b912c64ca12e (diff) | |
Fix #32666: Memory Cache Limit stops working after set to 2048
Solved two issues here:
- RNA update function for cache limiter wasn't type-casting to size_t
type, which lead to long int overflow.
- Display buffer size in color management wasn't calculated properly,
ended up with much more extra memory usage than it's needed.
Diffstat (limited to 'source/blender/imbuf')
| -rw-r--r-- | source/blender/imbuf/intern/colormanagement.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/imbuf/intern/colormanagement.c b/source/blender/imbuf/intern/colormanagement.c index 91357e94a54..12222cef8cb 100644 --- a/source/blender/imbuf/intern/colormanagement.c +++ b/source/blender/imbuf/intern/colormanagement.c @@ -1831,7 +1831,7 @@ unsigned char *IMB_display_buffer_acquire(ImBuf *ibuf, const ColorManagedViewSet return display_buffer; } - buffer_size = DISPLAY_BUFFER_CHANNELS * ibuf->x * ibuf->y * sizeof(float); + buffer_size = DISPLAY_BUFFER_CHANNELS * ibuf->x * ibuf->y * sizeof(char); display_buffer = MEM_callocN(buffer_size, "imbuf display buffer"); colormanage_display_buffer_process(ibuf, display_buffer, applied_view_settings, display_settings); |