Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2013-05-14 02:58:27 +0400
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2013-05-14 02:58:27 +0400
commit6ea2dec330a0d460deb1396f258c461be34fa3c8 (patch)
tree567536490f059ab57592b5352b60f253b7e3ea1c /source/blender/freestyle/intern/geometry/SweepLine.h
parent1a91af691e984714204aa55326245c79a0b06fb8 (diff)
Added support for WITH_CXX_GUARDEDALLOC build option to the Freestyle module.
Diffstat (limited to 'source/blender/freestyle/intern/geometry/SweepLine.h')
-rw-r--r--source/blender/freestyle/intern/geometry/SweepLine.h18
1 files changed, 18 insertions, 0 deletions
diff --git a/source/blender/freestyle/intern/geometry/SweepLine.h b/source/blender/freestyle/intern/geometry/SweepLine.h
index 8777dd0ba51..86058a434bf 100644
--- a/source/blender/freestyle/intern/geometry/SweepLine.h
+++ b/source/blender/freestyle/intern/geometry/SweepLine.h
@@ -31,6 +31,10 @@
#include <list>
#include <vector>
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
+
namespace Freestyle {
/*! Class to define the intersection berween two segments*/
@@ -74,6 +78,10 @@ public:
Edge *EdgeB; // second segment
real tA; // parameter defining the intersection point with respect to the segment EdgeA.
real tB; // parameter defining the intersection point with respect to the segment EdgeB.
+
+#ifdef WITH_CXX_GUARDEDALLOC
+ MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Intersection")
+#endif
};
#ifdef _MSC_VER
@@ -180,6 +188,11 @@ private:
Point B;
std::vector<Intersection<Segment<T, Point> >*> _Intersections; // list of intersections parameters
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
};
#ifdef _MSC_VER
@@ -322,6 +335,11 @@ private:
std::list<Segment<T, Point> *> _set; // set of active edges for a given position of the sweep line
std::vector<Segment<T, Point> *> _IntersectedEdges; // the list of intersected edges
std::vector<Intersection<Segment<T, Point> > *> _Intersections; // the list of all intersections.
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+ MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:SweepLine")
+#endif
};
} /* namespace Freestyle */