diff options
Diffstat (limited to 'source/blender/blenlib/intern/buffer.c')
-rw-r--r-- | source/blender/blenlib/intern/buffer.c | 98 |
1 files changed, 49 insertions, 49 deletions
diff --git a/source/blender/blenlib/intern/buffer.c b/source/blender/blenlib/intern/buffer.c index 50401fe6091..fb4350501cd 100644 --- a/source/blender/blenlib/intern/buffer.c +++ b/source/blender/blenlib/intern/buffer.c @@ -52,38 +52,38 @@ static void *buffer_alloc(BLI_Buffer *buffer, const size_t len) { - return MEM_mallocN(buffer->elem_size * len, "BLI_Buffer.data"); + return MEM_mallocN(buffer->elem_size * len, "BLI_Buffer.data"); } static void *buffer_realloc(BLI_Buffer *buffer, const size_t len) { - return MEM_reallocN_id(buffer->data, buffer->elem_size * len, "BLI_Buffer.data"); + return MEM_reallocN_id(buffer->data, buffer->elem_size * len, "BLI_Buffer.data"); } void BLI_buffer_resize(BLI_Buffer *buffer, const size_t new_count) { - if (UNLIKELY(new_count > buffer->alloc_count)) { - if (buffer->flag & BLI_BUFFER_USE_STATIC) { - void *orig = buffer->data; - - buffer->data = buffer_alloc(buffer, new_count); - memcpy(buffer->data, orig, buffer->elem_size * buffer->count); - buffer->alloc_count = new_count; - buffer->flag &= ~BLI_BUFFER_USE_STATIC; - } - else { - if (buffer->alloc_count && (new_count < buffer->alloc_count * 2)) { - buffer->alloc_count *= 2; - } - else { - buffer->alloc_count = new_count; - } - - buffer->data = buffer_realloc(buffer, buffer->alloc_count); - } - } - - buffer->count = new_count; + if (UNLIKELY(new_count > buffer->alloc_count)) { + if (buffer->flag & BLI_BUFFER_USE_STATIC) { + void *orig = buffer->data; + + buffer->data = buffer_alloc(buffer, new_count); + memcpy(buffer->data, orig, buffer->elem_size * buffer->count); + buffer->alloc_count = new_count; + buffer->flag &= ~BLI_BUFFER_USE_STATIC; + } + else { + if (buffer->alloc_count && (new_count < buffer->alloc_count * 2)) { + buffer->alloc_count *= 2; + } + else { + buffer->alloc_count = new_count; + } + + buffer->data = buffer_realloc(buffer, buffer->alloc_count); + } + } + + buffer->count = new_count; } /** @@ -93,34 +93,34 @@ void BLI_buffer_resize(BLI_Buffer *buffer, const size_t new_count) */ void BLI_buffer_reinit(BLI_Buffer *buffer, const size_t new_count) { - if (UNLIKELY(new_count > buffer->alloc_count)) { - if ((buffer->flag & BLI_BUFFER_USE_STATIC) == 0) { - if (buffer->data) { - MEM_freeN(buffer->data); - } - } - - if (buffer->alloc_count && (new_count < buffer->alloc_count * 2)) { - buffer->alloc_count *= 2; - } - else { - buffer->alloc_count = new_count; - } - - buffer->flag &= ~BLI_BUFFER_USE_STATIC; - buffer->data = buffer_alloc(buffer, buffer->alloc_count); - } - - buffer->count = new_count; + if (UNLIKELY(new_count > buffer->alloc_count)) { + if ((buffer->flag & BLI_BUFFER_USE_STATIC) == 0) { + if (buffer->data) { + MEM_freeN(buffer->data); + } + } + + if (buffer->alloc_count && (new_count < buffer->alloc_count * 2)) { + buffer->alloc_count *= 2; + } + else { + buffer->alloc_count = new_count; + } + + buffer->flag &= ~BLI_BUFFER_USE_STATIC; + buffer->data = buffer_alloc(buffer, buffer->alloc_count); + } + + buffer->count = new_count; } /* callers use BLI_buffer_free */ void _bli_buffer_free(BLI_Buffer *buffer) { - if ((buffer->flag & BLI_BUFFER_USE_STATIC) == 0) { - if (buffer->data) { - MEM_freeN(buffer->data); - } - } - memset(buffer, 0, sizeof(*buffer)); + if ((buffer->flag & BLI_BUFFER_USE_STATIC) == 0) { + if (buffer->data) { + MEM_freeN(buffer->data); + } + } + memset(buffer, 0, sizeof(*buffer)); } |