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/stroke | |
parent | 1a91af691e984714204aa55326245c79a0b06fb8 (diff) |
Added support for WITH_CXX_GUARDEDALLOC build option to the Freestyle module.
Diffstat (limited to 'source/blender/freestyle/intern/stroke')
14 files changed, 137 insertions, 0 deletions
diff --git a/source/blender/freestyle/intern/stroke/Canvas.h b/source/blender/freestyle/intern/stroke/Canvas.h index dc752f1c94d..07aa171534a 100644 --- a/source/blender/freestyle/intern/stroke/Canvas.h +++ b/source/blender/freestyle/intern/stroke/Canvas.h @@ -40,6 +40,10 @@ #include "../system/FreestyleConfig.h" +#ifdef WITH_CXX_GUARDEDALLOC +#include "MEM_guardedalloc.h" +#endif + namespace Freestyle { using namespace Geometry; @@ -239,6 +243,10 @@ public: void resetModified(bool iMod = false); void causalStyleModules(std::vector<unsigned>& vec, unsigned index = 0); void setModified(unsigned index, bool b); + +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Canvas") +#endif }; } /* namespace Freestyle */ diff --git a/source/blender/freestyle/intern/stroke/Curve.h b/source/blender/freestyle/intern/stroke/Curve.h index 7e09a482e4c..68da744d7b3 100644 --- a/source/blender/freestyle/intern/stroke/Curve.h +++ b/source/blender/freestyle/intern/stroke/Curve.h @@ -41,6 +41,10 @@ #include "../system/BaseIterator.h" +#ifdef WITH_CXX_GUARDEDALLOC +#include "MEM_guardedalloc.h" +#endif + using namespace std; namespace Freestyle { diff --git a/source/blender/freestyle/intern/stroke/Modifiers.h b/source/blender/freestyle/intern/stroke/Modifiers.h index ea386a5cbda..b10789504fc 100644 --- a/source/blender/freestyle/intern/stroke/Modifiers.h +++ b/source/blender/freestyle/intern/stroke/Modifiers.h @@ -30,6 +30,10 @@ #include "TimeStamp.h" +#ifdef WITH_CXX_GUARDEDALLOC +#include "MEM_guardedalloc.h" +#endif + namespace Freestyle { /* ----------------------------------------- * @@ -49,6 +53,10 @@ struct EdgeModifier : public unary_function<Edge, void> /*! the () operator */ virtual void operator()(Edge& iEdge) {} + +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:EdgeModifier") +#endif }; /*! Modifier that sets the time stamp of an Interface1D to the time stamp of the system. */ diff --git a/source/blender/freestyle/intern/stroke/Module.h b/source/blender/freestyle/intern/stroke/Module.h index e575892e635..b43c2d6247e 100644 --- a/source/blender/freestyle/intern/stroke/Module.h +++ b/source/blender/freestyle/intern/stroke/Module.h @@ -31,6 +31,10 @@ #include "Canvas.h" #include "StyleModule.h" +#ifdef WITH_CXX_GUARDEDALLOC +#include "MEM_guardedalloc.h" +#endif + namespace Freestyle { class Module @@ -72,6 +76,11 @@ private: Canvas *canvas = Canvas::getInstance(); return canvas->getCurrentStyleModule(); } + +#ifdef WITH_CXX_GUARDEDALLOC +public: + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Module") +#endif }; } /* namespace Freestyle */ diff --git a/source/blender/freestyle/intern/stroke/Operators.h b/source/blender/freestyle/intern/stroke/Operators.h index 7cff86eafce..61b20f556b5 100644 --- a/source/blender/freestyle/intern/stroke/Operators.h +++ b/source/blender/freestyle/intern/stroke/Operators.h @@ -43,6 +43,10 @@ #include "../view_map/Interface1D.h" #include "../view_map/ViewMap.h" +#ifdef WITH_CXX_GUARDEDALLOC +#include "MEM_guardedalloc.h" +#endif + namespace Freestyle { /*! Class defining the operators used in a style module. @@ -264,6 +268,11 @@ private: static I1DContainer _current_chains_set; static I1DContainer *_current_set; static StrokesContainer _current_strokes_set; + +#ifdef WITH_CXX_GUARDEDALLOC +public: + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Operators") +#endif }; } /* namespace Freestyle */ diff --git a/source/blender/freestyle/intern/stroke/Predicates0D.h b/source/blender/freestyle/intern/stroke/Predicates0D.h index 6a24740f386..0f04c0827c3 100644 --- a/source/blender/freestyle/intern/stroke/Predicates0D.h +++ b/source/blender/freestyle/intern/stroke/Predicates0D.h @@ -33,6 +33,10 @@ #include "../view_map/Functions0D.h" +#ifdef WITH_CXX_GUARDEDALLOC +#include "MEM_guardedalloc.h" +#endif + namespace Freestyle { // @@ -76,6 +80,11 @@ public: { return Director_BPy_UnaryPredicate0D___call__(this, it); } + +#ifdef WITH_CXX_GUARDEDALLOC +public: + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:UnaryPredicate0D") +#endif }; @@ -122,6 +131,11 @@ public: { return Director_BPy_BinaryPredicate0D___call__(this, inter1, inter2); } + +#ifdef WITH_CXX_GUARDEDALLOC +public: + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:BinaryPredicate0D") +#endif }; diff --git a/source/blender/freestyle/intern/stroke/Predicates1D.h b/source/blender/freestyle/intern/stroke/Predicates1D.h index 54c04f6b71e..257f938bf30 100644 --- a/source/blender/freestyle/intern/stroke/Predicates1D.h +++ b/source/blender/freestyle/intern/stroke/Predicates1D.h @@ -40,6 +40,10 @@ #include "../view_map/Interface1D.h" #include "../view_map/Functions1D.h" +#ifdef WITH_CXX_GUARDEDALLOC +#include "MEM_guardedalloc.h" +#endif + namespace Freestyle { // @@ -83,6 +87,10 @@ public: { return Director_BPy_UnaryPredicate1D___call__(this, inter); } + +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:UnaryPredicate1D") +#endif }; @@ -129,6 +137,10 @@ public: { return Director_BPy_BinaryPredicate1D___call__(this, inter1, inter2); } + +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:BinaryPredicate1D") +#endif }; diff --git a/source/blender/freestyle/intern/stroke/Stroke.h b/source/blender/freestyle/intern/stroke/Stroke.h index ee2e1ccba04..deb70c21b2a 100644 --- a/source/blender/freestyle/intern/stroke/Stroke.h +++ b/source/blender/freestyle/intern/stroke/Stroke.h @@ -39,6 +39,10 @@ #include "../system/FreestyleConfig.h" #include "../system/StringUtils.h" +#ifdef WITH_CXX_GUARDEDALLOC +#include "MEM_guardedalloc.h" +#endif + namespace Freestyle { // @@ -297,6 +301,11 @@ private: realMap *_userAttributesReal; Vec2fMap *_userAttributesVec2f; Vec3fMap *_userAttributesVec3f; + +#ifdef WITH_CXX_GUARDEDALLOC +public: + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:StrokeAttribute") +#endif }; diff --git a/source/blender/freestyle/intern/stroke/StrokeLayer.h b/source/blender/freestyle/intern/stroke/StrokeLayer.h index ff36c40fd0a..91292e237d6 100644 --- a/source/blender/freestyle/intern/stroke/StrokeLayer.h +++ b/source/blender/freestyle/intern/stroke/StrokeLayer.h @@ -30,6 +30,10 @@ #include <deque> +#ifdef WITH_CXX_GUARDEDALLOC +#include "MEM_guardedalloc.h" +#endif + namespace Freestyle { class Stroke; @@ -96,6 +100,10 @@ public: { _strokes.push_back(iStroke); } + +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:StrokeLayer") +#endif }; } /* namespace Freestyle */ diff --git a/source/blender/freestyle/intern/stroke/StrokeRenderer.h b/source/blender/freestyle/intern/stroke/StrokeRenderer.h index 5ee1eaf17eb..e38b7107efd 100644 --- a/source/blender/freestyle/intern/stroke/StrokeRenderer.h +++ b/source/blender/freestyle/intern/stroke/StrokeRenderer.h @@ -38,6 +38,10 @@ #include "../system/FreestyleConfig.h" +#ifdef WITH_CXX_GUARDEDALLOC +#include "MEM_guardedalloc.h" +#endif + namespace Freestyle { /**********************************/ @@ -107,6 +111,11 @@ protected: static string _patterns_path; static string _brushes_path; unsigned int _defaultTextureId; + +#ifdef WITH_CXX_GUARDEDALLOC +public: + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:TextureManager") +#endif }; @@ -135,6 +144,10 @@ public: //static unsigned int getTextureIndex(unsigned int index); static TextureManager *_textureManager; + +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:StrokeRenderer") +#endif }; } /* namespace Freestyle */ diff --git a/source/blender/freestyle/intern/stroke/StrokeRep.h b/source/blender/freestyle/intern/stroke/StrokeRep.h index bc6d7e67a68..38d6716584d 100644 --- a/source/blender/freestyle/intern/stroke/StrokeRep.h +++ b/source/blender/freestyle/intern/stroke/StrokeRep.h @@ -32,6 +32,10 @@ #include "../geometry/Geom.h" +#ifdef WITH_CXX_GUARDEDALLOC +#include "MEM_guardedalloc.h" +#endif + namespace Freestyle { using namespace Geometry; @@ -114,6 +118,11 @@ protected: Vec2r _texCoord; Vec3r _color; float _alpha; + +#ifdef WITH_CXX_GUARDEDALLOC +public: + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:StrokeVertexRep") +#endif }; class Strip @@ -147,6 +156,10 @@ public: { return _vertices; } + +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Strip") +#endif }; class StrokeRep @@ -207,6 +220,10 @@ public: { _textureId = textureId; } + +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:StrokeRep") +#endif }; } /* namespace Freestyle */ diff --git a/source/blender/freestyle/intern/stroke/StrokeShader.h b/source/blender/freestyle/intern/stroke/StrokeShader.h index d0cf3b8066b..7986a08e303 100644 --- a/source/blender/freestyle/intern/stroke/StrokeShader.h +++ b/source/blender/freestyle/intern/stroke/StrokeShader.h @@ -34,6 +34,10 @@ #include "../python/Director.h" +#ifdef WITH_CXX_GUARDEDALLOC +#include "MEM_guardedalloc.h" +#endif + namespace Freestyle { // @@ -97,6 +101,10 @@ public: { return Director_BPy_StrokeShader_shade( const_cast<StrokeShader *>(this), ioStroke); } + +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:StrokeShader") +#endif }; } /* namespace Freestyle */ diff --git a/source/blender/freestyle/intern/stroke/StrokeTesselator.h b/source/blender/freestyle/intern/stroke/StrokeTesselator.h index b9020b9b35e..e8ff75f7a96 100644 --- a/source/blender/freestyle/intern/stroke/StrokeTesselator.h +++ b/source/blender/freestyle/intern/stroke/StrokeTesselator.h @@ -32,6 +32,10 @@ #include "../scene_graph/LineRep.h" +#ifdef WITH_CXX_GUARDEDALLOC +#include "MEM_guardedalloc.h" +#endif + namespace Freestyle { class StrokeTesselator @@ -68,6 +72,11 @@ public: private: FrsMaterial _FrsMaterial; bool _overloadFrsMaterial; + +#ifdef WITH_CXX_GUARDEDALLOC +public: + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:StrokeTesselator") +#endif }; } /* namespace Freestyle */ diff --git a/source/blender/freestyle/intern/stroke/StyleModule.h b/source/blender/freestyle/intern/stroke/StyleModule.h index 336a3251a60..c34a288c5d6 100644 --- a/source/blender/freestyle/intern/stroke/StyleModule.h +++ b/source/blender/freestyle/intern/stroke/StyleModule.h @@ -39,6 +39,10 @@ #include "../system/Interpreter.h" #include "../system/StringUtils.h" +#ifdef WITH_CXX_GUARDEDALLOC +#include "MEM_guardedalloc.h" +#endif + using namespace std; namespace Freestyle { @@ -174,6 +178,11 @@ private: protected: Interpreter *_inter; + +#ifdef WITH_CXX_GUARDEDALLOC +public: + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:StyleModule") +#endif }; } /* namespace Freestyle */ |