From 6ba9774194d49e29c0b8196dfd70e6116d100df5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Mon, 18 Feb 2013 17:17:01 +0000 Subject: [PATCH] Fixed various warnings git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@803 fdac6126-5c0c-442c-9429-916003d36597 --- src/OpenMesh/Apps/QtViewer/QGLViewerWidget.cc | 2 +- .../VDProgMesh/mkbalancedpm/mkbalancedpm.cc | 2 +- src/OpenMesh/Core/IO/writer/OMWriter.cc | 34 +++++++++---------- .../Examples/Tutorial10/fill_props.hh | 4 +-- .../Examples/Tutorial10/persistence.cc | 1 - .../Subdivider/Adaptive/Composite/RulesT.cc | 1 - .../Tools/Subdivider/Uniform/CatmullClarkT.cc | 1 - src/OpenMesh/Tools/Utils/Gnuplot.hh | 2 +- src/OpenMesh/Tools/Utils/conio.cc | 4 +-- 9 files changed, 24 insertions(+), 27 deletions(-) diff --git a/src/OpenMesh/Apps/QtViewer/QGLViewerWidget.cc b/src/OpenMesh/Apps/QtViewer/QGLViewerWidget.cc index 9f98b1ae..5ee26fab 100644 --- a/src/OpenMesh/Apps/QtViewer/QGLViewerWidget.cc +++ b/src/OpenMesh/Apps/QtViewer/QGLViewerWidget.cc @@ -126,7 +126,7 @@ QGLViewerWidget::init(void) QAction *a; a = add_draw_mode("Wireframe"); a->setShortcut(QKeySequence(Key_W)); - a = add_draw_mode("Solid Flat"); + add_draw_mode("Solid Flat"); a = add_draw_mode("Solid Smooth"); a->setShortcut(QKeySequence(Key_S)); a->setChecked(true); diff --git a/src/OpenMesh/Apps/VDProgMesh/mkbalancedpm/mkbalancedpm.cc b/src/OpenMesh/Apps/VDProgMesh/mkbalancedpm/mkbalancedpm.cc index faeec95e..56d36895 100644 --- a/src/OpenMesh/Apps/VDProgMesh/mkbalancedpm/mkbalancedpm.cc +++ b/src/OpenMesh/Apps/VDProgMesh/mkbalancedpm/mkbalancedpm.cc @@ -84,7 +84,7 @@ public: /// Constructor ModBalancerT( D &_dec ) : BaseModQ( _dec ), - max_level_(0), n_vertices_(0) + max_level_(0), n_roots_(0), n_vertices_(0) { BaseModQ::mesh().add_property( level_ ); } diff --git a/src/OpenMesh/Core/IO/writer/OMWriter.cc b/src/OpenMesh/Core/IO/writer/OMWriter.cc index 3d6a8943..33026045 100644 --- a/src/OpenMesh/Core/IO/writer/OMWriter.cc +++ b/src/OpenMesh/Core/IO/writer/OMWriter.cc @@ -261,23 +261,24 @@ bool _OMWriter_::write_binary(std::ostream& _os, BaseExporter& _be, } // ---------- write vertex texture coords - if (_be.n_vertices() && _opt.check(Options::VertexTexCoord)) - { + if (_be.n_vertices() && _opt.check(Options::VertexTexCoord)) { + t = _be.texcoord(VertexHandle(0)); - chunk_header.name_ = false; - chunk_header.entity_ = OMFormat::Chunk::Entity_Vertex; - chunk_header.type_ = OMFormat::Chunk::Type_Texcoord; - chunk_header.signed_ = OMFormat::is_signed(t[0]); - chunk_header.float_ = OMFormat::is_float(t[0]); - chunk_header.dim_ = OMFormat::dim(t); - chunk_header.bits_ = OMFormat::bits(t[0]); + chunk_header.name_ = false; + chunk_header.entity_ = OMFormat::Chunk::Entity_Vertex; + chunk_header.type_ = OMFormat::Chunk::Type_Texcoord; + chunk_header.signed_ = OMFormat::is_signed(t[0]); + chunk_header.float_ = OMFormat::is_float(t[0]); + chunk_header.dim_ = OMFormat::dim(t); + chunk_header.bits_ = OMFormat::bits(t[0]); // std::clog << chunk_header << std::endl; - bytes += store( _os, chunk_header, swap ); + bytes += store(_os, chunk_header, swap); + + for (i = 0, nV = _be.n_vertices(); i < nV; ++i) + bytes += vector_store(_os, _be.texcoord(VertexHandle(i)), swap); - for (i=0, nV=_be.n_vertices(); i _ph, bool _check=false) { n = it.handle().idx(); - v = it.handle().idx()+1; // ival - v = values[n%9]; // dval +// v = it.handle().idx()+1; // ival +// v = values[n%9]; // dval v = ((n&(n-1))==0); // bval v.vec4fval[0] = a[n%9]; v.vec4fval[1] = b[n%9]; diff --git a/src/OpenMesh/Examples/Tutorial10/persistence.cc b/src/OpenMesh/Examples/Tutorial10/persistence.cc index 54b25ff1..ffc7ac4a 100644 --- a/src/OpenMesh/Examples/Tutorial10/persistence.cc +++ b/src/OpenMesh/Examples/Tutorial10/persistence.cc @@ -195,7 +195,6 @@ namespace OpenMesh { bytes += IO::restore( _is, N, _swap ); - value_type::iterator it = _v.begin(); std::string key; size_t val; diff --git a/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/RulesT.cc b/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/RulesT.cc index 2d4cf564..4b2d9763 100644 --- a/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/RulesT.cc +++ b/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/RulesT.cc @@ -1438,7 +1438,6 @@ void VdE::raise(typename M::EdgeHandle& _eh, state_t _target_state) typename M::VertexHandle vh; typename M::HalfedgeHandle hh1(Base::mesh_.HEH(_eh, 0)), hh2(Base::mesh_.HEH(_eh, 1)); - std::vector vertex_vector; typename M::FaceHandle fh1, fh2; if (_target_state > 1) { diff --git a/src/OpenMesh/Tools/Subdivider/Uniform/CatmullClarkT.cc b/src/OpenMesh/Tools/Subdivider/Uniform/CatmullClarkT.cc index 4762513d..8fc67fd2 100644 --- a/src/OpenMesh/Tools/Subdivider/Uniform/CatmullClarkT.cc +++ b/src/OpenMesh/Tools/Subdivider/Uniform/CatmullClarkT.cc @@ -372,7 +372,6 @@ CatmullClarkT::update_vertex( MeshType& _m, const VertexHandl VertexFaceIter vf_itr; Point Q(0, 0, 0); - double neigboring_faces(0.0); for ( vf_itr = _m.vf_iter( _vh); vf_itr; ++vf_itr) //, neigboring_faces += 1.0 ) { diff --git a/src/OpenMesh/Tools/Utils/Gnuplot.hh b/src/OpenMesh/Tools/Utils/Gnuplot.hh index 45f8d429..94b4a2ac 100644 --- a/src/OpenMesh/Tools/Utils/Gnuplot.hh +++ b/src/OpenMesh/Tools/Utils/Gnuplot.hh @@ -97,7 +97,7 @@ private: string pstyle; vector to_delete; int nplots; - bool get_program_path(const string); + bool get_program_path(const string& ); bool valid; // Name of executed GNUPlot file diff --git a/src/OpenMesh/Tools/Utils/conio.cc b/src/OpenMesh/Tools/Utils/conio.cc index 946544a0..3bdc7082 100644 --- a/src/OpenMesh/Tools/Utils/conio.cc +++ b/src/OpenMesh/Tools/Utils/conio.cc @@ -112,7 +112,7 @@ int kbhit(void) int getch(void) { - char ch; + char ch = ' '; int error; static struct termios Otty, Ntty; @@ -149,7 +149,7 @@ int getch(void) int getche(void) { - char ch; + char ch = ' '; int error; static struct termios Otty, Ntty;