diff options
Diffstat (limited to 'source/blender/compositor/intern')
10 files changed, 12 insertions, 16 deletions
diff --git a/source/blender/compositor/intern/COM_ExecutionGroup.cpp b/source/blender/compositor/intern/COM_ExecutionGroup.cpp index 46a0db7af2d..30875afcb3f 100644 --- a/source/blender/compositor/intern/COM_ExecutionGroup.cpp +++ b/source/blender/compositor/intern/COM_ExecutionGroup.cpp @@ -186,7 +186,7 @@ void ExecutionGroup::deinitExecution() this->m_cachedReadOperations.clear(); this->m_bTree = NULL; } -void ExecutionGroup::determineResolution(unsigned int resolution[]) +void ExecutionGroup::determineResolution(unsigned int resolution[2]) { NodeOperation *operation = this->getOutputNodeOperation(); resolution[0] = operation->getWidth(); diff --git a/source/blender/compositor/intern/COM_ExecutionGroup.h b/source/blender/compositor/intern/COM_ExecutionGroup.h index a87b40af89d..c7a7d06134e 100644 --- a/source/blender/compositor/intern/COM_ExecutionGroup.h +++ b/source/blender/compositor/intern/COM_ExecutionGroup.h @@ -270,13 +270,13 @@ public: * @brief determine the resolution of this ExecutionGroup * @param resolution */ - void determineResolution(unsigned int resolution[]); + void determineResolution(unsigned int resolution[2]); /** * @brief set the resolution of this executiongroup * @param resolution */ - void setResolution(unsigned int resolution[]) { this->m_width = resolution[0]; this->m_height = resolution[1]; } + void setResolution(unsigned int resolution[2]) { this->m_width = resolution[0]; this->m_height = resolution[1]; } /** * @brief get the width of this execution group diff --git a/source/blender/compositor/intern/COM_InputSocket.cpp b/source/blender/compositor/intern/COM_InputSocket.cpp index 94cb5ff5396..a9c280e0367 100644 --- a/source/blender/compositor/intern/COM_InputSocket.cpp +++ b/source/blender/compositor/intern/COM_InputSocket.cpp @@ -54,7 +54,7 @@ SocketConnection *InputSocket::getConnection() return this->m_connection; } -void InputSocket::determineResolution(unsigned int resolution[], unsigned int preferredResolution[]) +void InputSocket::determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]) { if (this->isConnected()) { this->m_connection->getFromSocket()->determineResolution(resolution, preferredResolution); diff --git a/source/blender/compositor/intern/COM_InputSocket.h b/source/blender/compositor/intern/COM_InputSocket.h index 5d0923ff204..259479015aa 100644 --- a/source/blender/compositor/intern/COM_InputSocket.h +++ b/source/blender/compositor/intern/COM_InputSocket.h @@ -89,7 +89,7 @@ public: * @param resolution the result of this operation * @param preferredResolution the preferrable resolution as no resolution could be determined */ - void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]); + void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]); /** * @brief Notifies the Input of the data type (via a SocketConnection) diff --git a/source/blender/compositor/intern/COM_MemoryBuffer.h b/source/blender/compositor/intern/COM_MemoryBuffer.h index 142f05af250..5d0d9c97450 100644 --- a/source/blender/compositor/intern/COM_MemoryBuffer.h +++ b/source/blender/compositor/intern/COM_MemoryBuffer.h @@ -26,16 +26,12 @@ class MemoryBuffer; #define _COM_MemoryBuffer_h_ #include "COM_ExecutionGroup.h" -#include "BLI_rect.h" #include "COM_MemoryProxy.h" -#include "MEM_guardedalloc.h" - extern "C" { - //#include "BLI_threads.h" #include "BLI_math.h" + #include "BLI_rect.h" } -//#include <vector> /** * @brief state of a memory buffer diff --git a/source/blender/compositor/intern/COM_NodeOperation.cpp b/source/blender/compositor/intern/COM_NodeOperation.cpp index 9baab584d9e..bae884d713e 100644 --- a/source/blender/compositor/intern/COM_NodeOperation.cpp +++ b/source/blender/compositor/intern/COM_NodeOperation.cpp @@ -38,7 +38,7 @@ NodeOperation::NodeOperation() : NodeBase() this->m_btree = NULL; } -void NodeOperation::determineResolution(unsigned int resolution[], unsigned int preferredResolution[]) +void NodeOperation::determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]) { unsigned int temp[2]; unsigned int temp2[2]; diff --git a/source/blender/compositor/intern/COM_NodeOperation.h b/source/blender/compositor/intern/COM_NodeOperation.h index a9cf281b02f..93a19529d34 100644 --- a/source/blender/compositor/intern/COM_NodeOperation.h +++ b/source/blender/compositor/intern/COM_NodeOperation.h @@ -96,7 +96,7 @@ public: * @param resolution the result of this operation * @param preferredResolution the preferrable resolution as no resolution could be determined */ - virtual void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]); + virtual void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]); /** * @brief isOutputOperation determines whether this operation is an output of the ExecutionSystem during rendering or editing. @@ -174,7 +174,7 @@ public: * @brief set the resolution * @param resolution the resolution to set */ - void setResolution(unsigned int resolution[]) { + void setResolution(unsigned int resolution[2]) { if (!isResolutionSet()) { this->m_width = resolution[0]; this->m_height = resolution[1]; diff --git a/source/blender/compositor/intern/COM_OutputSocket.cpp b/source/blender/compositor/intern/COM_OutputSocket.cpp index 865ab0472e8..f23a48979da 100644 --- a/source/blender/compositor/intern/COM_OutputSocket.cpp +++ b/source/blender/compositor/intern/COM_OutputSocket.cpp @@ -33,7 +33,7 @@ OutputSocket::OutputSocket(DataType datatype) : Socket(datatype) int OutputSocket::isOutputSocket() const { return true; } const int OutputSocket::isConnected() const { return this->m_connections.size() != 0; } -void OutputSocket::determineResolution(unsigned int resolution[], unsigned int preferredResolution[]) +void OutputSocket::determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]) { NodeBase *node = this->getNode(); if (node->isOperation()) { diff --git a/source/blender/compositor/intern/COM_OutputSocket.h b/source/blender/compositor/intern/COM_OutputSocket.h index 4810e1ae065..dc5ca27cbda 100644 --- a/source/blender/compositor/intern/COM_OutputSocket.h +++ b/source/blender/compositor/intern/COM_OutputSocket.h @@ -59,7 +59,7 @@ public: * @param resolution the result of this operation * @param preferredResolution the preferrable resolution as no resolution could be determined */ - void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]); + void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]); /** * @brief determine the actual data type and channel info. diff --git a/source/blender/compositor/intern/COM_Socket.h b/source/blender/compositor/intern/COM_Socket.h index 5607d2f4569..2aebe262594 100644 --- a/source/blender/compositor/intern/COM_Socket.h +++ b/source/blender/compositor/intern/COM_Socket.h @@ -73,7 +73,7 @@ public: const virtual int isConnected() const; int isInputSocket() const; int isOutputSocket() const; - virtual void determineResolution(int resolution[], unsigned int preferredResolution[]) {} + virtual void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]) {} void setEditorSocket(bNodeSocket *editorSocket) { this->m_editorSocket = editorSocket; } bNodeSocket *getbNodeSocket() const { return this->m_editorSocket; } |