Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Several warnings

Browse Source
This commit is contained in:
Jan Möbius
2016-11-07 15:10:23 +01:00
parent 79ce71f2d3
commit 7175cd8c6d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeT.cc
View File

@@ -589,7 +589,7 @@ void CompositeT<MeshType,RealType>::FVc(Coeff& _coeff)
if (mesh_.face_handle(mesh_.opposite_halfedge_handle(mesh_.next_halfedge_handle(*voh_it))).is_valid()) { if (mesh_.face_handle(mesh_.opposite_halfedge_handle(mesh_.next_halfedge_handle(*voh_it))).is_valid()) {
cog += mesh_.data(mesh_.face_handle(*voh_it)).position() * c; cog += mesh_.data(mesh_.face_handle(*voh_it)).position() * c;
cog += mesh_.data(mesh_.face_handle(mesh_.opposite_halfedge_handle(mesh_.next_halfedge_handle(*voh_it)))).position() * (1.0 - c); cog += mesh_.data(mesh_.face_handle(mesh_.opposite_halfedge_handle(mesh_.next_halfedge_handle(*voh_it)))).position() * (static_cast<typename MeshType::Point::value_type>(1.0) - c);
} else { } else {
cog += mesh_.data(mesh_.face_handle(*voh_it)).position(); cog += mesh_.data(mesh_.face_handle(*voh_it)).position();
} }

6
src/Unittests/unittests_tutorials.cc
View File

@@ -57,7 +57,7 @@ struct MyData
bool operator != (const MyData& _rhs) const { return !(*this == _rhs); } bool operator != (const MyData& _rhs) const { return !(*this == _rhs); }
}; };
typedef std::map< std::string, size_t > MyMap; typedef std::map< std::string, unsigned int > MyMap;
namespace OpenMesh { namespace OpenMesh {
namespace IO { namespace IO {
@@ -114,7 +114,7 @@ namespace OpenMesh {
return sizeof(unsigned int); return sizeof(unsigned int);
value_type::const_iterator it = _v.begin(); value_type::const_iterator it = _v.begin();
size_t N = _v.size(); unsigned int N = _v.size();
size_t bytes = IO::size_of(N); size_t bytes = IO::size_of(N);
for(;it!=_v.end(); ++it) for(;it!=_v.end(); ++it)
{ {
@@ -128,7 +128,7 @@ namespace OpenMesh {
size_t store(std::ostream& _os, const value_type& _v, bool _swap=false) size_t store(std::ostream& _os, const value_type& _v, bool _swap=false)
{ {
size_t bytes = 0; size_t bytes = 0;
size_t N = _v.size(); unsigned int N = _v.size();
value_type::const_iterator it = _v.begin(); value_type::const_iterator it = _v.begin();
bytes += IO::store( _os, N, _swap ); bytes += IO::store( _os, N, _swap );
for (; it != _v.end() && _os.good(); ++it) for (; it != _v.end() && _os.good(); ++it)