Commit f37ee2d4 authored by Jan Möbius's avatar Jan Möbius
Browse files

Fixed 2 more warnings

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@944 fdac6126-5c0c-442c-9429-916003d36597
parent 58223514
...@@ -141,11 +141,7 @@ public: // inherited ...@@ -141,11 +141,7 @@ public: // inherited
{ {
std::cout << "prepare decimater" << std::endl; std::cout << "prepare decimater" << std::endl;
// to be compatible with gcc 2.95.3 decimater_ = decimater_o ( new decimater_t ( mesh() ) );
{
decimater_o tmp( new decimater_t ( mesh() ) );
decimater_ = tmp;
}
decimater_->add(mod_quadric_); decimater_->add(mod_quadric_);
decimater_->module(mod_quadric_).set_binary(false); decimater_->module(mod_quadric_).set_binary(false);
......
...@@ -296,7 +296,7 @@ write(std::ostream& _out, BaseExporter& _be, Options _opt, std::streamsize _prec ...@@ -296,7 +296,7 @@ write(std::ostream& _out, BaseExporter& _be, Options _opt, std::streamsize _prec
// if we are ina a new material block, specify in the file which material to use // if we are ina a new material block, specify in the file which material to use
if(lastMat != material) { if(lastMat != material) {
_out << "usemtl mat" << material << std::endl; _out << "usemtl mat" << material << std::endl;
lastMat = material; lastMat = material;
} }
} }
......
...@@ -149,11 +149,13 @@ build_strips() ...@@ -149,11 +149,13 @@ build_strips()
// build 3 strips, take best one // build 3 strips, take best one
size_t best_length = 0; size_t best_length = 0;
size_t best_idx = 0; size_t best_idx = 0;
size_t length;
for (size_t i=0; i<3; ++i) for (size_t i=0; i<3; ++i)
{ {
build_strip(h[i], experiments[i], faces[i]); build_strip(h[i], experiments[i], faces[i]);
if ((length = experiments[i].size()) > best_length)
const size_t length = experiments[i].size();
if ( length > best_length)
{ {
best_length = length; best_length = length;
best_idx = i; best_idx = i;
......
Supports Markdown
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