diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/compositor/operations/COM_ImageOperation.h | |
parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (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_ImageOperation.h')
-rw-r--r-- | source/blender/compositor/operations/COM_ImageOperation.h | 115 |
1 files changed, 64 insertions, 51 deletions
diff --git a/source/blender/compositor/operations/COM_ImageOperation.h b/source/blender/compositor/operations/COM_ImageOperation.h index 350c24bfafb..e03173dca8d 100644 --- a/source/blender/compositor/operations/COM_ImageOperation.h +++ b/source/blender/compositor/operations/COM_ImageOperation.h @@ -16,7 +16,6 @@ * Copyright 2011, Blender Foundation. */ - #ifndef __COM_IMAGEOPERATION_H__ #define __COM_IMAGEOPERATION_H__ @@ -24,70 +23,84 @@ #include "BLI_listbase.h" #include "BKE_image.h" extern "C" { -# include "RE_pipeline.h" -# include "RE_shader_ext.h" -# include "RE_render_ext.h" -# include "MEM_guardedalloc.h" +#include "RE_pipeline.h" +#include "RE_shader_ext.h" +#include "RE_render_ext.h" +#include "MEM_guardedalloc.h" } /** * \brief Base class for all image operations */ class BaseImageOperation : public NodeOperation { -protected: - ImBuf *m_buffer; - Image *m_image; - ImageUser *m_imageUser; - float *m_imageFloatBuffer; - unsigned int *m_imageByteBuffer; - float *m_depthBuffer; - int m_imageheight; - int m_imagewidth; - int m_framenumber; - int m_numberOfChannels; - const RenderData *m_rd; - const char *m_viewName; - - BaseImageOperation(); - /** - * Determine the output resolution. The resolution is retrieved from the Renderer - */ - void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]); + protected: + ImBuf *m_buffer; + Image *m_image; + ImageUser *m_imageUser; + float *m_imageFloatBuffer; + unsigned int *m_imageByteBuffer; + float *m_depthBuffer; + int m_imageheight; + int m_imagewidth; + int m_framenumber; + int m_numberOfChannels; + const RenderData *m_rd; + const char *m_viewName; - virtual ImBuf *getImBuf(); + BaseImageOperation(); + /** + * Determine the output resolution. The resolution is retrieved from the Renderer + */ + void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]); -public: + virtual ImBuf *getImBuf(); - void initExecution(); - void deinitExecution(); - void setImage(Image *image) { this->m_image = image; } - void setImageUser(ImageUser *imageuser) { this->m_imageUser = imageuser; } - void setRenderData(const RenderData *rd) { this->m_rd = rd; } - void setViewName(const char *viewName) { this->m_viewName = viewName; } - void setFramenumber(int framenumber) { this->m_framenumber = framenumber; } + public: + void initExecution(); + void deinitExecution(); + void setImage(Image *image) + { + this->m_image = image; + } + void setImageUser(ImageUser *imageuser) + { + this->m_imageUser = imageuser; + } + void setRenderData(const RenderData *rd) + { + this->m_rd = rd; + } + void setViewName(const char *viewName) + { + this->m_viewName = viewName; + } + void setFramenumber(int framenumber) + { + this->m_framenumber = framenumber; + } }; class ImageOperation : public BaseImageOperation { -public: - /** - * Constructor - */ - ImageOperation(); - void executePixelSampled(float output[4], float x, float y, PixelSampler sampler); + public: + /** + * Constructor + */ + ImageOperation(); + void executePixelSampled(float output[4], float x, float y, PixelSampler sampler); }; class ImageAlphaOperation : public BaseImageOperation { -public: - /** - * Constructor - */ - ImageAlphaOperation(); - void executePixelSampled(float output[4], float x, float y, PixelSampler sampler); + public: + /** + * Constructor + */ + ImageAlphaOperation(); + void executePixelSampled(float output[4], float x, float y, PixelSampler sampler); }; class ImageDepthOperation : public BaseImageOperation { -public: - /** - * Constructor - */ - ImageDepthOperation(); - void executePixelSampled(float output[4], float x, float y, PixelSampler sampler); + public: + /** + * Constructor + */ + ImageDepthOperation(); + void executePixelSampled(float output[4], float x, float y, PixelSampler sampler); }; #endif |