From 5129112072012b687428d574c011b08abfe0b678 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 4 Aug 2013 18:50:00 +0000 Subject: add c++/guardedalloc to more freestyle classes, also remove redundant 'public:' --- .../blender/freestyle/intern/application/AppView.h | 1 - .../freestyle/intern/application/Controller.h | 1 - .../intern/blender_interface/BlenderFileLoader.h | 1 - .../intern/blender_interface/BlenderStrokeRenderer.h | 5 +++++ .../intern/blender_interface/BlenderStyleModule.h | 5 +++++ .../intern/blender_interface/BlenderTextureManager.h | 5 +++++ source/blender/freestyle/intern/geometry/BBox.h | 1 - source/blender/freestyle/intern/geometry/FastGrid.h | 5 +++++ source/blender/freestyle/intern/geometry/Grid.h | 3 --- source/blender/freestyle/intern/geometry/Noise.h | 1 - source/blender/freestyle/intern/geometry/Polygon.h | 1 - source/blender/freestyle/intern/geometry/SweepLine.h | 2 -- source/blender/freestyle/intern/geometry/VecMat.h | 2 -- .../blender/freestyle/intern/geometry/normal_cycle.h | 1 - .../blender/freestyle/intern/image/GaussianFilter.h | 1 - source/blender/freestyle/intern/image/Image.h | 1 - .../freestyle/intern/scene_graph/DrawingStyle.h | 1 - .../freestyle/intern/scene_graph/FrsMaterial.h | 1 - .../freestyle/intern/scene_graph/IndexedFaceSet.h | 5 +++++ .../blender/freestyle/intern/scene_graph/LineRep.h | 5 +++++ source/blender/freestyle/intern/scene_graph/Node.h | 5 +++++ .../freestyle/intern/scene_graph/NodeCamera.h | 15 +++++++++++++++ .../freestyle/intern/scene_graph/NodeDrawingStyle.h | 5 +++++ source/blender/freestyle/intern/stroke/Module.h | 1 - source/blender/freestyle/intern/stroke/Operators.h | 1 - .../blender/freestyle/intern/stroke/Predicates0D.h | 2 -- source/blender/freestyle/intern/stroke/Stroke.h | 1 - .../blender/freestyle/intern/stroke/StrokeRenderer.h | 1 - source/blender/freestyle/intern/stroke/StrokeRep.h | 1 - .../freestyle/intern/stroke/StrokeTesselator.h | 1 - source/blender/freestyle/intern/stroke/StyleModule.h | 1 - .../blender/freestyle/intern/system/BaseIterator.h | 1 - source/blender/freestyle/intern/system/BaseObject.h | 1 - source/blender/freestyle/intern/system/Exception.h | 1 - source/blender/freestyle/intern/system/Id.h | 1 - source/blender/freestyle/intern/system/Interpreter.h | 1 - source/blender/freestyle/intern/system/ProgressBar.h | 1 - source/blender/freestyle/intern/system/PseudoNoise.h | 1 - source/blender/freestyle/intern/system/RandGen.h | 1 - .../blender/freestyle/intern/system/RenderMonitor.h | 1 - source/blender/freestyle/intern/system/TimeStamp.h | 1 - source/blender/freestyle/intern/system/TimeUtils.h | 1 - source/blender/freestyle/intern/view_map/BoxGrid.h | 3 --- .../freestyle/intern/view_map/FEdgeXDetector.h | 1 - .../blender/freestyle/intern/view_map/Functions1D.h | 2 -- .../freestyle/intern/view_map/GridDensityProvider.h | 1 - .../blender/freestyle/intern/view_map/Interface1D.h | 1 - .../freestyle/intern/view_map/OccluderSource.h | 1 - .../freestyle/intern/view_map/SphericalGrid.h | 2 -- .../freestyle/intern/view_map/SteerableViewMap.h | 1 - .../freestyle/intern/view_map/ViewEdgeXBuilder.h | 1 - source/blender/freestyle/intern/view_map/ViewMap.h | 20 ++++++++++++++++++++ .../freestyle/intern/view_map/ViewMapBuilder.h | 1 - .../freestyle/intern/view_map/ViewMapIterators.h | 15 +++++++++++++++ .../freestyle/intern/view_map/ViewMapTesselator.h | 11 ++++++++++- source/blender/freestyle/intern/winged_edge/WEdge.h | 4 ---- .../blender/freestyle/intern/winged_edge/WFillGrid.h | 1 - .../freestyle/intern/winged_edge/WSFillGrid.h | 7 ++++++- source/blender/freestyle/intern/winged_edge/WXEdge.h | 20 ++++++++++++++++++++ .../freestyle/intern/winged_edge/WXEdgeBuilder.h | 5 +++++ .../freestyle/intern/winged_edge/WingedEdgeBuilder.h | 7 ++++++- 61 files changed, 137 insertions(+), 60 deletions(-) (limited to 'source') diff --git a/source/blender/freestyle/intern/application/AppView.h b/source/blender/freestyle/intern/application/AppView.h index ca250f89850..3f6d0b8e93e 100644 --- a/source/blender/freestyle/intern/application/AppView.h +++ b/source/blender/freestyle/intern/application/AppView.h @@ -234,7 +234,6 @@ protected: NodeDrawingStyle *_p2DSelectionNode; #ifdef WITH_CXX_GUARDEDALLOC -public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:AppView") #endif }; diff --git a/source/blender/freestyle/intern/application/Controller.h b/source/blender/freestyle/intern/application/Controller.h index c8eaaf5486b..d4537f5f987 100644 --- a/source/blender/freestyle/intern/application/Controller.h +++ b/source/blender/freestyle/intern/application/Controller.h @@ -244,7 +244,6 @@ private: FEdgeXDetector edgeDetector; #ifdef WITH_CXX_GUARDEDALLOC -public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Controller") #endif }; diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h index c505eab40f1..17c0dd0c6db 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h +++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h @@ -127,7 +127,6 @@ protected: RenderMonitor *_pRenderMonitor; #ifdef WITH_CXX_GUARDEDALLOC -public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:BlenderFileLoader") #endif }; diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h index ae0e6bed3b2..96ce8c1be7e 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h +++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h @@ -64,6 +64,11 @@ protected: float get_stroke_vertex_z(void) const; unsigned int get_stroke_mesh_id(void) const; + +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:BlenderStrokeRenderer") +#endif + }; } /* namespace Freestyle */ diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStyleModule.h b/source/blender/freestyle/intern/blender_interface/BlenderStyleModule.h index 7419d49ba4d..8a16a2b5c2a 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderStyleModule.h +++ b/source/blender/freestyle/intern/blender_interface/BlenderStyleModule.h @@ -58,6 +58,11 @@ protected: private: struct Text *_text; + +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:BlenderStyleModule") +#endif + }; } /* namespace Freestyle */ diff --git a/source/blender/freestyle/intern/blender_interface/BlenderTextureManager.h b/source/blender/freestyle/intern/blender_interface/BlenderTextureManager.h index 1484188851d..b6cb303942a 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderTextureManager.h +++ b/source/blender/freestyle/intern/blender_interface/BlenderTextureManager.h @@ -43,6 +43,11 @@ protected: protected: virtual void loadStandardBrushes(); + +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:BlenderTextureManager") +#endif + }; } /* namespace Freestyle */ diff --git a/source/blender/freestyle/intern/geometry/BBox.h b/source/blender/freestyle/intern/geometry/BBox.h index 04fe6118815..794ceba48e7 100644 --- a/source/blender/freestyle/intern/geometry/BBox.h +++ b/source/blender/freestyle/intern/geometry/BBox.h @@ -136,7 +136,6 @@ private: bool _empty; #ifdef WITH_CXX_GUARDEDALLOC -public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:BBox") #endif }; diff --git a/source/blender/freestyle/intern/geometry/FastGrid.h b/source/blender/freestyle/intern/geometry/FastGrid.h index 510a2b94225..e292589b7cf 100644 --- a/source/blender/freestyle/intern/geometry/FastGrid.h +++ b/source/blender/freestyle/intern/geometry/FastGrid.h @@ -76,6 +76,11 @@ public: protected: Cell **_cells; unsigned _cells_size; + +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:FastGrid") +#endif + }; } /* namespace Freestyle */ diff --git a/source/blender/freestyle/intern/geometry/Grid.h b/source/blender/freestyle/intern/geometry/Grid.h index 08b614faa95..a1368f1ea21 100644 --- a/source/blender/freestyle/intern/geometry/Grid.h +++ b/source/blender/freestyle/intern/geometry/Grid.h @@ -89,7 +89,6 @@ private: OccludersSet _occluders; #ifdef WITH_CXX_GUARDEDALLOC -public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Cell") #endif }; @@ -372,7 +371,6 @@ protected: OccludersSet _occluders; // List of all occluders inserted in the grid #ifdef WITH_CXX_GUARDEDALLOC -public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Grid") #endif }; @@ -395,7 +393,6 @@ private: OccludersSet::iterator it, end; #ifdef WITH_CXX_GUARDEDALLOC -public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:VirtualOccludersSet") #endif }; diff --git a/source/blender/freestyle/intern/geometry/Noise.h b/source/blender/freestyle/intern/geometry/Noise.h index cd1be53a5aa..8798bc45a93 100644 --- a/source/blender/freestyle/intern/geometry/Noise.h +++ b/source/blender/freestyle/intern/geometry/Noise.h @@ -81,7 +81,6 @@ private: // int start; #ifdef WITH_CXX_GUARDEDALLOC -public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Noise") #endif }; diff --git a/source/blender/freestyle/intern/geometry/Polygon.h b/source/blender/freestyle/intern/geometry/Polygon.h index cfeae8fd632..d8b891c77cc 100644 --- a/source/blender/freestyle/intern/geometry/Polygon.h +++ b/source/blender/freestyle/intern/geometry/Polygon.h @@ -171,7 +171,6 @@ protected: unsigned _id; #ifdef WITH_CXX_GUARDEDALLOC -public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Geometry:Polygon") #endif }; diff --git a/source/blender/freestyle/intern/geometry/SweepLine.h b/source/blender/freestyle/intern/geometry/SweepLine.h index 86058a434bf..039ecd7ebf4 100644 --- a/source/blender/freestyle/intern/geometry/SweepLine.h +++ b/source/blender/freestyle/intern/geometry/SweepLine.h @@ -190,7 +190,6 @@ private: bool _order; // true if A and B are in the same order than _edge.A and _edge.B. false otherwise. #ifdef WITH_CXX_GUARDEDALLOC -public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Segment") #endif }; @@ -337,7 +336,6 @@ private: std::vector > *> _Intersections; // the list of all intersections. #ifdef WITH_CXX_GUARDEDALLOC -public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:SweepLine") #endif }; diff --git a/source/blender/freestyle/intern/geometry/VecMat.h b/source/blender/freestyle/intern/geometry/VecMat.h index 1948dadb207..c3aae0601fe 100644 --- a/source/blender/freestyle/intern/geometry/VecMat.h +++ b/source/blender/freestyle/intern/geometry/VecMat.h @@ -278,7 +278,6 @@ protected: }; #ifdef WITH_CXX_GUARDEDALLOC -public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:VecMat:Vec") #endif }; @@ -766,7 +765,6 @@ protected: value_type _coord[_SIZE]; #ifdef WITH_CXX_GUARDEDALLOC -public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:VecMat:Matrix") #endif }; diff --git a/source/blender/freestyle/intern/geometry/normal_cycle.h b/source/blender/freestyle/intern/geometry/normal_cycle.h index 441fca7ac5f..7a63acdf52a 100644 --- a/source/blender/freestyle/intern/geometry/normal_cycle.h +++ b/source/blender/freestyle/intern/geometry/normal_cycle.h @@ -129,7 +129,6 @@ private: int i_[3]; #ifdef WITH_CXX_GUARDEDALLOC -public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:OGF:NormalCycle") #endif }; diff --git a/source/blender/freestyle/intern/image/GaussianFilter.h b/source/blender/freestyle/intern/image/GaussianFilter.h index 313441a07d3..d3175e86382 100644 --- a/source/blender/freestyle/intern/image/GaussianFilter.h +++ b/source/blender/freestyle/intern/image/GaussianFilter.h @@ -115,7 +115,6 @@ 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 12be1816c1a..577dc0fb866 100644 --- a/source/blender/freestyle/intern/image/Image.h +++ b/source/blender/freestyle/intern/image/Image.h @@ -173,7 +173,6 @@ protected: 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/scene_graph/DrawingStyle.h b/source/blender/freestyle/intern/scene_graph/DrawingStyle.h index 9fbdd0e0fad..192fa76c497 100644 --- a/source/blender/freestyle/intern/scene_graph/DrawingStyle.h +++ b/source/blender/freestyle/intern/scene_graph/DrawingStyle.h @@ -106,7 +106,6 @@ private: bool LightingEnabled; #ifdef WITH_CXX_GUARDEDALLOC -public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:DrawingStyle") #endif }; diff --git a/source/blender/freestyle/intern/scene_graph/FrsMaterial.h b/source/blender/freestyle/intern/scene_graph/FrsMaterial.h index 7e9eeda26d5..4d1fc4e69c9 100644 --- a/source/blender/freestyle/intern/scene_graph/FrsMaterial.h +++ b/source/blender/freestyle/intern/scene_graph/FrsMaterial.h @@ -259,7 +259,6 @@ private: float Shininess; #ifdef WITH_CXX_GUARDEDALLOC -public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:FrsMaterial") #endif }; diff --git a/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h b/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h index 2995360fb24..1ffddc9b24d 100644 --- a/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h +++ b/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h @@ -312,6 +312,11 @@ protected: unsigned _TISize; unsigned int _displayList; + +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:IndexedFaceSet") +#endif + }; } /* namespace Freestyle */ diff --git a/source/blender/freestyle/intern/scene_graph/LineRep.h b/source/blender/freestyle/intern/scene_graph/LineRep.h index c5de30309f6..6452e1260ad 100644 --- a/source/blender/freestyle/intern/scene_graph/LineRep.h +++ b/source/blender/freestyle/intern/scene_graph/LineRep.h @@ -148,6 +148,11 @@ private: LINES_STYLE _Style; vector _vertices; float _width; + +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:LineRep") +#endif + }; } /* namespace Freestyle */ diff --git a/source/blender/freestyle/intern/scene_graph/Node.h b/source/blender/freestyle/intern/scene_graph/Node.h index 47ce6aaf8e6..ba8549f5128 100644 --- a/source/blender/freestyle/intern/scene_graph/Node.h +++ b/source/blender/freestyle/intern/scene_graph/Node.h @@ -106,6 +106,11 @@ protected: private: BBox _BBox; + +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Node") +#endif + }; } /* namespace Freestyle */ diff --git a/source/blender/freestyle/intern/scene_graph/NodeCamera.h b/source/blender/freestyle/intern/scene_graph/NodeCamera.h index 8e5cf9be52d..ee630e91884 100644 --- a/source/blender/freestyle/intern/scene_graph/NodeCamera.h +++ b/source/blender/freestyle/intern/scene_graph/NodeCamera.h @@ -83,6 +83,11 @@ protected: double projection_matrix_[16]; CameraType camera_type_; + +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:NodeCamera") +#endif + }; class LIB_SCENE_GRAPH_EXPORT NodeOrthographicCamera : public NodeCamera @@ -145,6 +150,11 @@ private: double top_; double zNear_; double zFar_; + +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:NodeOrthographicCamera") +#endif + }; class LIB_SCENE_GRAPH_EXPORT NodePerspectiveCamera : public NodeCamera @@ -205,6 +215,11 @@ public: * zFar-zNear */ NodePerspectiveCamera(double left, double right, double bottom, double top, double zNear, double zFar); + +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:NodePerspectiveCamera") +#endif + }; } /* namespace Freestyle */ diff --git a/source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.h b/source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.h index a846b050db1..7e8c6635953 100644 --- a/source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.h +++ b/source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.h @@ -101,6 +101,11 @@ public: private: DrawingStyle _DrawingStyle; + +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:NodeDrawingStyle") +#endif + }; } /* namespace Freestyle */ diff --git a/source/blender/freestyle/intern/stroke/Module.h b/source/blender/freestyle/intern/stroke/Module.h index b43c2d6247e..64b6f34afa4 100644 --- a/source/blender/freestyle/intern/stroke/Module.h +++ b/source/blender/freestyle/intern/stroke/Module.h @@ -78,7 +78,6 @@ private: } #ifdef WITH_CXX_GUARDEDALLOC -public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Module") #endif }; diff --git a/source/blender/freestyle/intern/stroke/Operators.h b/source/blender/freestyle/intern/stroke/Operators.h index 61b20f556b5..dcd61b8ce84 100644 --- a/source/blender/freestyle/intern/stroke/Operators.h +++ b/source/blender/freestyle/intern/stroke/Operators.h @@ -270,7 +270,6 @@ private: static StrokesContainer _current_strokes_set; #ifdef WITH_CXX_GUARDEDALLOC -public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Operators") #endif }; diff --git a/source/blender/freestyle/intern/stroke/Predicates0D.h b/source/blender/freestyle/intern/stroke/Predicates0D.h index 0f04c0827c3..a6e7cbee042 100644 --- a/source/blender/freestyle/intern/stroke/Predicates0D.h +++ b/source/blender/freestyle/intern/stroke/Predicates0D.h @@ -82,7 +82,6 @@ public: } #ifdef WITH_CXX_GUARDEDALLOC -public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:UnaryPredicate0D") #endif }; @@ -133,7 +132,6 @@ public: } #ifdef WITH_CXX_GUARDEDALLOC -public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:BinaryPredicate0D") #endif }; diff --git a/source/blender/freestyle/intern/stroke/Stroke.h b/source/blender/freestyle/intern/stroke/Stroke.h index 5415d003c5e..e7a75728985 100644 --- a/source/blender/freestyle/intern/stroke/Stroke.h +++ b/source/blender/freestyle/intern/stroke/Stroke.h @@ -303,7 +303,6 @@ private: Vec3fMap *_userAttributesVec3f; #ifdef WITH_CXX_GUARDEDALLOC -public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:StrokeAttribute") #endif }; diff --git a/source/blender/freestyle/intern/stroke/StrokeRenderer.h b/source/blender/freestyle/intern/stroke/StrokeRenderer.h index e38b7107efd..e5478c81b40 100644 --- a/source/blender/freestyle/intern/stroke/StrokeRenderer.h +++ b/source/blender/freestyle/intern/stroke/StrokeRenderer.h @@ -113,7 +113,6 @@ protected: unsigned int _defaultTextureId; #ifdef WITH_CXX_GUARDEDALLOC -public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:TextureManager") #endif }; diff --git a/source/blender/freestyle/intern/stroke/StrokeRep.h b/source/blender/freestyle/intern/stroke/StrokeRep.h index 38d6716584d..d01b27215fe 100644 --- a/source/blender/freestyle/intern/stroke/StrokeRep.h +++ b/source/blender/freestyle/intern/stroke/StrokeRep.h @@ -120,7 +120,6 @@ protected: float _alpha; #ifdef WITH_CXX_GUARDEDALLOC -public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:StrokeVertexRep") #endif }; diff --git a/source/blender/freestyle/intern/stroke/StrokeTesselator.h b/source/blender/freestyle/intern/stroke/StrokeTesselator.h index e8ff75f7a96..661c871a4d5 100644 --- a/source/blender/freestyle/intern/stroke/StrokeTesselator.h +++ b/source/blender/freestyle/intern/stroke/StrokeTesselator.h @@ -74,7 +74,6 @@ private: bool _overloadFrsMaterial; #ifdef WITH_CXX_GUARDEDALLOC -public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:StrokeTesselator") #endif }; diff --git a/source/blender/freestyle/intern/stroke/StyleModule.h b/source/blender/freestyle/intern/stroke/StyleModule.h index c34a288c5d6..f1d96283f90 100644 --- a/source/blender/freestyle/intern/stroke/StyleModule.h +++ b/source/blender/freestyle/intern/stroke/StyleModule.h @@ -180,7 +180,6 @@ protected: Interpreter *_inter; #ifdef WITH_CXX_GUARDEDALLOC -public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:StyleModule") #endif }; diff --git a/source/blender/freestyle/intern/system/BaseIterator.h b/source/blender/freestyle/intern/system/BaseIterator.h index f27bfb68b9f..9eb06744095 100644 --- a/source/blender/freestyle/intern/system/BaseIterator.h +++ b/source/blender/freestyle/intern/system/BaseIterator.h @@ -109,7 +109,6 @@ protected: IteratorBase() {} #ifdef WITH_CXX_GUARDEDALLOC -public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:IteratorBase") #endif }; diff --git a/source/blender/freestyle/intern/system/BaseObject.h b/source/blender/freestyle/intern/system/BaseObject.h index a9e501be38f..56f52a5fb80 100644 --- a/source/blender/freestyle/intern/system/BaseObject.h +++ b/source/blender/freestyle/intern/system/BaseObject.h @@ -73,7 +73,6 @@ private: unsigned _ref_counter; #ifdef WITH_CXX_GUARDEDALLOC -public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:BaseObject") #endif }; diff --git a/source/blender/freestyle/intern/system/Exception.h b/source/blender/freestyle/intern/system/Exception.h index d69de7b10dd..dedc4152ae9 100644 --- a/source/blender/freestyle/intern/system/Exception.h +++ b/source/blender/freestyle/intern/system/Exception.h @@ -66,7 +66,6 @@ private: static exception_type _exception; #ifdef WITH_CXX_GUARDEDALLOC -public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Exception") #endif }; diff --git a/source/blender/freestyle/intern/system/Id.h b/source/blender/freestyle/intern/system/Id.h index 5260a38c709..9cd45646f1c 100644 --- a/source/blender/freestyle/intern/system/Id.h +++ b/source/blender/freestyle/intern/system/Id.h @@ -131,7 +131,6 @@ private: id_type _second; #ifdef WITH_CXX_GUARDEDALLOC -public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Id") #endif }; diff --git a/source/blender/freestyle/intern/system/Interpreter.h b/source/blender/freestyle/intern/system/Interpreter.h index 9b7acc1cf46..e1269f40468 100644 --- a/source/blender/freestyle/intern/system/Interpreter.h +++ b/source/blender/freestyle/intern/system/Interpreter.h @@ -61,7 +61,6 @@ protected: string _language; #ifdef WITH_CXX_GUARDEDALLOC -public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Interpreter") #endif }; diff --git a/source/blender/freestyle/intern/system/ProgressBar.h b/source/blender/freestyle/intern/system/ProgressBar.h index 754004d7f81..56dbef59b0e 100644 --- a/source/blender/freestyle/intern/system/ProgressBar.h +++ b/source/blender/freestyle/intern/system/ProgressBar.h @@ -92,7 +92,6 @@ protected: string _label; #ifdef WITH_CXX_GUARDEDALLOC -public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:ProgressBar") #endif }; diff --git a/source/blender/freestyle/intern/system/PseudoNoise.h b/source/blender/freestyle/intern/system/PseudoNoise.h index ce725723b59..e53d8ed7a7a 100644 --- a/source/blender/freestyle/intern/system/PseudoNoise.h +++ b/source/blender/freestyle/intern/system/PseudoNoise.h @@ -57,7 +57,6 @@ protected: static real _values[NB_VALUE_NOISE]; #ifdef WITH_CXX_GUARDEDALLOC -public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:PseudoNoise") #endif }; diff --git a/source/blender/freestyle/intern/system/RandGen.h b/source/blender/freestyle/intern/system/RandGen.h index c3e2b3d99f7..3c8724bcbee 100644 --- a/source/blender/freestyle/intern/system/RandGen.h +++ b/source/blender/freestyle/intern/system/RandGen.h @@ -50,7 +50,6 @@ private: static void next(); #ifdef WITH_CXX_GUARDEDALLOC -public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:RandGen") #endif }; diff --git a/source/blender/freestyle/intern/system/RenderMonitor.h b/source/blender/freestyle/intern/system/RenderMonitor.h index 0453f81e5b5..7910bf13c63 100644 --- a/source/blender/freestyle/intern/system/RenderMonitor.h +++ b/source/blender/freestyle/intern/system/RenderMonitor.h @@ -72,7 +72,6 @@ protected: Render *_re; #ifdef WITH_CXX_GUARDEDALLOC -public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:RenderMonitor") #endif }; diff --git a/source/blender/freestyle/intern/system/TimeStamp.h b/source/blender/freestyle/intern/system/TimeStamp.h index 052816c5a85..e809aa71575 100644 --- a/source/blender/freestyle/intern/system/TimeStamp.h +++ b/source/blender/freestyle/intern/system/TimeStamp.h @@ -72,7 +72,6 @@ private: unsigned _time_stamp; #ifdef WITH_CXX_GUARDEDALLOC -public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:TimeStamp") #endif }; diff --git a/source/blender/freestyle/intern/system/TimeUtils.h b/source/blender/freestyle/intern/system/TimeUtils.h index 1bdcf2d7d38..bbf4c5a1edb 100644 --- a/source/blender/freestyle/intern/system/TimeUtils.h +++ b/source/blender/freestyle/intern/system/TimeUtils.h @@ -60,7 +60,6 @@ private: clock_t _start; #ifdef WITH_CXX_GUARDEDALLOC -public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Chronometer") #endif }; diff --git a/source/blender/freestyle/intern/view_map/BoxGrid.h b/source/blender/freestyle/intern/view_map/BoxGrid.h index 8aa5167732d..92f886ef429 100644 --- a/source/blender/freestyle/intern/view_map/BoxGrid.h +++ b/source/blender/freestyle/intern/view_map/BoxGrid.h @@ -72,7 +72,6 @@ public: WFace *face; #ifdef WITH_CXX_GUARDEDALLOC - public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:BoxGrid:OccluderData") #endif }; @@ -137,7 +136,6 @@ public: vector::iterator _current, _occludeeCandidate; #ifdef WITH_CXX_GUARDEDALLOC - public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:BoxGrid:Iterator") #endif }; @@ -192,7 +190,6 @@ private: bool _enableQI; #ifdef WITH_CXX_GUARDEDALLOC -public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:BoxGrid") #endif }; diff --git a/source/blender/freestyle/intern/view_map/FEdgeXDetector.h b/source/blender/freestyle/intern/view_map/FEdgeXDetector.h index 59d6e23312f..2bc0cd13e88 100644 --- a/source/blender/freestyle/intern/view_map/FEdgeXDetector.h +++ b/source/blender/freestyle/intern/view_map/FEdgeXDetector.h @@ -237,7 +237,6 @@ protected: RenderMonitor *_pRenderMonitor; #ifdef WITH_CXX_GUARDEDALLOC -public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:FEdgeXDetector") #endif }; diff --git a/source/blender/freestyle/intern/view_map/Functions1D.h b/source/blender/freestyle/intern/view_map/Functions1D.h index a4dd1cd5e03..2d3da151d13 100644 --- a/source/blender/freestyle/intern/view_map/Functions1D.h +++ b/source/blender/freestyle/intern/view_map/Functions1D.h @@ -125,7 +125,6 @@ protected: IntegrationType _integration; #ifdef WITH_CXX_GUARDEDALLOC -public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:UnaryFunction1D") #endif }; @@ -172,7 +171,6 @@ protected: IntegrationType _integration; #ifdef WITH_CXX_GUARDEDALLOC -public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:UnaryFunction1D_void") #endif }; diff --git a/source/blender/freestyle/intern/view_map/GridDensityProvider.h b/source/blender/freestyle/intern/view_map/GridDensityProvider.h index fe14efbe20f..f14362e3deb 100644 --- a/source/blender/freestyle/intern/view_map/GridDensityProvider.h +++ b/source/blender/freestyle/intern/view_map/GridDensityProvider.h @@ -134,7 +134,6 @@ protected: float _cellOrigin[2]; #ifdef WITH_CXX_GUARDEDALLOC -public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:GridDensityProvider") #endif }; diff --git a/source/blender/freestyle/intern/view_map/Interface1D.h b/source/blender/freestyle/intern/view_map/Interface1D.h index 2c1f4956e96..c7beafaf14d 100644 --- a/source/blender/freestyle/intern/view_map/Interface1D.h +++ b/source/blender/freestyle/intern/view_map/Interface1D.h @@ -226,7 +226,6 @@ protected: unsigned _timeStamp; #ifdef WITH_CXX_GUARDEDALLOC -public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Interface1D") #endif }; diff --git a/source/blender/freestyle/intern/view_map/OccluderSource.h b/source/blender/freestyle/intern/view_map/OccluderSource.h index b6f30ce9e3a..b916661e04c 100644 --- a/source/blender/freestyle/intern/view_map/OccluderSource.h +++ b/source/blender/freestyle/intern/view_map/OccluderSource.h @@ -72,7 +72,6 @@ protected: void buildCachedPolygon(); #ifdef WITH_CXX_GUARDEDALLOC -public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:OccluderSource") #endif }; diff --git a/source/blender/freestyle/intern/view_map/SphericalGrid.h b/source/blender/freestyle/intern/view_map/SphericalGrid.h index 56d2ae3cf5e..050dcc4c882 100644 --- a/source/blender/freestyle/intern/view_map/SphericalGrid.h +++ b/source/blender/freestyle/intern/view_map/SphericalGrid.h @@ -135,7 +135,6 @@ public: vector::iterator _current, _occludeeCandidate; #ifdef WITH_CXX_GUARDEDALLOC - public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:SphericalGrid:Iterator") #endif @@ -191,7 +190,6 @@ private: bool _enableQI; #ifdef WITH_CXX_GUARDEDALLOC -public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:SphericalGrid") #endif }; diff --git a/source/blender/freestyle/intern/view_map/SteerableViewMap.h b/source/blender/freestyle/intern/view_map/SteerableViewMap.h index 9af65765fcd..23681b43c48 100644 --- a/source/blender/freestyle/intern/view_map/SteerableViewMap.h +++ b/source/blender/freestyle/intern/view_map/SteerableViewMap.h @@ -150,7 +150,6 @@ protected: void Build(); #ifdef WITH_CXX_GUARDEDALLOC -public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:SteerableViewMap") #endif }; diff --git a/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h b/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h index b036410a9fe..6efc81efbaf 100644 --- a/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h +++ b/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h @@ -293,7 +293,6 @@ protected: ViewShape *_pCurrentVShape; #ifdef WITH_CXX_GUARDEDALLOC -public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:ViewEdgeXBuilder") #endif }; diff --git a/source/blender/freestyle/intern/view_map/ViewMap.h b/source/blender/freestyle/intern/view_map/ViewMap.h index f684f2b919d..987a5bda9b3 100644 --- a/source/blender/freestyle/intern/view_map/ViewMap.h +++ b/source/blender/freestyle/intern/view_map/ViewMap.h @@ -365,6 +365,11 @@ public: /*! Returns an orientedViewEdgeIterator pointing to the ViewEdge given as argument. */ virtual ViewVertexInternal::orientedViewEdgeIterator edgesIterator(ViewEdge *iEdge) = 0; + +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:ViewVertex") +#endif + }; /**********************************/ @@ -633,6 +638,11 @@ public: /*! Returns an orientedViewEdgeIterator pointing to the ViewEdge given as argument. */ virtual ViewVertexInternal::orientedViewEdgeIterator edgesIterator(ViewEdge *iEdge); + +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:TVertex") +#endif + }; @@ -845,6 +855,11 @@ public: /*! Returns an orientedViewEdgeIterator pointing to the ViewEdge given as argument. */ virtual ViewVertexInternal::orientedViewEdgeIterator edgesIterator(ViewEdge *iEdge); + +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:NonTVertex") +#endif + }; /**********************************/ @@ -1360,6 +1375,11 @@ public: * the sampling value. */ virtual Interface0DIterator pointsEnd(float t = 0.0f); + +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:ViewEdge") +#endif + }; diff --git a/source/blender/freestyle/intern/view_map/ViewMapBuilder.h b/source/blender/freestyle/intern/view_map/ViewMapBuilder.h index 05596daa85b..29e393052a3 100644 --- a/source/blender/freestyle/intern/view_map/ViewMapBuilder.h +++ b/source/blender/freestyle/intern/view_map/ViewMapBuilder.h @@ -253,7 +253,6 @@ protected: Vec3r& u, Vec3r& A, Vec3r& origin, Vec3r& edge, vector& faceVertices); #ifdef WITH_CXX_GUARDEDALLOC -public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:ViewMapBuilder") #endif }; diff --git a/source/blender/freestyle/intern/view_map/ViewMapIterators.h b/source/blender/freestyle/intern/view_map/ViewMapIterators.h index 72d439da8bd..2794d9028d2 100644 --- a/source/blender/freestyle/intern/view_map/ViewMapIterators.h +++ b/source/blender/freestyle/intern/view_map/ViewMapIterators.h @@ -219,6 +219,11 @@ public: } return 0; } + +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:orientedViewEdgeIterator") +#endif + }; } // ViewVertexInternal namespace @@ -390,6 +395,11 @@ private: FEdge *_previous_edge; FEdge *_next_edge; float _t; // curvilinear abscissa + +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:SVertexIterator") +#endif + }; @@ -561,6 +571,11 @@ protected: bool _orientation; ViewEdge *_edge; ViewEdge *_begin; + +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:ViewEdgeIterator") +#endif + }; } // end of namespace ViewEdgeInternal diff --git a/source/blender/freestyle/intern/view_map/ViewMapTesselator.h b/source/blender/freestyle/intern/view_map/ViewMapTesselator.h index d37d0b6e5a5..9c4d214d931 100644 --- a/source/blender/freestyle/intern/view_map/ViewMapTesselator.h +++ b/source/blender/freestyle/intern/view_map/ViewMapTesselator.h @@ -104,7 +104,6 @@ private: bool _overloadFrsMaterial; #ifdef WITH_CXX_GUARDEDALLOC -public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:ViewMapTesselator") #endif }; @@ -121,6 +120,11 @@ protected: { iLine->AddVertex(v->point2D()); } + +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:ViewMapTesselator2D") +#endif + }; /*! Class to tesselate the 3D silhouette */ @@ -135,6 +139,11 @@ protected: { iLine->AddVertex(v->point3D()); } + +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:ViewMapTesselator3D") +#endif + }; // diff --git a/source/blender/freestyle/intern/winged_edge/WEdge.h b/source/blender/freestyle/intern/winged_edge/WEdge.h index e5020f2a7fa..f0692aecd5b 100644 --- a/source/blender/freestyle/intern/winged_edge/WEdge.h +++ b/source/blender/freestyle/intern/winged_edge/WEdge.h @@ -245,7 +245,6 @@ public: virtual void increment(); #ifdef WITH_CXX_GUARDEDALLOC - public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:WVertex:incoming_edge_iterator") #endif }; @@ -330,7 +329,6 @@ public: } #ifdef WITH_CXX_GUARDEDALLOC - public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:WVertex:face_iterator") #endif }; @@ -1282,7 +1280,6 @@ protected: WFace *face); #ifdef WITH_CXX_GUARDEDALLOC -public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:WShape") #endif }; @@ -1327,7 +1324,6 @@ private: vector _wshapes; #ifdef WITH_CXX_GUARDEDALLOC -public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:WingedEdge") #endif }; diff --git a/source/blender/freestyle/intern/winged_edge/WFillGrid.h b/source/blender/freestyle/intern/winged_edge/WFillGrid.h index ca52f75847c..819bb24ffc2 100644 --- a/source/blender/freestyle/intern/winged_edge/WFillGrid.h +++ b/source/blender/freestyle/intern/winged_edge/WFillGrid.h @@ -84,7 +84,6 @@ private: unsigned _polygon_id; #ifdef WITH_CXX_GUARDEDALLOC -public: MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:WFillGrid") #endif }; diff --git a/source/blender/freestyle/intern/winged_edge/WSFillGrid.h b/source/blender/freestyle/intern/winged_edge/WSFillGrid.h index ee693de9ba1..5b33df906a6 100644 --- a/source/blender/freestyle/intern/winged_edge/WSFillGrid.h +++ b/source/blender/freestyle/intern/winged_edge/WSFillGrid.h @@ -77,8 +77,13 @@ private: Grid *_grid; WingedEdge *_winged_edge; unsigned _polygon_id; + +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:WSFillGrid") +#endif + }; } /* namespace Freestyle */ -#endif // __FREESTYLE_WS_FILL_GRID_H__ \ No newline at end of file +#endif // __FREESTYLE_WS_FILL_GRID_H__ diff --git a/source/blender/freestyle/intern/winged_edge/WXEdge.h b/source/blender/freestyle/intern/winged_edge/WXEdge.h index f696e279ad0..364183bbc84 100644 --- a/source/blender/freestyle/intern/winged_edge/WXEdge.h +++ b/source/blender/freestyle/intern/winged_edge/WXEdge.h @@ -95,6 +95,11 @@ public: { return _curvatures; } + +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:WXVertex") +#endif + }; @@ -197,6 +202,11 @@ public: { _order = i; } + +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:WXEdge") +#endif + }; /********************************** @@ -686,6 +696,11 @@ public: (*wxf)->userdata = NULL; } } + +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:WXFace") +#endif + }; @@ -782,6 +797,11 @@ public: } } /*! accessors */ + +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:WXShape") +#endif + }; /* diff --git a/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.h b/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.h index 0c3e97f7806..5579989072a 100644 --- a/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.h +++ b/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.h @@ -44,6 +44,11 @@ public: protected: virtual void buildWVertices(WShape& shape, const real *vertices, unsigned vsize); + +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:WXEdgeBuilder") +#endif + }; } /* namespace Freestyle */ diff --git a/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.h b/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.h index d8a045adfa3..d68acaf29c1 100644 --- a/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.h +++ b/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.h @@ -147,8 +147,13 @@ private: WingedEdge *_winged_edge; Matrix44r *_current_matrix; vector _matrices_stack; + +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:WingedEdgeBuilder") +#endif + }; } /* namespace Freestyle */ -#endif // __FREESTYLE_WINGED_EDGE_BUILDER_H__ \ No newline at end of file +#endif // __FREESTYLE_WINGED_EDGE_BUILDER_H__ -- cgit v1.2.3