diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-05-14 02:58:27 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-05-14 02:58:27 +0400 |
| commit | 6ea2dec330a0d460deb1396f258c461be34fa3c8 (patch) | |
| tree | 567536490f059ab57592b5352b60f253b7e3ea1c /source/blender/freestyle/intern/image | |
| parent | 1a91af691e984714204aa55326245c79a0b06fb8 (diff) | |
Added support for WITH_CXX_GUARDEDALLOC build option to the Freestyle module.
Diffstat (limited to 'source/blender/freestyle/intern/image')
| -rw-r--r-- | source/blender/freestyle/intern/image/GaussianFilter.h | 9 | ||||
| -rw-r--r-- | source/blender/freestyle/intern/image/Image.h | 9 | ||||
| -rw-r--r-- | source/blender/freestyle/intern/image/ImagePyramid.h | 8 |
3 files changed, 26 insertions, 0 deletions
diff --git a/source/blender/freestyle/intern/image/GaussianFilter.h b/source/blender/freestyle/intern/image/GaussianFilter.h index 02c2a917bde..313441a07d3 100644 --- a/source/blender/freestyle/intern/image/GaussianFilter.h +++ b/source/blender/freestyle/intern/image/GaussianFilter.h @@ -37,6 +37,10 @@ extern "C" { #include "BLI_math.h" } +#ifdef WITH_CXX_GUARDEDALLOC +#include "MEM_guardedalloc.h" +#endif + namespace Freestyle { class LIB_IMAGE_EXPORT GaussianFilter @@ -109,6 +113,11 @@ public: protected: void computeMask(); + +#ifdef WITH_CXX_GUARDEDALLOC +public: + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:GaussianFilter") +#endif }; /* diff --git a/source/blender/freestyle/intern/image/Image.h b/source/blender/freestyle/intern/image/Image.h index e4a8e3f9041..12be1816c1a 100644 --- a/source/blender/freestyle/intern/image/Image.h +++ b/source/blender/freestyle/intern/image/Image.h @@ -30,6 +30,10 @@ #include <string.h> // for memcpy +#ifdef WITH_CXX_GUARDEDALLOC +#include "MEM_guardedalloc.h" +#endif + namespace Freestyle { // @@ -167,6 +171,11 @@ protected: unsigned _storedHeight; unsigned _Ox; // origin of the stored part unsigned _Oy; // origin of the stored part + +#ifdef WITH_CXX_GUARDEDALLOC +public: + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:FrsImage") +#endif }; diff --git a/source/blender/freestyle/intern/image/ImagePyramid.h b/source/blender/freestyle/intern/image/ImagePyramid.h index c3f3f63e4e7..5ce937ed9f8 100644 --- a/source/blender/freestyle/intern/image/ImagePyramid.h +++ b/source/blender/freestyle/intern/image/ImagePyramid.h @@ -32,6 +32,10 @@ #include "../system/FreestyleConfig.h" +#ifdef WITH_CXX_GUARDEDALLOC +#include "MEM_guardedalloc.h" +#endif + namespace Freestyle { class GrayImage; @@ -78,6 +82,10 @@ public: { return _levels.size(); } + +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:ImagePyramid") +#endif }; class LIB_IMAGE_EXPORT GaussianPyramid : public ImagePyramid |