From b3727668168075137f2ded11d7a7821548e4451d Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 29 Jun 2018 09:23:51 +0200 Subject: Cleanup: trailing newlines --- source/blender/compositor/intern/COM_CPUDevice.cpp | 1 - source/blender/compositor/intern/COM_Device.cpp | 1 - source/blender/compositor/intern/COM_MemoryProxy.cpp | 1 - source/blender/compositor/intern/COM_SocketReader.cpp | 2 -- source/blender/compositor/nodes/COM_CropNode.h | 2 -- source/blender/compositor/nodes/COM_ImageNode.cpp | 1 - source/blender/compositor/nodes/COM_TranslateNode.cpp | 1 - source/blender/compositor/operations/COM_AlphaOverMixedOperation.cpp | 1 - .../blender/compositor/operations/COM_AlphaOverPremultiplyOperation.cpp | 1 - source/blender/compositor/operations/COM_BrightnessOperation.cpp | 1 - source/blender/compositor/operations/COM_ChangeHSVOperation.cpp | 1 - source/blender/compositor/operations/COM_ChannelMatteOperation.cpp | 1 - source/blender/compositor/operations/COM_ChromaMatteOperation.cpp | 1 - source/blender/compositor/operations/COM_ColorCorrectionOperation.cpp | 1 - source/blender/compositor/operations/COM_ColorMatteOperation.cpp | 1 - source/blender/compositor/operations/COM_CompositorOperation.h | 1 - source/blender/compositor/operations/COM_DifferenceMatteOperation.cpp | 1 - source/blender/compositor/operations/COM_DisplaceOperation.cpp | 1 - source/blender/compositor/operations/COM_DisplaceSimpleOperation.cpp | 1 - source/blender/compositor/operations/COM_DistanceYCCMatteOperation.cpp | 1 - source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp | 1 - source/blender/compositor/operations/COM_EllipseMaskOperation.cpp | 1 - source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp | 1 - source/blender/compositor/operations/COM_FastGaussianBlurOperation.h | 1 - source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp | 1 - source/blender/compositor/operations/COM_InpaintOperation.cpp | 1 - source/blender/compositor/operations/COM_InvertOperation.cpp | 1 - source/blender/compositor/operations/COM_LuminanceMatteOperation.cpp | 1 - source/blender/compositor/operations/COM_MapUVOperation.cpp | 1 - .../blender/compositor/operations/COM_MovieClipAttributeOperation.cpp | 1 - source/blender/compositor/operations/COM_OutputFileOperation.cpp | 1 - source/blender/compositor/operations/COM_PixelateOperation.cpp | 1 - source/blender/compositor/operations/COM_QualityStepHelper.cpp | 1 - source/blender/compositor/operations/COM_SunBeamsOperation.cpp | 1 - source/blender/compositor/operations/COM_TranslateOperation.cpp | 1 - 35 files changed, 37 deletions(-) (limited to 'source/blender/compositor') diff --git a/source/blender/compositor/intern/COM_CPUDevice.cpp b/source/blender/compositor/intern/COM_CPUDevice.cpp index 970338d41cc..d3991245c22 100644 --- a/source/blender/compositor/intern/COM_CPUDevice.cpp +++ b/source/blender/compositor/intern/COM_CPUDevice.cpp @@ -40,4 +40,3 @@ void CPUDevice::execute(WorkPackage *work) executionGroup->finalizeChunkExecution(chunkNumber, NULL); } - diff --git a/source/blender/compositor/intern/COM_Device.cpp b/source/blender/compositor/intern/COM_Device.cpp index ee59976f45d..7d2045e3c7b 100644 --- a/source/blender/compositor/intern/COM_Device.cpp +++ b/source/blender/compositor/intern/COM_Device.cpp @@ -21,4 +21,3 @@ */ #include "COM_Device.h" - diff --git a/source/blender/compositor/intern/COM_MemoryProxy.cpp b/source/blender/compositor/intern/COM_MemoryProxy.cpp index 138b508c45b..b995f556db2 100644 --- a/source/blender/compositor/intern/COM_MemoryProxy.cpp +++ b/source/blender/compositor/intern/COM_MemoryProxy.cpp @@ -48,4 +48,3 @@ void MemoryProxy::free() this->m_buffer = NULL; } } - diff --git a/source/blender/compositor/intern/COM_SocketReader.cpp b/source/blender/compositor/intern/COM_SocketReader.cpp index 7517abc1430..e28bd4c7d3d 100644 --- a/source/blender/compositor/intern/COM_SocketReader.cpp +++ b/source/blender/compositor/intern/COM_SocketReader.cpp @@ -21,5 +21,3 @@ */ #include "COM_SocketReader.h" - - diff --git a/source/blender/compositor/nodes/COM_CropNode.h b/source/blender/compositor/nodes/COM_CropNode.h index cdec70a4a5c..d33243b915a 100644 --- a/source/blender/compositor/nodes/COM_CropNode.h +++ b/source/blender/compositor/nodes/COM_CropNode.h @@ -36,5 +36,3 @@ public: }; #endif - - diff --git a/source/blender/compositor/nodes/COM_ImageNode.cpp b/source/blender/compositor/nodes/COM_ImageNode.cpp index 36e71aa1203..b82de5962e9 100644 --- a/source/blender/compositor/nodes/COM_ImageNode.cpp +++ b/source/blender/compositor/nodes/COM_ImageNode.cpp @@ -271,4 +271,3 @@ void ImageNode::convertToOperations(NodeConverter &converter, const CompositorCo } } } - diff --git a/source/blender/compositor/nodes/COM_TranslateNode.cpp b/source/blender/compositor/nodes/COM_TranslateNode.cpp index ac09b38951b..78d1bfc3b28 100644 --- a/source/blender/compositor/nodes/COM_TranslateNode.cpp +++ b/source/blender/compositor/nodes/COM_TranslateNode.cpp @@ -71,4 +71,3 @@ void TranslateNode::convertToOperations(NodeConverter &converter, const Composit converter.mapInputSocket(inputSocket, operation->getInputSocket(0)); } } - diff --git a/source/blender/compositor/operations/COM_AlphaOverMixedOperation.cpp b/source/blender/compositor/operations/COM_AlphaOverMixedOperation.cpp index 748b5c63409..119ff3f98e9 100644 --- a/source/blender/compositor/operations/COM_AlphaOverMixedOperation.cpp +++ b/source/blender/compositor/operations/COM_AlphaOverMixedOperation.cpp @@ -54,4 +54,3 @@ void AlphaOverMixedOperation::executePixelSampled(float output[4], float x, floa output[3] = (mul * inputColor1[3]) + value[0] * inputOverColor[3]; } } - diff --git a/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.cpp b/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.cpp index b6a1ab57b14..22a92c8e65b 100644 --- a/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.cpp +++ b/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.cpp @@ -53,4 +53,3 @@ void AlphaOverPremultiplyOperation::executePixelSampled(float output[4], float x output[3] = (mul * inputColor1[3]) + value[0] * inputOverColor[3]; } } - diff --git a/source/blender/compositor/operations/COM_BrightnessOperation.cpp b/source/blender/compositor/operations/COM_BrightnessOperation.cpp index 099113dbf47..a959bd0a5aa 100644 --- a/source/blender/compositor/operations/COM_BrightnessOperation.cpp +++ b/source/blender/compositor/operations/COM_BrightnessOperation.cpp @@ -89,4 +89,3 @@ void BrightnessOperation::deinitExecution() this->m_inputBrightnessProgram = NULL; this->m_inputContrastProgram = NULL; } - diff --git a/source/blender/compositor/operations/COM_ChangeHSVOperation.cpp b/source/blender/compositor/operations/COM_ChangeHSVOperation.cpp index f90e9b70053..cbd87113276 100644 --- a/source/blender/compositor/operations/COM_ChangeHSVOperation.cpp +++ b/source/blender/compositor/operations/COM_ChangeHSVOperation.cpp @@ -65,4 +65,3 @@ void ChangeHSVOperation::executePixelSampled(float output[4], float x, float y, output[2] = inputColor1[2] * value[0]; output[3] = inputColor1[3]; } - diff --git a/source/blender/compositor/operations/COM_ChannelMatteOperation.cpp b/source/blender/compositor/operations/COM_ChannelMatteOperation.cpp index 688cbe91cf7..ec59a27e724 100644 --- a/source/blender/compositor/operations/COM_ChannelMatteOperation.cpp +++ b/source/blender/compositor/operations/COM_ChannelMatteOperation.cpp @@ -123,4 +123,3 @@ void ChannelMatteOperation::executePixelSampled(float output[4], float x, float /* don't make something that was more transparent less transparent */ output[0] = min(alpha, inColor[3]); } - diff --git a/source/blender/compositor/operations/COM_ChromaMatteOperation.cpp b/source/blender/compositor/operations/COM_ChromaMatteOperation.cpp index bc6389c5bbd..6696a6add6d 100644 --- a/source/blender/compositor/operations/COM_ChromaMatteOperation.cpp +++ b/source/blender/compositor/operations/COM_ChromaMatteOperation.cpp @@ -108,4 +108,3 @@ void ChromaMatteOperation::executePixelSampled(float output[4], float x, float y output[0] = inImage[3]; /* make pixel just as transparent as it was before */ } } - diff --git a/source/blender/compositor/operations/COM_ColorCorrectionOperation.cpp b/source/blender/compositor/operations/COM_ColorCorrectionOperation.cpp index 5e08dadd635..a67540f846d 100644 --- a/source/blender/compositor/operations/COM_ColorCorrectionOperation.cpp +++ b/source/blender/compositor/operations/COM_ColorCorrectionOperation.cpp @@ -144,4 +144,3 @@ void ColorCorrectionOperation::deinitExecution() this->m_inputImage = NULL; this->m_inputMask = NULL; } - diff --git a/source/blender/compositor/operations/COM_ColorMatteOperation.cpp b/source/blender/compositor/operations/COM_ColorMatteOperation.cpp index c95811e5e11..22aa4a5b2d7 100644 --- a/source/blender/compositor/operations/COM_ColorMatteOperation.cpp +++ b/source/blender/compositor/operations/COM_ColorMatteOperation.cpp @@ -82,4 +82,3 @@ void ColorMatteOperation::executePixelSampled(float output[4], float x, float y, output[0] = inColor[3]; /* make pixel just as transparent as it was before */ } } - diff --git a/source/blender/compositor/operations/COM_CompositorOperation.h b/source/blender/compositor/operations/COM_CompositorOperation.h index 269a065a793..e7f2bc7d2c6 100644 --- a/source/blender/compositor/operations/COM_CompositorOperation.h +++ b/source/blender/compositor/operations/COM_CompositorOperation.h @@ -100,4 +100,3 @@ public: void setActive(bool active) { this->m_active = active; } }; #endif - diff --git a/source/blender/compositor/operations/COM_DifferenceMatteOperation.cpp b/source/blender/compositor/operations/COM_DifferenceMatteOperation.cpp index 770a5bd205b..f6417bb78a0 100644 --- a/source/blender/compositor/operations/COM_DifferenceMatteOperation.cpp +++ b/source/blender/compositor/operations/COM_DifferenceMatteOperation.cpp @@ -85,4 +85,3 @@ void DifferenceMatteOperation::executePixelSampled(float output[4], float x, flo output[0] = inColor1[3]; } } - diff --git a/source/blender/compositor/operations/COM_DisplaceOperation.cpp b/source/blender/compositor/operations/COM_DisplaceOperation.cpp index 0d959996be1..0273a1de133 100644 --- a/source/blender/compositor/operations/COM_DisplaceOperation.cpp +++ b/source/blender/compositor/operations/COM_DisplaceOperation.cpp @@ -190,4 +190,3 @@ bool DisplaceOperation::determineDependingAreaOfInterest(rcti *input, ReadBuffer return false; } - diff --git a/source/blender/compositor/operations/COM_DisplaceSimpleOperation.cpp b/source/blender/compositor/operations/COM_DisplaceSimpleOperation.cpp index 0d7cd129a2f..98083add1f7 100644 --- a/source/blender/compositor/operations/COM_DisplaceSimpleOperation.cpp +++ b/source/blender/compositor/operations/COM_DisplaceSimpleOperation.cpp @@ -128,4 +128,3 @@ bool DisplaceSimpleOperation::determineDependingAreaOfInterest(rcti *input, Read return false; } - diff --git a/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.cpp b/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.cpp index 0a6f1fdfd31..69d77c43245 100644 --- a/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.cpp +++ b/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.cpp @@ -32,4 +32,3 @@ float DistanceYCCMatteOperation::calculateDistance(float key[4], float image[4]) /* only measure the second 2 values */ return len_v2v2(key + 1, image + 1); } - diff --git a/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp b/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp index ffa2f812ed7..3566eafa2db 100644 --- a/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp +++ b/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp @@ -1298,4 +1298,3 @@ void DoubleEdgeMaskOperation::deinitExecution() this->m_cachedInstance = NULL; } } - diff --git a/source/blender/compositor/operations/COM_EllipseMaskOperation.cpp b/source/blender/compositor/operations/COM_EllipseMaskOperation.cpp index fac0e028c6d..f0293a02724 100644 --- a/source/blender/compositor/operations/COM_EllipseMaskOperation.cpp +++ b/source/blender/compositor/operations/COM_EllipseMaskOperation.cpp @@ -118,4 +118,3 @@ void EllipseMaskOperation::deinitExecution() this->m_inputMask = NULL; this->m_inputValue = NULL; } - diff --git a/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp b/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp index 11843da3634..d570424cb69 100644 --- a/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp +++ b/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp @@ -322,4 +322,3 @@ void *FastGaussianBlurValueOperation::initializeTileData(rcti *rect) unlockMutex(); return this->m_iirgaus; } - diff --git a/source/blender/compositor/operations/COM_FastGaussianBlurOperation.h b/source/blender/compositor/operations/COM_FastGaussianBlurOperation.h index 2b02cf322ef..ae92b1ee095 100644 --- a/source/blender/compositor/operations/COM_FastGaussianBlurOperation.h +++ b/source/blender/compositor/operations/COM_FastGaussianBlurOperation.h @@ -74,4 +74,3 @@ public: }; #endif - diff --git a/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp b/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp index 483ddb53344..bbcec45ea1f 100644 --- a/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp +++ b/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp @@ -354,4 +354,3 @@ bool GaussianBlurReferenceOperation::determineDependingAreaOfInterest(rcti *inpu return NodeOperation::determineDependingAreaOfInterest(&newInput, readOperation, output); } } - diff --git a/source/blender/compositor/operations/COM_InpaintOperation.cpp b/source/blender/compositor/operations/COM_InpaintOperation.cpp index da31638ff07..f22270108ae 100644 --- a/source/blender/compositor/operations/COM_InpaintOperation.cpp +++ b/source/blender/compositor/operations/COM_InpaintOperation.cpp @@ -284,4 +284,3 @@ bool InpaintSimpleOperation::determineDependingAreaOfInterest(rcti * /*input*/, return NodeOperation::determineDependingAreaOfInterest(&newInput, readOperation, output); } } - diff --git a/source/blender/compositor/operations/COM_InvertOperation.cpp b/source/blender/compositor/operations/COM_InvertOperation.cpp index 53f181cf008..ac0c91394e8 100644 --- a/source/blender/compositor/operations/COM_InvertOperation.cpp +++ b/source/blender/compositor/operations/COM_InvertOperation.cpp @@ -70,4 +70,3 @@ void InvertOperation::deinitExecution() this->m_inputValueProgram = NULL; this->m_inputColorProgram = NULL; } - diff --git a/source/blender/compositor/operations/COM_LuminanceMatteOperation.cpp b/source/blender/compositor/operations/COM_LuminanceMatteOperation.cpp index e07da3bd17f..391d6f8d9e9 100644 --- a/source/blender/compositor/operations/COM_LuminanceMatteOperation.cpp +++ b/source/blender/compositor/operations/COM_LuminanceMatteOperation.cpp @@ -77,4 +77,3 @@ void LuminanceMatteOperation::executePixelSampled(float output[4], float x, floa /* don't make something that was more transparent less transparent */ output[0] = min_ff(alpha, inColor[3]); } - diff --git a/source/blender/compositor/operations/COM_MapUVOperation.cpp b/source/blender/compositor/operations/COM_MapUVOperation.cpp index 54d63b6a12c..9e8b28e871e 100644 --- a/source/blender/compositor/operations/COM_MapUVOperation.cpp +++ b/source/blender/compositor/operations/COM_MapUVOperation.cpp @@ -174,4 +174,3 @@ bool MapUVOperation::determineDependingAreaOfInterest(rcti *input, ReadBufferOpe return false; } - diff --git a/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp b/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp index 5f8c3ef435c..c1c159f80a0 100644 --- a/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp +++ b/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp @@ -87,4 +87,3 @@ void MovieClipAttributeOperation::determineResolution( resolution[0] = preferredResolution[0]; resolution[1] = preferredResolution[1]; } - diff --git a/source/blender/compositor/operations/COM_OutputFileOperation.cpp b/source/blender/compositor/operations/COM_OutputFileOperation.cpp index db2598ad6dc..de1a807f137 100644 --- a/source/blender/compositor/operations/COM_OutputFileOperation.cpp +++ b/source/blender/compositor/operations/COM_OutputFileOperation.cpp @@ -311,4 +311,3 @@ void OutputOpenExrMultiLayerOperation::deinitExecution() } } } - diff --git a/source/blender/compositor/operations/COM_PixelateOperation.cpp b/source/blender/compositor/operations/COM_PixelateOperation.cpp index eed6d1d01b9..4373c3511ea 100644 --- a/source/blender/compositor/operations/COM_PixelateOperation.cpp +++ b/source/blender/compositor/operations/COM_PixelateOperation.cpp @@ -46,4 +46,3 @@ void PixelateOperation::executePixelSampled(float output[4], float x, float y, P float ny = round(y); this->m_inputOperation->readSampled(output, nx, ny, sampler); } - diff --git a/source/blender/compositor/operations/COM_QualityStepHelper.cpp b/source/blender/compositor/operations/COM_QualityStepHelper.cpp index a1d84e7d569..9a9db86f720 100644 --- a/source/blender/compositor/operations/COM_QualityStepHelper.cpp +++ b/source/blender/compositor/operations/COM_QualityStepHelper.cpp @@ -68,4 +68,3 @@ void QualityStepHelper::initExecution(QualityHelper helper) break; } } - diff --git a/source/blender/compositor/operations/COM_SunBeamsOperation.cpp b/source/blender/compositor/operations/COM_SunBeamsOperation.cpp index 964ba36d08c..40f2ee226ae 100644 --- a/source/blender/compositor/operations/COM_SunBeamsOperation.cpp +++ b/source/blender/compositor/operations/COM_SunBeamsOperation.cpp @@ -335,4 +335,3 @@ bool SunBeamsOperation::determineDependingAreaOfInterest(rcti *input, ReadBuffer return NodeOperation::determineDependingAreaOfInterest(&rect, readOperation, output); } - diff --git a/source/blender/compositor/operations/COM_TranslateOperation.cpp b/source/blender/compositor/operations/COM_TranslateOperation.cpp index fcf99a10a73..89092cf8566 100644 --- a/source/blender/compositor/operations/COM_TranslateOperation.cpp +++ b/source/blender/compositor/operations/COM_TranslateOperation.cpp @@ -81,4 +81,3 @@ void TranslateOperation::setFactorXY(float factorX, float factorY) m_factorX = factorX; m_factorY = factorY; } - -- cgit v1.2.3