diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-08-10 18:07:24 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-08-10 18:07:24 +0400 |
commit | 94a3945cf9de0913b75f83b26e2e62b3bc1b0c07 (patch) | |
tree | 89aeabd20d883137b69815d9580f3bc108531a7e /source/blender/compositor/intern | |
parent | e8772477894a6fd8c09488b488fdcc1af432da1b (diff) |
code cleanup: compositor - define size for executePixel function output float array
Diffstat (limited to 'source/blender/compositor/intern')
3 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.cpp b/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.cpp index d14b8c48c89..7d1184cb356 100644 --- a/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.cpp +++ b/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.cpp @@ -33,9 +33,9 @@ void SingleThreadedNodeOperation::initExecution() initMutex(); } -void SingleThreadedNodeOperation::executePixel(float *color, int x, int y, void *data) +void SingleThreadedNodeOperation::executePixel(float output[4], int x, int y, void *data) { - this->m_cachedInstance->readNoCheck(color, x, y); + this->m_cachedInstance->readNoCheck(output, x, y); } void SingleThreadedNodeOperation::deinitExecution() diff --git a/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.h b/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.h index 68951eab507..45325be18a9 100644 --- a/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.h +++ b/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.h @@ -39,7 +39,7 @@ public: /** * the inner loop of this program */ - void executePixel(float *color, int x, int y, void *data); + void executePixel(float output[4], int x, int y, void *data); /** * Initialize the execution diff --git a/source/blender/compositor/intern/COM_SocketReader.h b/source/blender/compositor/intern/COM_SocketReader.h index 736dd2fc8b6..279ca8ebdb8 100644 --- a/source/blender/compositor/intern/COM_SocketReader.h +++ b/source/blender/compositor/intern/COM_SocketReader.h @@ -63,7 +63,7 @@ protected: * @param y the y-coordinate of the pixel to calculate in image space * @param inputBuffers chunks that can be read by their ReadBufferOperation. */ - virtual void executePixel(float *result, float x, float y, PixelSampler sampler) {} + virtual void executePixel(float output[4], float x, float y, PixelSampler sampler) {} /** * @brief calculate a single pixel @@ -74,8 +74,8 @@ protected: * @param inputBuffers chunks that can be read by their ReadBufferOperation. * @param chunkData chunk specific data a during execution time. */ - virtual void executePixel(float *result, int x, int y, void *chunkData) { - executePixel(result, x, y, COM_PS_NEAREST); + virtual void executePixel(float output[4], int x, int y, void *chunkData) { + executePixel(output, x, y, COM_PS_NEAREST); } /** @@ -88,7 +88,7 @@ protected: * @param dy * @param inputBuffers chunks that can be read by their ReadBufferOperation. */ - virtual void executePixel(float *result, float x, float y, float dx, float dy) {} + virtual void executePixel(float output[4], float x, float y, float dx, float dy) {} public: inline void read(float *result, float x, float y, PixelSampler sampler) { |