From f3ece5a108db0bdbefb4663ef4ebd9a7e039e263 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 21 Oct 2012 05:46:41 +0000 Subject: style cleanup: trailing tabs & expand some non prefix tabs into spaces. --- .../blender/compositor/operations/COM_ColorSpillOperation.cpp | 2 +- source/blender/compositor/operations/COM_CropOperation.h | 2 +- .../compositor/operations/COM_MovieDistortionOperation.cpp | 2 +- source/blender/compositor/operations/COM_OpenCLKernels.cl | 10 +++++----- .../blender/compositor/operations/COM_OutputFileOperation.cpp | 2 +- .../operations/COM_ScreenLensDistortionOperation.cpp | 2 +- source/blender/compositor/operations/COM_ViewerOperation.cpp | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) (limited to 'source/blender/compositor/operations') diff --git a/source/blender/compositor/operations/COM_ColorSpillOperation.cpp b/source/blender/compositor/operations/COM_ColorSpillOperation.cpp index 152b10709fb..a8e8cb98564 100644 --- a/source/blender/compositor/operations/COM_ColorSpillOperation.cpp +++ b/source/blender/compositor/operations/COM_ColorSpillOperation.cpp @@ -100,7 +100,7 @@ void ColorSpillOperation::executePixel(float output[4], float x, float y, PixelS } else { copy_v4_v4(output, input); - } + } } float ColorSpillOperation::calculateMapValue(float fac, float *input) { diff --git a/source/blender/compositor/operations/COM_CropOperation.h b/source/blender/compositor/operations/COM_CropOperation.h index ddc7f855bf1..d2f2b15aa36 100644 --- a/source/blender/compositor/operations/COM_CropOperation.h +++ b/source/blender/compositor/operations/COM_CropOperation.h @@ -37,7 +37,7 @@ protected: void updateArea(); public: - CropBaseOperation(); + CropBaseOperation(); void initExecution(); void deinitExecution(); void setCropSettings(NodeTwoXYs *settings) { this->m_settings = settings; } diff --git a/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp b/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp index a3e00e9325b..0af5ec2d06c 100644 --- a/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp +++ b/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp @@ -111,7 +111,7 @@ void MovieDistortionOperation::executePixel(float output[4], float x, float y, P float u, v; this->m_cache->getUV(&this->m_movieClip->tracking, x, y, &u, &v); this->m_inputOperation->read(output, u, v, sampler); - } + } else { this->m_inputOperation->read(output, x, y, sampler); } diff --git a/source/blender/compositor/operations/COM_OpenCLKernels.cl b/source/blender/compositor/operations/COM_OpenCLKernels.cl index 4d366a864c4..b4d56a9c812 100644 --- a/source/blender/compositor/operations/COM_OpenCLKernels.cl +++ b/source/blender/compositor/operations/COM_OpenCLKernels.cl @@ -33,7 +33,7 @@ __kernel void bokehBlurKernel(__read_only image2d_t boundingBox, __read_only ima __read_only image2d_t bokehImage, __write_only image2d_t output, int2 offsetInput, int2 offsetOutput, int radius, int step, int2 dimension, int2 offset) { - int2 coords = {get_global_id(0), get_global_id(1)}; + int2 coords = {get_global_id(0), get_global_id(1)}; coords += offset; float tempBoundingBox; float4 color = {0.0f,0.0f,0.0f,0.0f}; @@ -124,7 +124,7 @@ __kernel void defocusKernel(__read_only image2d_t inputImage, __read_only image2 } } } - } + } } color = color_accum * (1.0f / multiplier_accum); @@ -148,7 +148,7 @@ __kernel void dilateKernel(__read_only image2d_t inputImage, __write_only image int2 offsetInput, int2 offsetOutput, int scope, int distanceSquared, int2 dimension, int2 offset) { - int2 coords = {get_global_id(0), get_global_id(1)}; + int2 coords = {get_global_id(0), get_global_id(1)}; coords += offset; const int2 realCoordinate = coords + offsetOutput; @@ -179,7 +179,7 @@ __kernel void erodeKernel(__read_only image2d_t inputImage, __write_only image2 int2 offsetInput, int2 offsetOutput, int scope, int distanceSquared, int2 dimension, int2 offset) { - int2 coords = {get_global_id(0), get_global_id(1)}; + int2 coords = {get_global_id(0), get_global_id(1)}; coords += offset; const int2 realCoordinate = coords + offsetOutput; @@ -210,7 +210,7 @@ __kernel void directionalBlurKernel(__read_only image2d_t inputImage, __write_o int2 offsetOutput, int iterations, float scale, float rotation, float2 translate, float2 center, int2 offset) { - int2 coords = {get_global_id(0), get_global_id(1)}; + int2 coords = {get_global_id(0), get_global_id(1)}; coords += offset; const int2 realCoordinate = coords + offsetOutput; diff --git a/source/blender/compositor/operations/COM_OutputFileOperation.cpp b/source/blender/compositor/operations/COM_OutputFileOperation.cpp index b3c2df7230f..1bc262a4d27 100644 --- a/source/blender/compositor/operations/COM_OutputFileOperation.cpp +++ b/source/blender/compositor/operations/COM_OutputFileOperation.cpp @@ -149,7 +149,7 @@ void OutputSingleLayerOperation::deinitExecution() else printf("Saved: %s\n", filename); - IMB_freeImBuf(ibuf); + IMB_freeImBuf(ibuf); } this->m_outputBuffer = NULL; this->m_imageInput = NULL; diff --git a/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp b/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp index fd9cc1fddcb..b65444108bc 100644 --- a/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp +++ b/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp @@ -226,7 +226,7 @@ bool ScreenLensDistortionOperation::determineDependingAreaOfInterest(rcti *input UPDATE_INPUT; determineUV(coords, input->xmax, input->ymin); UPDATE_INPUT; - } + } else { determineUV(coords, input->xmin, input->ymin, 1.0f, 1.0f); newInput.xmin = coords[0]; diff --git a/source/blender/compositor/operations/COM_ViewerOperation.cpp b/source/blender/compositor/operations/COM_ViewerOperation.cpp index 576d5da4d74..d1ac7d74ead 100644 --- a/source/blender/compositor/operations/COM_ViewerOperation.cpp +++ b/source/blender/compositor/operations/COM_ViewerOperation.cpp @@ -96,7 +96,7 @@ void ViewerOperation::executeRegion(rcti *rect, unsigned int tileNumber) if (m_depthInput) { this->m_depthInput->read(depth, x, y, COM_PS_NEAREST); depthbuffer[offset] = depth[0]; - } + } offset ++; offset4 += 4; -- cgit v1.2.3