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

Merge branch 'warnings' of https://www.graphics.rwth-aachen.de:9000/OpenMesh/OpenMesh into warnings

Browse Source
This commit is contained in:
Jan Möbius
2016-11-07 15:02:15 +01:00
parent 74ada2eac0 d966d44a3f
commit aec2fa2442
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/OpenMesh/Tools/Subdivider/Adaptive/Composite/RulesT.cc
View File

@@ -650,7 +650,7 @@ Tvv4<M>::raise(typename M::VertexHandle& _vh, state_t _target_state)
this->update(_vh, _target_state); this->update(_vh, _target_state);
// multiply old position by 4 // multiply old position by 4
MOBJ(_vh).set_position(_target_state, MOBJ(_vh).position(_target_state - 1) * 4.0); MOBJ(_vh).set_position(_target_state, MOBJ(_vh).position(_target_state - 1) * static_cast<typename M::Point::value_type>(4.0));
MOBJ(_vh).inc_state(); MOBJ(_vh).inc_state();
} }

2
src/Unittests/unittests_trimesh_circulator_current_halfedge_handle_replacement.cc
View File

@@ -328,7 +328,7 @@ TEST_F(OpenMeshTrimeshCirculatorCurrentHalfedgeHandleReplacement, vf_iter_bounda
* \ / * \ /
* 5 * 5
*/ */
size_t current_halfedge_handles[9] = { int current_halfedge_handles[9] = {
0,2,12,4,6,8,16,10,14 0,2,12,4,6,8,16,10,14
}; };
std::vector<Mesh::FaceHandle> fh0; std::vector<Mesh::FaceHandle> fh0;

2
src/Unittests/unittests_trimesh_others.cc
View File

@@ -164,7 +164,7 @@ TEST_F(OpenMeshOthers, CalcDihedralAngre ) {
EXPECT_EQ( 0.0 , mesh_.calc_dihedral_angle(eh) ) << "Wrong Dihedral angle!" << std::endl; EXPECT_EQ( 0.0 , mesh_.calc_dihedral_angle(eh) ) << "Wrong Dihedral angle!" << std::endl;
// Modify point // Modify point
Mesh::Point tmp = ( Mesh::Point(0.0, 0.0, -1.0) + Mesh::Point(1.0, 1.0, -1.0) ) * 0.5; Mesh::Point tmp = ( Mesh::Point(0.0, 0.0, -1.0) + Mesh::Point(1.0, 1.0, -1.0) ) * static_cast<typename Mesh::Point::value_type>(0.5);
mesh_.point(vhandle[2]) = tmp; mesh_.point(vhandle[2]) = tmp;
double difference = fabs( 1.36944 - mesh_.calc_dihedral_angle(eh) ); double difference = fabs( 1.36944 - mesh_.calc_dihedral_angle(eh) );

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, unsigned int > MyMap; typedef std::map< std::string, size_t > 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();
unsigned int N = _v.size(); size_t 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;
unsigned int N = _v.size(); size_t 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)