Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManuel Castilla <manzanillawork@gmail.com>2021-10-14 00:01:04 +0300
committerManuel Castilla <manzanillawork@gmail.com>2021-10-14 00:41:14 +0300
commita2ee3c3a9f01f5cb2f05f1e84a1b6c1931d9d4a4 (patch)
treed409678b16280311ed228929a45c9470f67a6dcd /source/blender/compositor/operations/COM_NormalizeOperation.cc
parentea79efef70da14100b591b50dcada819808f20b6 (diff)
Cleanup: replace members `m_` prefix by `_` suffix in Compositor
To convert old code to the current convention and use a single code style.
Diffstat (limited to 'source/blender/compositor/operations/COM_NormalizeOperation.cc')
-rw-r--r--source/blender/compositor/operations/COM_NormalizeOperation.cc30
1 files changed, 15 insertions, 15 deletions
diff --git a/source/blender/compositor/operations/COM_NormalizeOperation.cc b/source/blender/compositor/operations/COM_NormalizeOperation.cc
index f3388397a79..0c2dc309ede 100644
--- a/source/blender/compositor/operations/COM_NormalizeOperation.cc
+++ b/source/blender/compositor/operations/COM_NormalizeOperation.cc
@@ -24,14 +24,14 @@ NormalizeOperation::NormalizeOperation()
{
this->addInputSocket(DataType::Value);
this->addOutputSocket(DataType::Value);
- m_imageReader = nullptr;
- m_cachedInstance = nullptr;
+ imageReader_ = nullptr;
+ cachedInstance_ = nullptr;
this->flags.complex = true;
flags.can_be_constant = true;
}
void NormalizeOperation::initExecution()
{
- m_imageReader = this->getInputSocketReader(0);
+ imageReader_ = this->getInputSocketReader(0);
NodeOperation::initMutex();
}
@@ -40,7 +40,7 @@ void NormalizeOperation::executePixel(float output[4], int x, int y, void *data)
/* using generic two floats struct to store `x: min`, `y: multiply` */
NodeTwoFloats *minmult = (NodeTwoFloats *)data;
- m_imageReader->read(output, x, y, nullptr);
+ imageReader_->read(output, x, y, nullptr);
output[0] = (output[0] - minmult->x) * minmult->y;
@@ -55,9 +55,9 @@ void NormalizeOperation::executePixel(float output[4], int x, int y, void *data)
void NormalizeOperation::deinitExecution()
{
- m_imageReader = nullptr;
- delete m_cachedInstance;
- m_cachedInstance = nullptr;
+ imageReader_ = nullptr;
+ delete cachedInstance_;
+ cachedInstance_ = nullptr;
NodeOperation::deinitMutex();
}
@@ -66,7 +66,7 @@ bool NormalizeOperation::determineDependingAreaOfInterest(rcti * /*input*/,
rcti *output)
{
rcti imageInput;
- if (m_cachedInstance) {
+ if (cachedInstance_) {
return false;
}
@@ -89,8 +89,8 @@ bool NormalizeOperation::determineDependingAreaOfInterest(rcti * /*input*/,
void *NormalizeOperation::initializeTileData(rcti *rect)
{
lockMutex();
- if (m_cachedInstance == nullptr) {
- MemoryBuffer *tile = (MemoryBuffer *)m_imageReader->initializeTileData(rect);
+ if (cachedInstance_ == nullptr) {
+ MemoryBuffer *tile = (MemoryBuffer *)imageReader_->initializeTileData(rect);
/* using generic two floats struct to store `x: min`, `y: multiply`. */
NodeTwoFloats *minmult = new NodeTwoFloats();
@@ -117,11 +117,11 @@ void *NormalizeOperation::initializeTileData(rcti *rect)
/* The rare case of flat buffer would cause a divide by 0 */
minmult->y = ((maxv != minv) ? 1.0f / (maxv - minv) : 0.0f);
- m_cachedInstance = minmult;
+ cachedInstance_ = minmult;
}
unlockMutex();
- return m_cachedInstance;
+ return cachedInstance_;
}
void NormalizeOperation::deinitializeTileData(rcti * /*rect*/, void * /*data*/)
@@ -140,7 +140,7 @@ void NormalizeOperation::update_memory_buffer_started(MemoryBuffer *UNUSED(outpu
const rcti &UNUSED(area),
Span<MemoryBuffer *> inputs)
{
- if (m_cachedInstance == nullptr) {
+ if (cachedInstance_ == nullptr) {
MemoryBuffer *input = inputs[0];
/* Using generic two floats struct to store `x: min`, `y: multiply`. */
@@ -162,7 +162,7 @@ void NormalizeOperation::update_memory_buffer_started(MemoryBuffer *UNUSED(outpu
/* The case of a flat buffer would cause a divide by 0. */
minmult->y = ((maxv != minv) ? 1.0f / (maxv - minv) : 0.0f);
- m_cachedInstance = minmult;
+ cachedInstance_ = minmult;
}
}
@@ -170,7 +170,7 @@ void NormalizeOperation::update_memory_buffer_partial(MemoryBuffer *output,
const rcti &area,
Span<MemoryBuffer *> inputs)
{
- NodeTwoFloats *minmult = m_cachedInstance;
+ NodeTwoFloats *minmult = cachedInstance_;
for (BuffersIterator<float> it = output->iterate_with(inputs, area); !it.is_end(); ++it) {
const float input_value = *it.in(0);