diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-08-04 21:58:17 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-08-04 21:58:17 +0400 |
commit | 35db9c5e70340a6325b33403538b18d78e4d6867 (patch) | |
tree | e3319a7057d63a96e737163bc32f4980502e0876 /intern/dualcon | |
parent | d2dbc0b85eccd5989286c063b94f78f18992d3df (diff) |
Support WITH_CXX_GUARDEDALLOC for dualcon library
Diffstat (limited to 'intern/dualcon')
-rw-r--r-- | intern/dualcon/dualcon.h | 4 | ||||
-rw-r--r-- | intern/dualcon/intern/GeoCommon.h | 6 | ||||
-rw-r--r-- | intern/dualcon/intern/MemoryAllocator.h | 16 | ||||
-rw-r--r-- | intern/dualcon/intern/ModelReader.h | 12 | ||||
-rw-r--r-- | intern/dualcon/intern/Projections.cpp | 4 | ||||
-rw-r--r-- | intern/dualcon/intern/Projections.h | 11 | ||||
-rw-r--r-- | intern/dualcon/intern/Queue.h | 14 | ||||
-rw-r--r-- | intern/dualcon/intern/cubes.h | 11 | ||||
-rw-r--r-- | intern/dualcon/intern/dualcon_c_api.cpp | 5 | ||||
-rw-r--r-- | intern/dualcon/intern/manifold_table.h | 6 | ||||
-rw-r--r-- | intern/dualcon/intern/marching_cubes_table.h | 4 | ||||
-rw-r--r-- | intern/dualcon/intern/octree.cpp | 4 | ||||
-rw-r--r-- | intern/dualcon/intern/octree.h | 10 |
13 files changed, 76 insertions, 31 deletions
diff --git a/intern/dualcon/dualcon.h b/intern/dualcon/dualcon.h index 1c3d31b6625..c1452a72970 100644 --- a/intern/dualcon/dualcon.h +++ b/intern/dualcon/dualcon.h @@ -23,6 +23,10 @@ #ifndef __DUALCON_H__ #define __DUALCON_H__ +#ifdef WITH_CXX_GUARDEDALLOC +# include "MEM_guardedalloc.h" +#endif + #ifdef __cplusplus extern "C" { #endif diff --git a/intern/dualcon/intern/GeoCommon.h b/intern/dualcon/intern/GeoCommon.h index 9f5a99e9e20..45f60a1060a 100644 --- a/intern/dualcon/intern/GeoCommon.h +++ b/intern/dualcon/intern/GeoCommon.h @@ -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 @@ typedef struct { } BoundingBoxf; -#endif +#endif /* __GEOCOMMON_H__ */ diff --git a/intern/dualcon/intern/MemoryAllocator.h b/intern/dualcon/intern/MemoryAllocator.h index e673d9498d2..29d82aeb3a2 100644 --- a/intern/dualcon/intern/MemoryAllocator.h +++ b/intern/dualcon/intern/MemoryAllocator.h @@ -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 void printInfo( ) = 0; 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 @@ int getBytes( ) { return N; }; -}; +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("DUALCON:MemoryAllocator") #endif + +}; + +#endif /* __MEMORYALLOCATOR_H__ */ diff --git a/intern/dualcon/intern/ModelReader.h b/intern/dualcon/intern/ModelReader.h index 993c5756531..a72368ef4dc 100644 --- a/intern/dualcon/intern/ModelReader.h +++ b/intern/dualcon/intern/ModelReader.h @@ -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 int getNumVertices( ) = 0; virtual void getNextVertex(float v[3]) = 0; virtual void printInfo( ) = 0; -}; - +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("DUALCON:ModelReader") #endif + +}; + +#endif /* __MODELREADER_H__ */ diff --git a/intern/dualcon/intern/Projections.cpp b/intern/dualcon/intern/Projections.cpp index f00d998591f..e85589e3ff5 100644 --- a/intern/dualcon/intern/Projections.cpp +++ b/intern/dualcon/intern/Projections.cpp @@ -20,6 +20,10 @@ * ***** END GPL LICENSE BLOCK ***** */ +#ifdef WITH_CXX_GUARDEDALLOC +# include "MEM_guardedalloc.h" +#endif + #include <math.h> #include "Projections.h" diff --git a/intern/dualcon/intern/Projections.h b/intern/dualcon/intern/Projections.h index 2cc3320f8e4..a5086ddca39 100644 --- a/intern/dualcon/intern/Projections.h +++ b/intern/dualcon/intern/Projections.h @@ -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 @@ public: int isIntersectingPrimary(int edgeInd) const; float getIntersectionPrimary(int edgeInd) const; -}; +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("DUALCON:CubeTriangleIsect") #endif + +}; + +#endif /* __PROJECTIONS_H__ */ diff --git a/intern/dualcon/intern/Queue.h b/intern/dualcon/intern/Queue.h index a2b5b46c72c..098b883da32 100644 --- a/intern/dualcon/intern/Queue.h +++ b/intern/dualcon/intern/Queue.h @@ -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 @@ int popQueue(int st[3], int& dir) return 1; } -}; - - - +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("DUALCON:GridQueue") +#endif +}; -#endif +#endif /* __QUEUE_H__ */ diff --git a/intern/dualcon/intern/cubes.h b/intern/dualcon/intern/cubes.h index 8b5125e261a..991edebda7e 100644 --- a/intern/dualcon/intern/cubes.h +++ b/intern/dualcon/intern/cubes.h @@ -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 @@ void getTriangle(int mask, int index, int indices[3]) 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 /* __CUBES_H__ */ diff --git a/intern/dualcon/intern/dualcon_c_api.cpp b/intern/dualcon/intern/dualcon_c_api.cpp index c96415bfb54..6c3ec4dcc3b 100644 --- a/intern/dualcon/intern/dualcon_c_api.cpp +++ b/intern/dualcon/intern/dualcon_c_api.cpp @@ -185,6 +185,11 @@ void printInfo() { int getMemory() { return sizeof(DualConInputReader); } + +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("DUALCON:DualConInputReader") +#endif + }; void *dualcon(const DualConInput *input_mesh, diff --git a/intern/dualcon/intern/manifold_table.h b/intern/dualcon/intern/manifold_table.h index 1827623f5ff..89779fdfe4e 100644 --- a/intern/dualcon/intern/manifold_table.h +++ b/intern/dualcon/intern/manifold_table.h @@ -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 @@ typedef struct { extern const ManifoldIndices manifold_table[256]; -#endif +#endif /* __MANIFOLD_TABLE_H__ */ diff --git a/intern/dualcon/intern/marching_cubes_table.h b/intern/dualcon/intern/marching_cubes_table.h index e45e1c60924..e1e44a50961 100644 --- a/intern/dualcon/intern/marching_cubes_table.h +++ b/intern/dualcon/intern/marching_cubes_table.h @@ -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 diff --git a/intern/dualcon/intern/octree.cpp b/intern/dualcon/intern/octree.cpp index 49c50c8240d..6567b2873a2 100644 --- a/intern/dualcon/intern/octree.cpp +++ b/intern/dualcon/intern/octree.cpp @@ -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> diff --git a/intern/dualcon/intern/octree.h b/intern/dualcon/intern/octree.h index 544048249de..67eaf3a650b 100644 --- a/intern/dualcon/intern/octree.h +++ b/intern/dualcon/intern/octree.h @@ -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 @@ class Octree removeInternal(num - 1, par); return npar; } -}; +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("DUALCON:Octree") #endif +}; + +#endif /* __OCTREE_H__ */ |