From e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 17 Apr 2019 06:17:24 +0200 Subject: 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 --- .../compositor/operations/COM_DisplaceOperation.h | 66 +++++++++++----------- 1 file changed, 34 insertions(+), 32 deletions(-) (limited to 'source/blender/compositor/operations/COM_DisplaceOperation.h') diff --git a/source/blender/compositor/operations/COM_DisplaceOperation.h b/source/blender/compositor/operations/COM_DisplaceOperation.h index da652975a1d..4e44572fcf2 100644 --- a/source/blender/compositor/operations/COM_DisplaceOperation.h +++ b/source/blender/compositor/operations/COM_DisplaceOperation.h @@ -20,46 +20,48 @@ #define __COM_DISPLACEOPERATION_H__ #include "COM_NodeOperation.h" - class DisplaceOperation : public NodeOperation { -private: - /** - * Cached reference to the inputProgram - */ - SocketReader *m_inputColorProgram; - SocketReader *m_inputVectorProgram; - SocketReader *m_inputScaleXProgram; - SocketReader *m_inputScaleYProgram; + private: + /** + * Cached reference to the inputProgram + */ + SocketReader *m_inputColorProgram; + SocketReader *m_inputVectorProgram; + SocketReader *m_inputScaleXProgram; + SocketReader *m_inputScaleYProgram; - float m_width_x4; - float m_height_x4; + float m_width_x4; + float m_height_x4; -public: - DisplaceOperation(); + public: + DisplaceOperation(); - /** - * we need a 2x2 differential filter for Vector Input and full buffer for the image - */ - bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); + /** + * we need a 2x2 differential filter for Vector Input and full buffer for the image + */ + bool determineDependingAreaOfInterest(rcti *input, + ReadBufferOperation *readOperation, + rcti *output); - /** - * the inner loop of this program - */ - void executePixelSampled(float output[4], float x, float y, PixelSampler sampler); + /** + * the inner loop of this program + */ + void executePixelSampled(float output[4], float x, float y, PixelSampler sampler); - void pixelTransform(const float xy[2], float r_uv[2], float r_deriv[2][2]); + void pixelTransform(const float xy[2], float r_uv[2], float r_deriv[2][2]); - /** - * Initialize the execution - */ - void initExecution(); + /** + * Initialize the execution + */ + void initExecution(); - /** - * Deinitialize the execution - */ - void deinitExecution(); + /** + * Deinitialize the execution + */ + void deinitExecution(); -private: - bool read_displacement(float x, float y, float xscale, float yscale, const float origin[2], float &r_u, float &r_v); + private: + bool read_displacement( + float x, float y, float xscale, float yscale, const float origin[2], float &r_u, float &r_v); }; #endif -- cgit v1.2.3