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:
authorCampbell Barton <ideasman42@gmail.com>2012-07-22 19:31:12 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-07-22 19:31:12 +0400
commite6468034417c6f4e0c348f612671260638dcc1ca (patch)
treed03e6e6bf75476f146f0baf14b094639e5104fbf /source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
parentf9ed34cce92e07e1f84cf8c34847920f70fdce6d (diff)
fix for more new[]/delete[] mismatches
Diffstat (limited to 'source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp')
-rw-r--r--source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp11
1 files changed, 4 insertions, 7 deletions
diff --git a/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp b/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
index f647629815b..7c5614c0de1 100644
--- a/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
+++ b/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
@@ -1273,8 +1273,8 @@ void *DoubleEdgeMaskOperation::initializeTileData(rcti *rect)
float *imask = innerMask->convertToValueBuffer();
float *omask = outerMask->convertToValueBuffer();
doDoubleEdgeMask(imask, omask, data);
- delete imask;
- delete omask;
+ delete [] imask;
+ delete [] omask;
this->m_cachedInstance = data;
}
unlockMutex();
@@ -1282,12 +1282,9 @@ void *DoubleEdgeMaskOperation::initializeTileData(rcti *rect)
}
void DoubleEdgeMaskOperation::executePixel(float *color, int x, int y, void *data)
{
- float *buffer = (float *) data;
+ float *buffer = (float *)data;
int index = (y * this->getWidth() + x);
- color[0] = buffer[index];
- color[1] = buffer[index + 1];
- color[2] = buffer[index + 2];
- color[3] = buffer[index + 3];
+ copy_v4_v4(color, buffer + index);
}
void DoubleEdgeMaskOperation::deinitExecution()