diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-07-03 04:02:45 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-07-03 04:02:45 +0400 |
| commit | 98a7ca61fa905792bd3fdfa6c29f44691c9582ac (patch) | |
| tree | 47455f2482f6eca0352c10c57482641eec6afb57 /source/blender/compositor/intern/COM_SocketReader.h | |
| parent | 4e39a854b4589cddff484649d95cce4c71d4e9f4 (diff) | |
| parent | 2ed69a95f499081aacc15c0295f3461c38430554 (diff) | |
Merged changes in the trunk up to revision 48505.
Diffstat (limited to 'source/blender/compositor/intern/COM_SocketReader.h')
| -rw-r--r-- | source/blender/compositor/intern/COM_SocketReader.h | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/source/blender/compositor/intern/COM_SocketReader.h b/source/blender/compositor/intern/COM_SocketReader.h index 3eb39e4bf02..0f35fcfb0df 100644 --- a/source/blender/compositor/intern/COM_SocketReader.h +++ b/source/blender/compositor/intern/COM_SocketReader.h @@ -25,6 +25,10 @@ #include "BLI_rect.h" #include "COM_defines.h" +#ifdef WITH_CXX_GUARDEDALLOC +#include "MEM_guardedalloc.h" +#endif + typedef enum PixelSampler { COM_PS_NEAREST, COM_PS_BILINEAR, @@ -43,12 +47,12 @@ protected: /** * @brief Holds the width of the output of this operation. */ - unsigned int width; + unsigned int m_width; /** * @brief Holds the height of the output of this operation. */ - unsigned int height; + unsigned int m_height; /** @@ -104,8 +108,12 @@ public: virtual MemoryBuffer *getInputMemoryBuffer(MemoryBuffer **memoryBuffers) { return 0; } - inline const unsigned int getWidth() const { return this->width; } - inline const unsigned int getHeight() const { return this->height; } -}; + inline const unsigned int getWidth() const { return this->m_width; } + inline const unsigned int getHeight() const { return this->m_height; } +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("COM:SocketReader") #endif +}; + +#endif /* _COM_SocketReader_h */ |