Commit fb386978 authored by Jan Möbius's avatar Jan Möbius

More size_t fixes



git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@841 fdac6126-5c0c-442c-9429-916003d36597
parent ff5425d8
......@@ -8,7 +8,12 @@
<!-- --------------------------------------------------------------------- -->
<tr valign=top><td><b>2.4</b> (?/?/?,Rev.830)</td><td>
<tr valign=top><td><b>2.4</b> (?/?/?,Rev.838)</td><td>
<b>Significant interface changes</b>
<ul>
<li><b>The functions n_vertices(),n_edges().n_faces() return size_t now.</b></li>
</ul>
<b>Vector Type</b>
<ul>
......@@ -16,6 +21,13 @@
<li>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)</li>
</ul>
<b>Core</b>
<ul>
<li>Allow PolyConnectivity::delete_edge to mark an edge as deleted, if there are no faces incident.</li>
<li>Don't use c headers in c++ files anymore</li>
</ul>
<b>IO</b>
<ul>
<li>Try to get rid of memory leak in IOManager(Changes the pointer used for IOManager to a static IOManager in the getter function)</li>
......@@ -57,6 +69,7 @@
<b>Unittests</b>
<ul>
<li>Added unittest for skipping iterators</li>
<li>Added unittest for collapse and is_collapse_ok</li>
<li>Added unittests for delete_face</li>
<li>Added unittests for circulators</li>
......
......@@ -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);
......
......@@ -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); }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment