diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-08-04 22:50:00 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-08-04 22:50:00 +0400 |
commit | 5129112072012b687428d574c011b08abfe0b678 (patch) | |
tree | 354abcf6f0610d8f1a372b827f298030299a1e67 /source/blender/freestyle/intern/view_map | |
parent | 78d69a1e1598f9967738c6d2f3195e2540d274d0 (diff) |
add c++/guardedalloc to more freestyle classes, also remove redundant 'public:'
Diffstat (limited to 'source/blender/freestyle/intern/view_map')
13 files changed, 45 insertions, 15 deletions
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<OccluderData*>::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<OccluderData*>::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<WVertex*>& 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 + }; // |