diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-05-18 02:55:28 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-05-18 02:55:28 +0400 |
commit | 7862b2fa13c0437d9c17eae78e7b79a421dacf05 (patch) | |
tree | 08f9c26af3e71795d0f65803a415b5612d6b53ab /source/blender/compositor/intern/COM_MemoryManager.cpp | |
parent | 69b95e1a8a00c9ff146d803b8ec11183d7a68908 (diff) |
style cleanup: compositor, pointer syntax, function brace placement, line length
Diffstat (limited to 'source/blender/compositor/intern/COM_MemoryManager.cpp')
-rw-r--r-- | source/blender/compositor/intern/COM_MemoryManager.cpp | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/source/blender/compositor/intern/COM_MemoryManager.cpp b/source/blender/compositor/intern/COM_MemoryManager.cpp index 661afb20d53..4f97b0b1e80 100644 --- a/source/blender/compositor/intern/COM_MemoryManager.cpp +++ b/source/blender/compositor/intern/COM_MemoryManager.cpp @@ -29,7 +29,8 @@ vector<MemoryBuffer*> buffers; ThreadMutex mutex; -MemoryBuffer* MemoryManager::allocateMemoryBuffer(MemoryProxy *id, unsigned int chunkNumber, rcti *rect) { +MemoryBuffer *MemoryManager::allocateMemoryBuffer(MemoryProxy *id, unsigned int chunkNumber, rcti *rect) +{ MemoryBuffer *result = new MemoryBuffer(id, chunkNumber, rect); MemoryManagerState * state = MemoryManager::getState(id); state->addMemoryBuffer(result); @@ -39,30 +40,35 @@ MemoryBuffer* MemoryManager::allocateMemoryBuffer(MemoryProxy *id, unsigned int return result; } -void MemoryManager::addMemoryProxy(MemoryProxy *memoryProxy) { +void MemoryManager::addMemoryProxy(MemoryProxy *memoryProxy) +{ MemoryManagerState * state = MemoryManager::getState(memoryProxy); if (!state) { state = new MemoryManagerState(memoryProxy); memoryProxy->setState(state); } } -MemoryBuffer* MemoryManager::getMemoryBuffer(MemoryProxy *id, unsigned int chunkNumber) { +MemoryBuffer *MemoryManager::getMemoryBuffer(MemoryProxy *id, unsigned int chunkNumber) +{ MemoryManagerState * state = MemoryManager::getState(id); if (!state) { return NULL; } - MemoryBuffer* buffer = state->getMemoryBuffer(chunkNumber); + MemoryBuffer *buffer = state->getMemoryBuffer(chunkNumber); if (!buffer) return NULL; return buffer; } -MemoryManagerState* MemoryManager::getState(MemoryProxy* memoryProxy) { +MemoryManagerState *MemoryManager::getState(MemoryProxy *memoryProxy) +{ return memoryProxy->getState(); } -void MemoryManager::initialize() { +void MemoryManager::initialize() +{ BLI_mutex_init(&mutex); } -void MemoryManager::clear() { +void MemoryManager::clear() +{ buffers.clear(); BLI_mutex_end(&mutex); } |