diff --git a/Doc/changelog.docu b/Doc/changelog.docu
index e94a480c..91ea98a3 100644
--- a/Doc/changelog.docu
+++ b/Doc/changelog.docu
@@ -8,7 +8,12 @@
-
| 2.4 (?/?/?,Rev.838) |
+
+Significant interface changes
+
+- The functions n_vertices(),n_edges().n_faces() return size_t now.
+
Vector Type
@@ -16,6 +21,13 @@
- minimize and maximize return vector_type& (reference) instead of vector_type (value) to allow chaining p.minimize(p1).minimize(p2). (Thanks to Vladimir Chalupecky for the hint)
+Core
+
+- Allow PolyConnectivity::delete_edge to mark an edge as deleted, if there are no faces incident.
+- Don't use c headers in c++ files anymore
+
+
+
IO
- Try to get rid of memory leak in IOManager(Changes the pointer used for IOManager to a static IOManager in the getter function)
@@ -57,6 +69,7 @@
Unittests
+- Added unittest for skipping iterators
- Added unittest for collapse and is_collapse_ok
- Added unittests for delete_face
- Added unittests for circulators
diff --git a/src/OpenMesh/Core/Mesh/ArrayKernel.cc b/src/OpenMesh/Core/Mesh/ArrayKernel.cc
index 86991944..e6bb2ca5 100644
--- a/src/OpenMesh/Core/Mesh/ArrayKernel.cc
+++ b/src/OpenMesh/Core/Mesh/ArrayKernel.cc
@@ -144,7 +144,7 @@ void ArrayKernel::clear()
-void ArrayKernel::resize( unsigned int _n_vertices, unsigned int _n_edges, unsigned int _n_faces )
+void ArrayKernel::resize( size_t _n_vertices, size_t _n_edges, size_t _n_faces )
{
vertices_.resize(_n_vertices);
edges_.resize(_n_edges);
@@ -156,7 +156,7 @@ void ArrayKernel::resize( unsigned int _n_vertices, unsigned int _n_edges, unsig
fprops_resize(n_faces());
}
-void ArrayKernel::reserve(unsigned int _n_vertices, unsigned int _n_edges, unsigned int _n_faces )
+void ArrayKernel::reserve(size_t _n_vertices, size_t _n_edges, size_t _n_faces )
{
vertices_.reserve(_n_vertices);
edges_.reserve(_n_edges);
diff --git a/src/OpenMesh/Core/Mesh/ArrayKernel.hh b/src/OpenMesh/Core/Mesh/ArrayKernel.hh
index 946545bb..c705a84b 100644
--- a/src/OpenMesh/Core/Mesh/ArrayKernel.hh
+++ b/src/OpenMesh/Core/Mesh/ArrayKernel.hh
@@ -257,8 +257,8 @@ public:
public:
// --- resize/reserve ---
- void resize( unsigned int _n_vertices, unsigned int _n_edges, unsigned int _n_faces );
- void reserve(unsigned int _n_vertices, unsigned int _n_edges, unsigned int _n_faces );
+ void resize( size_t _n_vertices, size_t _n_edges, size_t _n_faces );
+ void reserve(size_t _n_vertices, size_t _n_edges, size_t _n_faces );
// --- deletion ---
/** \brief garbage collection
@@ -685,7 +685,7 @@ public:
typedef typename HandleContainer::const_iterator
const_iterator;
public:
- ExtStatusSetT(ArrayKernel& _kernel, unsigned int _capacity_hint = 0)
+ ExtStatusSetT(ArrayKernel& _kernel, size_t _capacity_hint = 0)
: Base(_kernel)
{ handles_.reserve(_capacity_hint); }
|