[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56779] trunk/blender/source/blender/ freestyle/intern: Added support for WITH_CXX_GUARDEDALLOC build option to the Freestyle module .
Tamito Kajiyama
rd6t-kjym at asahi-net.or.jp
Tue May 14 00:58:27 CEST 2013
Revision: 56779
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56779
Author: kjym3
Date: 2013-05-13 22:58:27 +0000 (Mon, 13 May 2013)
Log Message:
-----------
Added support for WITH_CXX_GUARDEDALLOC build option to the Freestyle module.
Modified Paths:
--------------
trunk/blender/source/blender/freestyle/intern/application/AppConfig.h
trunk/blender/source/blender/freestyle/intern/application/AppView.h
trunk/blender/source/blender/freestyle/intern/application/Controller.h
trunk/blender/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h
trunk/blender/source/blender/freestyle/intern/geometry/BBox.h
trunk/blender/source/blender/freestyle/intern/geometry/Bezier.h
trunk/blender/source/blender/freestyle/intern/geometry/GeomCleaner.h
trunk/blender/source/blender/freestyle/intern/geometry/Grid.h
trunk/blender/source/blender/freestyle/intern/geometry/GridHelpers.h
trunk/blender/source/blender/freestyle/intern/geometry/Noise.h
trunk/blender/source/blender/freestyle/intern/geometry/Polygon.h
trunk/blender/source/blender/freestyle/intern/geometry/SweepLine.h
trunk/blender/source/blender/freestyle/intern/geometry/VecMat.h
trunk/blender/source/blender/freestyle/intern/geometry/normal_cycle.h
trunk/blender/source/blender/freestyle/intern/image/GaussianFilter.h
trunk/blender/source/blender/freestyle/intern/image/Image.h
trunk/blender/source/blender/freestyle/intern/image/ImagePyramid.h
trunk/blender/source/blender/freestyle/intern/scene_graph/DrawingStyle.h
trunk/blender/source/blender/freestyle/intern/scene_graph/FrsMaterial.h
trunk/blender/source/blender/freestyle/intern/scene_graph/SceneVisitor.h
trunk/blender/source/blender/freestyle/intern/stroke/Canvas.h
trunk/blender/source/blender/freestyle/intern/stroke/Curve.h
trunk/blender/source/blender/freestyle/intern/stroke/Modifiers.h
trunk/blender/source/blender/freestyle/intern/stroke/Module.h
trunk/blender/source/blender/freestyle/intern/stroke/Operators.h
trunk/blender/source/blender/freestyle/intern/stroke/Predicates0D.h
trunk/blender/source/blender/freestyle/intern/stroke/Predicates1D.h
trunk/blender/source/blender/freestyle/intern/stroke/Stroke.h
trunk/blender/source/blender/freestyle/intern/stroke/StrokeLayer.h
trunk/blender/source/blender/freestyle/intern/stroke/StrokeRenderer.h
trunk/blender/source/blender/freestyle/intern/stroke/StrokeRep.h
trunk/blender/source/blender/freestyle/intern/stroke/StrokeShader.h
trunk/blender/source/blender/freestyle/intern/stroke/StrokeTesselator.h
trunk/blender/source/blender/freestyle/intern/stroke/StyleModule.h
trunk/blender/source/blender/freestyle/intern/system/BaseIterator.h
trunk/blender/source/blender/freestyle/intern/system/BaseObject.h
trunk/blender/source/blender/freestyle/intern/system/Exception.h
trunk/blender/source/blender/freestyle/intern/system/Id.h
trunk/blender/source/blender/freestyle/intern/system/Interpreter.h
trunk/blender/source/blender/freestyle/intern/system/Iterator.h
trunk/blender/source/blender/freestyle/intern/system/PointerSequence.h
trunk/blender/source/blender/freestyle/intern/system/ProgressBar.h
trunk/blender/source/blender/freestyle/intern/system/PseudoNoise.h
trunk/blender/source/blender/freestyle/intern/system/RandGen.h
trunk/blender/source/blender/freestyle/intern/system/RenderMonitor.h
trunk/blender/source/blender/freestyle/intern/system/TimeStamp.h
trunk/blender/source/blender/freestyle/intern/system/TimeUtils.h
trunk/blender/source/blender/freestyle/intern/view_map/BoxGrid.h
trunk/blender/source/blender/freestyle/intern/view_map/FEdgeXDetector.h
trunk/blender/source/blender/freestyle/intern/view_map/Functions0D.h
trunk/blender/source/blender/freestyle/intern/view_map/Functions1D.h
trunk/blender/source/blender/freestyle/intern/view_map/GridDensityProvider.h
trunk/blender/source/blender/freestyle/intern/view_map/Interface0D.h
trunk/blender/source/blender/freestyle/intern/view_map/Interface1D.h
trunk/blender/source/blender/freestyle/intern/view_map/OccluderSource.h
trunk/blender/source/blender/freestyle/intern/view_map/Silhouette.h
trunk/blender/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.h
trunk/blender/source/blender/freestyle/intern/view_map/SphericalGrid.h
trunk/blender/source/blender/freestyle/intern/view_map/SteerableViewMap.h
trunk/blender/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h
trunk/blender/source/blender/freestyle/intern/view_map/ViewMap.h
trunk/blender/source/blender/freestyle/intern/view_map/ViewMapBuilder.h
trunk/blender/source/blender/freestyle/intern/view_map/ViewMapTesselator.h
trunk/blender/source/blender/freestyle/intern/winged_edge/Curvature.h
trunk/blender/source/blender/freestyle/intern/winged_edge/WEdge.h
trunk/blender/source/blender/freestyle/intern/winged_edge/WFillGrid.h
trunk/blender/source/blender/freestyle/intern/winged_edge/WXEdge.h
Modified: trunk/blender/source/blender/freestyle/intern/application/AppConfig.h
===================================================================
--- trunk/blender/source/blender/freestyle/intern/application/AppConfig.h 2013-05-13 22:50:12 UTC (rev 56778)
+++ trunk/blender/source/blender/freestyle/intern/application/AppConfig.h 2013-05-13 22:58:27 UTC (rev 56779)
@@ -32,6 +32,10 @@
#include "../system/FreestyleConfig.h"
#include "../system/Precision.h"
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
+
using namespace std;
namespace Freestyle {
@@ -68,6 +72,10 @@
const string& getHomeDir() const {return _HomeDir;}
static string getEnvVar(const string& iEnvVarName);
+
+#ifdef WITH_CXX_GUARDEDALLOC
+ MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Config:Path")
+#endif
};
//
Modified: trunk/blender/source/blender/freestyle/intern/application/AppView.h
===================================================================
--- trunk/blender/source/blender/freestyle/intern/application/AppView.h 2013-05-13 22:50:12 UTC (rev 56778)
+++ trunk/blender/source/blender/freestyle/intern/application/AppView.h 2013-05-13 22:58:27 UTC (rev 56779)
@@ -31,6 +31,10 @@
#include "../scene_graph/NodeDrawingStyle.h"
#include "../system/Precision.h"
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
+
namespace Freestyle {
using namespace Geometry;
@@ -228,6 +232,11 @@
bool _Draw3DScene;
NodeGroup _p2DNode;
NodeDrawingStyle *_p2DSelectionNode;
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+ MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:AppView")
+#endif
};
} /* namespace Freestyle */
Modified: trunk/blender/source/blender/freestyle/intern/application/Controller.h
===================================================================
--- trunk/blender/source/blender/freestyle/intern/application/Controller.h 2013-05-13 22:50:12 UTC (rev 56778)
+++ trunk/blender/source/blender/freestyle/intern/application/Controller.h 2013-05-13 22:58:27 UTC (rev 56779)
@@ -45,6 +45,10 @@
#include "DNA_scene_types.h"
}
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
+
namespace Freestyle {
class AppView;
@@ -238,6 +242,11 @@
bool _ComputeSteerableViewMap;
FEdgeXDetector edgeDetector;
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+ MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Controller")
+#endif
};
extern Controller *g_pController;
Modified: trunk/blender/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h
===================================================================
--- trunk/blender/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h 2013-05-13 22:50:12 UTC (rev 56778)
+++ trunk/blender/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h 2013-05-13 22:58:27 UTC (rev 56779)
@@ -53,6 +53,10 @@
#include "BLI_math.h"
}
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
+
namespace Freestyle {
class NodeGroup;
@@ -120,6 +124,11 @@
float _z_near, _z_far;
RenderMonitor *_pRenderMonitor;
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+ MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:BlenderFileLoader")
+#endif
};
} /* namespace Freestyle */
Modified: trunk/blender/source/blender/freestyle/intern/geometry/BBox.h
===================================================================
--- trunk/blender/source/blender/freestyle/intern/geometry/BBox.h 2013-05-13 22:50:12 UTC (rev 56778)
+++ trunk/blender/source/blender/freestyle/intern/geometry/BBox.h 2013-05-13 22:58:27 UTC (rev 56779)
@@ -28,6 +28,10 @@
* \date 22/05/2003
*/
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
+
namespace Freestyle {
template <class Point>
@@ -130,6 +134,11 @@
Point _min;
Point _max;
bool _empty;
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+ MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:BBox")
+#endif
};
template <class Point>
Modified: trunk/blender/source/blender/freestyle/intern/geometry/Bezier.h
===================================================================
--- trunk/blender/source/blender/freestyle/intern/geometry/Bezier.h 2013-05-13 22:50:12 UTC (rev 56778)
+++ trunk/blender/source/blender/freestyle/intern/geometry/Bezier.h 2013-05-13 22:58:27 UTC (rev 56779)
@@ -34,6 +34,10 @@
#include "../system/FreestyleConfig.h"
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
+
namespace Freestyle {
using namespace Geometry;
@@ -60,9 +64,12 @@
{
return _Vertices;
}
+
+#ifdef WITH_CXX_GUARDEDALLOC
+ MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:BezierCurveSegment")
+#endif
};
-
class LIB_GEOMETRY_EXPORT BezierCurve
{
private:
@@ -86,6 +93,10 @@
{
return _Segments;
}
+
+#ifdef WITH_CXX_GUARDEDALLOC
+ MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:BezierCurve")
+#endif
};
} /* namespace Freestyle */
Modified: trunk/blender/source/blender/freestyle/intern/geometry/GeomCleaner.h
===================================================================
--- trunk/blender/source/blender/freestyle/intern/geometry/GeomCleaner.h 2013-05-13 22:50:12 UTC (rev 56778)
+++ trunk/blender/source/blender/freestyle/intern/geometry/GeomCleaner.h 2013-05-13 22:58:27 UTC (rev 56779)
@@ -32,6 +32,10 @@
#include "../system/FreestyleConfig.h"
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
+
namespace Freestyle {
using namespace Geometry;
@@ -128,6 +132,10 @@
*/
static void CleanIndexedVertexArray(const float *iVertices, unsigned iVSize, const unsigned *iIndices,
unsigned iISize, real **oVertices, unsigned *oVSize, unsigned **oIndices);
+
+#ifdef WITH_CXX_GUARDEDALLOC
+ MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:GeomCleaner")
+#endif
};
@@ -210,6 +218,10 @@
{
return (_Vector == v._Vector);
}
+
+#ifdef WITH_CXX_GUARDEDALLOC
+ MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:IndexedVertex")
+#endif
};
#if 0
Modified: trunk/blender/source/blender/freestyle/intern/geometry/Grid.h
===================================================================
--- trunk/blender/source/blender/freestyle/intern/geometry/Grid.h 2013-05-13 22:50:12 UTC (rev 56778)
+++ trunk/blender/source/blender/freestyle/intern/geometry/Grid.h 2013-05-13 22:58:27 UTC (rev 56779)
@@ -45,6 +45,10 @@
#include "BLI_utildefines.h"
}
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
+
using namespace std;
namespace Freestyle {
@@ -83,6 +87,11 @@
private:
Vec3r _orig;
OccludersSet _occluders;
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+ MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Cell")
+#endif
};
@@ -100,6 +109,10 @@
virtual bool stop() {
return false;
}
+
+#ifdef WITH_CXX_GUARDEDALLOC
+ MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:GridVisitor")
+#endif
};
/*! Gathers all the occluders belonging to the cells traversed by the ray */
@@ -357,6 +370,11 @@
//OccludersSet _ray_occluders; // Set storing the occluders contained in the cells traversed by a ray
OccludersSet _occluders; // List of all occluders inserted in the grid
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+ MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Grid")
+#endif
};
//
@@ -375,6 +393,11 @@
Polygon3r *firstOccluderFromNextCell();
Grid& grid;
OccludersSet::iterator it, end;
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+ MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:VirtualOccludersSet")
+#endif
};
} /* namespace Freestyle */
Modified: trunk/blender/source/blender/freestyle/intern/geometry/GridHelpers.h
===================================================================
--- trunk/blender/source/blender/freestyle/intern/geometry/GridHelpers.h 2013-05-13 22:50:12 UTC (rev 56778)
+++ trunk/blender/source/blender/freestyle/intern/geometry/GridHelpers.h 2013-05-13 22:58:27 UTC (rev 56779)
@@ -37,6 +37,10 @@
#include "../winged_edge/WEdge.h"
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
+
namespace Freestyle {
namespace GridHelpers {
@@ -121,6 +125,10 @@
public:
virtual ~Transform () = 0;
virtual Vec3r operator()(const Vec3r& point) const = 0;
+
+#ifdef WITH_CXX_GUARDEDALLOC
+ MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:GridHelpers:Transform")
+#endif
};
inline bool insideProscenium (const real proscenium[4], const Polygon3r& polygon)
Modified: trunk/blender/source/blender/freestyle/intern/geometry/Noise.h
===================================================================
--- trunk/blender/source/blender/freestyle/intern/geometry/Noise.h 2013-05-13 22:50:12 UTC (rev 56778)
+++ trunk/blender/source/blender/freestyle/intern/geometry/Noise.h 2013-05-13 22:58:27 UTC (rev 56779)
@@ -32,6 +32,10 @@
#include "../system/FreestyleConfig.h"
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
+
using namespace std;
namespace Freestyle {
@@ -75,6 +79,11 @@
float g1[_NOISE_B + _NOISE_B + 2];
/* UNUSED */
// int start;
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+ MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Noise")
+#endif
};
} /* namespace Freestyle */
Modified: trunk/blender/source/blender/freestyle/intern/geometry/Polygon.h
===================================================================
--- trunk/blender/source/blender/freestyle/intern/geometry/Polygon.h 2013-05-13 22:50:12 UTC (rev 56778)
+++ trunk/blender/source/blender/freestyle/intern/geometry/Polygon.h 2013-05-13 22:58:27 UTC (rev 56779)
@@ -33,6 +33,10 @@
#include "Geom.h"
#include "GeomUtils.h"
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
+
using namespace std;
namespace Freestyle {
@@ -165,6 +169,11 @@
Point _min;
Point _max;
unsigned _id;
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+ MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Geometry:Polygon")
+#endif
};
Modified: trunk/blender/source/blender/freestyle/intern/geometry/SweepLine.h
===================================================================
--- trunk/blender/source/blender/freestyle/intern/geometry/SweepLine.h 2013-05-13 22:50:12 UTC (rev 56778)
+++ trunk/blender/source/blender/freestyle/intern/geometry/SweepLine.h 2013-05-13 22:58:27 UTC (rev 56779)
@@ -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 @@
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
};
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list