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>2019-04-17 07:17:24 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-17 07:21:24 +0300
commite12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch)
tree8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/compositor/operations/COM_CropOperation.cpp
parentb3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff)
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/compositor/operations/COM_CropOperation.cpp')
-rw-r--r--source/blender/compositor/operations/COM_CropOperation.cpp134
1 files changed, 70 insertions, 64 deletions
diff --git a/source/blender/compositor/operations/COM_CropOperation.cpp b/source/blender/compositor/operations/COM_CropOperation.cpp
index 2a78dc3a1f9..fbbe8706e11 100644
--- a/source/blender/compositor/operations/COM_CropOperation.cpp
+++ b/source/blender/compositor/operations/COM_CropOperation.cpp
@@ -21,105 +21,111 @@
CropBaseOperation::CropBaseOperation() : NodeOperation()
{
- this->addInputSocket(COM_DT_COLOR, COM_SC_NO_RESIZE);
- this->addOutputSocket(COM_DT_COLOR);
- this->m_inputOperation = NULL;
- this->m_settings = NULL;
+ this->addInputSocket(COM_DT_COLOR, COM_SC_NO_RESIZE);
+ this->addOutputSocket(COM_DT_COLOR);
+ this->m_inputOperation = NULL;
+ this->m_settings = NULL;
}
void CropBaseOperation::updateArea()
{
- SocketReader *inputReference = this->getInputSocketReader(0);
- float width = inputReference->getWidth();
- float height = inputReference->getHeight();
- NodeTwoXYs local_settings = *this->m_settings;
+ SocketReader *inputReference = this->getInputSocketReader(0);
+ float width = inputReference->getWidth();
+ float height = inputReference->getHeight();
+ NodeTwoXYs local_settings = *this->m_settings;
- if (width > 0.0f && height > 0.0f) {
- if (this->m_relative) {
- local_settings.x1 = width * local_settings.fac_x1;
- local_settings.x2 = width * local_settings.fac_x2;
- local_settings.y1 = height * local_settings.fac_y1;
- local_settings.y2 = height * local_settings.fac_y2;
- }
- if (width <= local_settings.x1 + 1)
- local_settings.x1 = width - 1;
- if (height <= local_settings.y1 + 1)
- local_settings.y1 = height - 1;
- if (width <= local_settings.x2 + 1)
- local_settings.x2 = width - 1;
- if (height <= local_settings.y2 + 1)
- local_settings.y2 = height - 1;
+ if (width > 0.0f && height > 0.0f) {
+ if (this->m_relative) {
+ local_settings.x1 = width * local_settings.fac_x1;
+ local_settings.x2 = width * local_settings.fac_x2;
+ local_settings.y1 = height * local_settings.fac_y1;
+ local_settings.y2 = height * local_settings.fac_y2;
+ }
+ if (width <= local_settings.x1 + 1)
+ local_settings.x1 = width - 1;
+ if (height <= local_settings.y1 + 1)
+ local_settings.y1 = height - 1;
+ if (width <= local_settings.x2 + 1)
+ local_settings.x2 = width - 1;
+ if (height <= local_settings.y2 + 1)
+ local_settings.y2 = height - 1;
- this->m_xmax = max(local_settings.x1, local_settings.x2) + 1;
- this->m_xmin = min(local_settings.x1, local_settings.x2);
- this->m_ymax = max(local_settings.y1, local_settings.y2) + 1;
- this->m_ymin = min(local_settings.y1, local_settings.y2);
- }
- else {
- this->m_xmax = 0;
- this->m_xmin = 0;
- this->m_ymax = 0;
- this->m_ymin = 0;
- }
+ this->m_xmax = max(local_settings.x1, local_settings.x2) + 1;
+ this->m_xmin = min(local_settings.x1, local_settings.x2);
+ this->m_ymax = max(local_settings.y1, local_settings.y2) + 1;
+ this->m_ymin = min(local_settings.y1, local_settings.y2);
+ }
+ else {
+ this->m_xmax = 0;
+ this->m_xmin = 0;
+ this->m_ymax = 0;
+ this->m_ymin = 0;
+ }
}
void CropBaseOperation::initExecution()
{
- this->m_inputOperation = this->getInputSocketReader(0);
- updateArea();
+ this->m_inputOperation = this->getInputSocketReader(0);
+ updateArea();
}
void CropBaseOperation::deinitExecution()
{
- this->m_inputOperation = NULL;
+ this->m_inputOperation = NULL;
}
CropOperation::CropOperation() : CropBaseOperation()
{
- /* pass */
+ /* pass */
}
void CropOperation::executePixelSampled(float output[4], float x, float y, PixelSampler sampler)
{
- if ((x < this->m_xmax && x >= this->m_xmin) && (y < this->m_ymax && y >= this->m_ymin)) {
- this->m_inputOperation->readSampled(output, x, y, sampler);
- }
- else {
- zero_v4(output);
- }
+ if ((x < this->m_xmax && x >= this->m_xmin) && (y < this->m_ymax && y >= this->m_ymin)) {
+ this->m_inputOperation->readSampled(output, x, y, sampler);
+ }
+ else {
+ zero_v4(output);
+ }
}
CropImageOperation::CropImageOperation() : CropBaseOperation()
{
- /* pass */
+ /* pass */
}
-bool CropImageOperation::determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output)
+bool CropImageOperation::determineDependingAreaOfInterest(rcti *input,
+ ReadBufferOperation *readOperation,
+ rcti *output)
{
- rcti newInput;
+ rcti newInput;
- newInput.xmax = input->xmax + this->m_xmin;
- newInput.xmin = input->xmin + this->m_xmin;
- newInput.ymax = input->ymax + this->m_ymin;
- newInput.ymin = input->ymin + this->m_ymin;
+ newInput.xmax = input->xmax + this->m_xmin;
+ newInput.xmin = input->xmin + this->m_xmin;
+ newInput.ymax = input->ymax + this->m_ymin;
+ newInput.ymin = input->ymin + this->m_ymin;
- return NodeOperation::determineDependingAreaOfInterest(&newInput, readOperation, output);
+ return NodeOperation::determineDependingAreaOfInterest(&newInput, readOperation, output);
}
-void CropImageOperation::determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2])
+void CropImageOperation::determineResolution(unsigned int resolution[2],
+ unsigned int preferredResolution[2])
{
- NodeOperation::determineResolution(resolution, preferredResolution);
- updateArea();
- resolution[0] = this->m_xmax - this->m_xmin;
- resolution[1] = this->m_ymax - this->m_ymin;
+ NodeOperation::determineResolution(resolution, preferredResolution);
+ updateArea();
+ resolution[0] = this->m_xmax - this->m_xmin;
+ resolution[1] = this->m_ymax - this->m_ymin;
}
-void CropImageOperation::executePixelSampled(float output[4], float x, float y, PixelSampler sampler)
+void CropImageOperation::executePixelSampled(float output[4],
+ float x,
+ float y,
+ PixelSampler sampler)
{
- if (x >= 0 && x < getWidth() && y >= 0 && y < getHeight()) {
- this->m_inputOperation->readSampled(output, (x + this->m_xmin), (y + this->m_ymin), sampler);
- }
- else {
- zero_v4(output);
- }
+ if (x >= 0 && x < getWidth() && y >= 0 && y < getHeight()) {
+ this->m_inputOperation->readSampled(output, (x + this->m_xmin), (y + this->m_ymin), sampler);
+ }
+ else {
+ zero_v4(output);
+ }
}