diff options
author | Jeroen Bakker <j.bakker@atmind.nl> | 2012-07-13 16:24:42 +0400 |
---|---|---|
committer | Jeroen Bakker <j.bakker@atmind.nl> | 2012-07-13 16:24:42 +0400 |
commit | 9987a8fca727d117b1d94587144d704be0b235dd (patch) | |
tree | d3f9a7c0b03262e67fd6496fec5d828ba3d51251 /source/blender/compositor/operations/COM_DilateErodeOperation.cpp | |
parent | bccd5380f56c0cac18a5734e386efeee7b7e6d0f (diff) |
Removed parameter from executePixel and initializeTileData.
Diffstat (limited to 'source/blender/compositor/operations/COM_DilateErodeOperation.cpp')
-rw-r--r-- | source/blender/compositor/operations/COM_DilateErodeOperation.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/source/blender/compositor/operations/COM_DilateErodeOperation.cpp b/source/blender/compositor/operations/COM_DilateErodeOperation.cpp index a9b40f8a6ac..71be94bf2a7 100644 --- a/source/blender/compositor/operations/COM_DilateErodeOperation.cpp +++ b/source/blender/compositor/operations/COM_DilateErodeOperation.cpp @@ -54,13 +54,13 @@ void DilateErodeThresholdOperation::initExecution() } } -void *DilateErodeThresholdOperation::initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers) +void *DilateErodeThresholdOperation::initializeTileData(rcti *rect) { - void *buffer = this->m_inputProgram->initializeTileData(NULL, memoryBuffers); + void *buffer = this->m_inputProgram->initializeTileData(NULL); return buffer; } -void DilateErodeThresholdOperation::executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data) +void DilateErodeThresholdOperation::executePixel(float *color, int x, int y, void *data) { float inputValue[4]; const float sw = this->m__switch; @@ -80,7 +80,7 @@ void DilateErodeThresholdOperation::executePixel(float *color, int x, int y, Mem const int bufferWidth = rect->xmax - rect->xmin; int offset; - this->m_inputProgram->read(inputValue, x, y, inputBuffers, NULL); + this->m_inputProgram->read(inputValue, x, y, NULL); if (inputValue[0] > sw) { for (int yi = miny; yi < maxy; yi++) { const float dy = yi - y; @@ -179,13 +179,13 @@ void DilateDistanceOperation::initExecution() } } -void *DilateDistanceOperation::initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers) +void *DilateDistanceOperation::initializeTileData(rcti *rect) { - void *buffer = this->m_inputProgram->initializeTileData(NULL, memoryBuffers); + void *buffer = this->m_inputProgram->initializeTileData(NULL); return buffer; } -void DilateDistanceOperation::executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data) +void DilateDistanceOperation::executePixel(float *color, int x, int y, void *data) { const float distance = this->m_distance; const float mindist = distance * distance; @@ -259,7 +259,7 @@ ErodeDistanceOperation::ErodeDistanceOperation() : DilateDistanceOperation() /* pass */ } -void ErodeDistanceOperation::executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data) +void ErodeDistanceOperation::executePixel(float *color, int x, int y, void *data) { const float distance = this->m_distance; const float mindist = distance * distance; @@ -325,14 +325,14 @@ void DilateStepOperation::initExecution() this->initMutex(); } -void *DilateStepOperation::initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers) +void *DilateStepOperation::initializeTileData(rcti *rect) { if (this->m_cached_buffer != NULL) { return this->m_cached_buffer; } lockMutex(); if (this->m_cached_buffer == NULL) { - MemoryBuffer *buffer = (MemoryBuffer *)this->m_inputProgram->initializeTileData(NULL, memoryBuffers); + MemoryBuffer *buffer = (MemoryBuffer *)this->m_inputProgram->initializeTileData(NULL); float *rectf = buffer->convertToValueBuffer(); int x, y, i; float *p; @@ -374,7 +374,7 @@ void *DilateStepOperation::initializeTileData(rcti *rect, MemoryBuffer **memoryB } -void DilateStepOperation::executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data) +void DilateStepOperation::executePixel(float *color, int x, int y, void *data) { color[0] = this->m_cached_buffer[y * this->getWidth() + x]; } @@ -412,14 +412,14 @@ ErodeStepOperation::ErodeStepOperation() : DilateStepOperation() /* pass */ } -void *ErodeStepOperation::initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers) +void *ErodeStepOperation::initializeTileData(rcti *rect) { if (this->m_cached_buffer != NULL) { return this->m_cached_buffer; } lockMutex(); if (this->m_cached_buffer == NULL) { - MemoryBuffer *buffer = (MemoryBuffer *)this->m_inputProgram->initializeTileData(NULL, memoryBuffers); + MemoryBuffer *buffer = (MemoryBuffer *)this->m_inputProgram->initializeTileData(NULL); float *rectf = buffer->convertToValueBuffer(); int x, y, i; float *p; |