[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58906] trunk/blender/intern/dualcon: Support WITH_CXX_GUARDEDALLOC for dualcon library
Campbell Barton
ideasman42 at gmail.com
Sun Aug 4 19:58:18 CEST 2013
Revision: 58906
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58906
Author: campbellbarton
Date: 2013-08-04 17:58:17 +0000 (Sun, 04 Aug 2013)
Log Message:
-----------
Support WITH_CXX_GUARDEDALLOC for dualcon library
Modified Paths:
--------------
trunk/blender/intern/dualcon/dualcon.h
trunk/blender/intern/dualcon/intern/GeoCommon.h
trunk/blender/intern/dualcon/intern/MemoryAllocator.h
trunk/blender/intern/dualcon/intern/ModelReader.h
trunk/blender/intern/dualcon/intern/Projections.cpp
trunk/blender/intern/dualcon/intern/Projections.h
trunk/blender/intern/dualcon/intern/Queue.h
trunk/blender/intern/dualcon/intern/cubes.h
trunk/blender/intern/dualcon/intern/dualcon_c_api.cpp
trunk/blender/intern/dualcon/intern/manifold_table.h
trunk/blender/intern/dualcon/intern/marching_cubes_table.h
trunk/blender/intern/dualcon/intern/octree.cpp
trunk/blender/intern/dualcon/intern/octree.h
Modified: trunk/blender/intern/dualcon/dualcon.h
===================================================================
--- trunk/blender/intern/dualcon/dualcon.h 2013-08-04 17:30:47 UTC (rev 58905)
+++ trunk/blender/intern/dualcon/dualcon.h 2013-08-04 17:58:17 UTC (rev 58906)
@@ -23,6 +23,10 @@
#ifndef __DUALCON_H__
#define __DUALCON_H__
+#ifdef WITH_CXX_GUARDEDALLOC
+# include "MEM_guardedalloc.h"
+#endif
+
#ifdef __cplusplus
extern "C" {
#endif
Modified: trunk/blender/intern/dualcon/intern/GeoCommon.h
===================================================================
--- trunk/blender/intern/dualcon/intern/GeoCommon.h 2013-08-04 17:30:47 UTC (rev 58905)
+++ trunk/blender/intern/dualcon/intern/GeoCommon.h 2013-08-04 17:58:17 UTC (rev 58906)
@@ -20,8 +20,8 @@
* ***** END GPL LICENSE BLOCK *****
*/
-#ifndef GEOCOMMON_H
-#define GEOCOMMON_H
+#ifndef __GEOCOMMON_H__
+#define __GEOCOMMON_H__
#define UCHAR unsigned char
#define USHORT unsigned short
@@ -61,4 +61,4 @@
} BoundingBoxf;
-#endif
+#endif /* __GEOCOMMON_H__ */
Modified: trunk/blender/intern/dualcon/intern/MemoryAllocator.h
===================================================================
--- trunk/blender/intern/dualcon/intern/MemoryAllocator.h 2013-08-04 17:30:47 UTC (rev 58905)
+++ trunk/blender/intern/dualcon/intern/MemoryAllocator.h 2013-08-04 17:58:17 UTC (rev 58906)
@@ -20,8 +20,8 @@
* ***** END GPL LICENSE BLOCK *****
*/
-#ifndef MEMORYALLOCATOR_H
-#define MEMORYALLOCATOR_H
+#ifndef __MEMORYALLOCATOR_H__
+#define __MEMORYALLOCATOR_H__
#include <stdio.h>
#include <stdlib.h>
@@ -53,6 +53,11 @@
virtual int getAllocated( ) = 0;
virtual int getAll( ) = 0;
virtual int getBytes( ) = 0;
+
+#ifdef WITH_CXX_GUARDEDALLOC
+ MEM_CXX_CLASS_ALLOC_FUNCS("DUALCON:VirtualMemoryAllocator")
+#endif
+
};
/**
@@ -216,6 +221,11 @@
{
return N;
};
+
+#ifdef WITH_CXX_GUARDEDALLOC
+ MEM_CXX_CLASS_ALLOC_FUNCS("DUALCON:MemoryAllocator")
+#endif
+
};
-#endif
+#endif /* __MEMORYALLOCATOR_H__ */
Modified: trunk/blender/intern/dualcon/intern/ModelReader.h
===================================================================
--- trunk/blender/intern/dualcon/intern/ModelReader.h 2013-08-04 17:30:47 UTC (rev 58905)
+++ trunk/blender/intern/dualcon/intern/ModelReader.h 2013-08-04 17:58:17 UTC (rev 58906)
@@ -20,8 +20,8 @@
* ***** END GPL LICENSE BLOCK *****
*/
-#ifndef MODELREADER_H
-#define MODELREADER_H
+#ifndef __MODELREADER_H__
+#define __MODELREADER_H__
#include "GeoCommon.h"
@@ -59,7 +59,11 @@
virtual void getNextVertex(float v[3]) = 0;
virtual void printInfo( ) = 0;
+
+#ifdef WITH_CXX_GUARDEDALLOC
+ MEM_CXX_CLASS_ALLOC_FUNCS("DUALCON:ModelReader")
+#endif
+
};
-
-#endif
+#endif /* __MODELREADER_H__ */
Modified: trunk/blender/intern/dualcon/intern/Projections.cpp
===================================================================
--- trunk/blender/intern/dualcon/intern/Projections.cpp 2013-08-04 17:30:47 UTC (rev 58905)
+++ trunk/blender/intern/dualcon/intern/Projections.cpp 2013-08-04 17:58:17 UTC (rev 58906)
@@ -20,6 +20,10 @@
* ***** END GPL LICENSE BLOCK *****
*/
+#ifdef WITH_CXX_GUARDEDALLOC
+# include "MEM_guardedalloc.h"
+#endif
+
#include <math.h>
#include "Projections.h"
Modified: trunk/blender/intern/dualcon/intern/Projections.h
===================================================================
--- trunk/blender/intern/dualcon/intern/Projections.h 2013-08-04 17:30:47 UTC (rev 58905)
+++ trunk/blender/intern/dualcon/intern/Projections.h 2013-08-04 17:58:17 UTC (rev 58906)
@@ -20,8 +20,8 @@
* ***** END GPL LICENSE BLOCK *****
*/
-#ifndef PROJECTIONS_H
-#define PROJECTIONS_H
+#ifndef __PROJECTIONS_H__
+#define __PROJECTIONS_H__
#include <stdio.h>
#include <stdlib.h>
@@ -125,6 +125,11 @@
int isIntersectingPrimary(int edgeInd) const;
float getIntersectionPrimary(int edgeInd) const;
+
+#ifdef WITH_CXX_GUARDEDALLOC
+ MEM_CXX_CLASS_ALLOC_FUNCS("DUALCON:CubeTriangleIsect")
+#endif
+
};
-#endif
+#endif /* __PROJECTIONS_H__ */
Modified: trunk/blender/intern/dualcon/intern/Queue.h
===================================================================
--- trunk/blender/intern/dualcon/intern/Queue.h 2013-08-04 17:30:47 UTC (rev 58905)
+++ trunk/blender/intern/dualcon/intern/Queue.h 2013-08-04 17:58:17 UTC (rev 58906)
@@ -20,8 +20,8 @@
* ***** END GPL LICENSE BLOCK *****
*/
-#ifndef QUEUE_H
-#define QUEUE_H
+#ifndef __QUEUE_H__
+#define __QUEUE_H__
struct gridQueueEle {
int x, y, z;
@@ -99,10 +99,10 @@
return 1;
}
+#ifdef WITH_CXX_GUARDEDALLOC
+ MEM_CXX_CLASS_ALLOC_FUNCS("DUALCON:GridQueue")
+#endif
+
};
-
-
-
-
-#endif
+#endif /* __QUEUE_H__ */
Modified: trunk/blender/intern/dualcon/intern/cubes.h
===================================================================
--- trunk/blender/intern/dualcon/intern/cubes.h 2013-08-04 17:30:47 UTC (rev 58905)
+++ trunk/blender/intern/dualcon/intern/cubes.h 2013-08-04 17:58:17 UTC (rev 58906)
@@ -20,8 +20,8 @@
* ***** END GPL LICENSE BLOCK *****
*/
-#ifndef CUBES_H
-#define CUBES_H
+#ifndef __CUBES_H__
+#define __CUBES_H__
#include "marching_cubes_table.h"
@@ -41,6 +41,11 @@
for (int i = 0; i < 3; i++)
indices[i] = marching_cubes_tris[mask][index][i];
}
+
+#ifdef WITH_CXX_GUARDEDALLOC
+ MEM_CXX_CLASS_ALLOC_FUNCS("DUALCON:Cubes")
+#endif
+
};
-#endif
+#endif /* __CUBES_H__ */
Modified: trunk/blender/intern/dualcon/intern/dualcon_c_api.cpp
===================================================================
--- trunk/blender/intern/dualcon/intern/dualcon_c_api.cpp 2013-08-04 17:30:47 UTC (rev 58905)
+++ trunk/blender/intern/dualcon/intern/dualcon_c_api.cpp 2013-08-04 17:58:17 UTC (rev 58906)
@@ -185,6 +185,11 @@
int getMemory() {
return sizeof(DualConInputReader);
}
+
+#ifdef WITH_CXX_GUARDEDALLOC
+ MEM_CXX_CLASS_ALLOC_FUNCS("DUALCON:DualConInputReader")
+#endif
+
};
void *dualcon(const DualConInput *input_mesh,
Modified: trunk/blender/intern/dualcon/intern/manifold_table.h
===================================================================
--- trunk/blender/intern/dualcon/intern/manifold_table.h 2013-08-04 17:30:47 UTC (rev 58905)
+++ trunk/blender/intern/dualcon/intern/manifold_table.h 2013-08-04 17:58:17 UTC (rev 58906)
@@ -20,8 +20,8 @@
* ***** END GPL LICENSE BLOCK *****
*/
-#ifndef MANIFOLD_TABLE_H
-#define MANIFOLD_TABLE_H
+#ifndef __MANIFOLD_TABLE_H__
+#define __MANIFOLD_TABLE_H__
typedef struct {
int comps;
@@ -30,4 +30,4 @@
extern const ManifoldIndices manifold_table[256];
-#endif
+#endif /* __MANIFOLD_TABLE_H__ */
Modified: trunk/blender/intern/dualcon/intern/marching_cubes_table.h
===================================================================
--- trunk/blender/intern/dualcon/intern/marching_cubes_table.h 2013-08-04 17:30:47 UTC (rev 58905)
+++ trunk/blender/intern/dualcon/intern/marching_cubes_table.h 2013-08-04 17:58:17 UTC (rev 58906)
@@ -20,8 +20,8 @@
* ***** END GPL LICENSE BLOCK *****
*/
-#ifndef MARCHING_CUBES_TABLE_H
-#define MARCHING_CUBES_TABLE_H
+#ifndef __MARCHING_CUBES_TABLE_H__
+#define __MARCHING_CUBES_TABLE_H__
/* number of configurations */
#define TOTCONF 256
Modified: trunk/blender/intern/dualcon/intern/octree.cpp
===================================================================
--- trunk/blender/intern/dualcon/intern/octree.cpp 2013-08-04 17:30:47 UTC (rev 58905)
+++ trunk/blender/intern/dualcon/intern/octree.cpp 2013-08-04 17:58:17 UTC (rev 58906)
@@ -20,6 +20,10 @@
* ***** END GPL LICENSE BLOCK *****
*/
+#ifdef WITH_CXX_GUARDEDALLOC
+# include "MEM_guardedalloc.h"
+#endif
+
#include "octree.h"
#include <Eigen/Dense>
#include <limits>
Modified: trunk/blender/intern/dualcon/intern/octree.h
===================================================================
--- trunk/blender/intern/dualcon/intern/octree.h 2013-08-04 17:30:47 UTC (rev 58905)
+++ trunk/blender/intern/dualcon/intern/octree.h 2013-08-04 17:58:17 UTC (rev 58906)
@@ -20,8 +20,8 @@
* ***** END GPL LICENSE BLOCK *****
*/
-#ifndef OCTREE_H
-#define OCTREE_H
+#ifndef __OCTREE_H__
+#define __OCTREE_H__
#include <cassert>
#include <cstring>
@@ -1388,6 +1388,10 @@
removeInternal(num - 1, par);
return npar;
}
+
+#ifdef WITH_CXX_GUARDEDALLOC
+ MEM_CXX_CLASS_ALLOC_FUNCS("DUALCON:Octree")
+#endif
};
-#endif
+#endif /* __OCTREE_H__ */
More information about the Bf-blender-cvs
mailing list