Commit 9d1213ed authored by Jan Möbius's avatar Jan Möbius

Some size_t fixes

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@928 fdac6126-5c0c-442c-9429-916003d36597
parent fb8baf09
...@@ -369,7 +369,7 @@ decimate(const std::string &_ifname, ...@@ -369,7 +369,7 @@ decimate(const std::string &_ifname,
float nv_before = float(mesh.n_vertices()); float nv_before = float(mesh.n_vertices());
timer.start(); timer.start();
int rc = 0; size_t rc = 0;
if (_opt.n_collapses < 0.0) if (_opt.n_collapses < 0.0)
rc = decimater.decimate_to( size_t(-_opt.n_collapses) ); rc = decimater.decimate_to( size_t(-_opt.n_collapses) );
else if (_opt.n_collapses >= 1.0 || _opt.n_collapses == 0.0) else if (_opt.n_collapses >= 1.0 || _opt.n_collapses == 0.0)
......
...@@ -301,8 +301,8 @@ int main(int argc, char **argv) ...@@ -301,8 +301,8 @@ int main(int argc, char **argv)
i = 0; i = 0;
// calculate target states for faces and vertices // calculate target states for faces and vertices
int target1 = (n - 1) * n_rules + subdivider.subdiv_rule().number() + 1; size_t target1 = (n - 1) * n_rules + subdivider.subdiv_rule().number() + 1;
int target2 = n * n_rules; size_t target2 = n * n_rules;
for (f_it = mesh.faces_begin(); f_it != mesh.faces_end(); ++f_it) { for (f_it = mesh.faces_begin(); f_it != mesh.faces_end(); ++f_it) {
......
...@@ -308,7 +308,7 @@ int main(int argc, char **argv) ...@@ -308,7 +308,7 @@ int main(int argc, char **argv)
std::cout << " done [" << t.as_string() << "]\n"; std::cout << " done [" << t.as_string() << "]\n";
t.reset(); t.reset();
int rc; size_t rc;
size_t nv = mesh.n_vertices(); size_t nv = mesh.n_vertices();
std::cout << "Begin decimation (#V " << nv << ")\n"; std::cout << "Begin decimation (#V " << nv << ")\n";
......
...@@ -98,7 +98,7 @@ public: ...@@ -98,7 +98,7 @@ public:
void clear() { Strips().swap(strips_); } void clear() { Strips().swap(strips_); }
/// returns number of strips /// returns number of strips
unsigned int n_strips() const { return strips_.size(); } size_t n_strips() const { return strips_.size(); }
/// are strips computed? /// are strips computed?
bool is_valid() const { return !strips_.empty(); } bool is_valid() const { return !strips_.empty(); }
......
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