diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-10-28 19:23:16 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-10-28 19:23:16 +0400 |
commit | 0c6a0b293f5e9a1f37a6aea267e4a723731d4225 (patch) | |
tree | 1b69e5c4633e87c93d5e7a4282d490fab0ed740d /source/blender/compositor/operations/COM_CropOperation.cpp | |
parent | d800cffaf10cb73446d4f3739bca968224f3a1dc (diff) |
style cleanup
Diffstat (limited to 'source/blender/compositor/operations/COM_CropOperation.cpp')
-rw-r--r-- | source/blender/compositor/operations/COM_CropOperation.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/source/blender/compositor/operations/COM_CropOperation.cpp b/source/blender/compositor/operations/COM_CropOperation.cpp index 25a73799eff..16c19f3ebaa 100644 --- a/source/blender/compositor/operations/COM_CropOperation.cpp +++ b/source/blender/compositor/operations/COM_CropOperation.cpp @@ -37,8 +37,7 @@ void CropBaseOperation::updateArea() float width = inputReference->getWidth(); float height = inputReference->getHeight(); - if (width > 0.0f && height > 0.0f) - { + if (width > 0.0f && height > 0.0f) { if (this->m_relative) { this->m_settings->x1 = width * this->m_settings->fac_x1; this->m_settings->x2 = width * this->m_settings->fac_x2; @@ -114,12 +113,10 @@ void CropImageOperation::determineResolution(unsigned int resolution[2], unsigne void CropImageOperation::executePixel(float output[4], float x, float y, PixelSampler sampler) { - if (x >= 0 && x < getWidth() && y >= 0 && y < getHeight()) - { + if (x >= 0 && x < getWidth() && y >= 0 && y < getHeight()) { this->m_inputOperation->read(output, (x + this->m_xmin), (y + this->m_ymin), sampler); } - else - { + else { zero_v4(output); } } |