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

Merge branch 'Fix_warnings' into 'master'

Browse Source 
Fix warnings

See merge request OpenMesh/OpenMesh!202
This commit is contained in:
Jan Möbius
2018-12-14 16:14:24 +01:00
parent 49ad640c84 44bfe825bb
commit 2601ce4e7d
2 changed files with 9 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cmake/ACGQt.cmake
View File

@@ -1,15 +1,3 @@
#unset cached qt variables which are set by all qt versions. version is the major number of the qt version (e.g. 4 or 5, not 4.8)
macro (acg_unset_qt_shared_variables version)
if (ACG_INTERNAL_QT_LAST_VERSION)
if (NOT ${ACG_INTERNAL_QT_LAST_VERSION} EQUAL ${version})
unset(QT_BINARY_DIR)
unset(QT_PLUGINS_DIR)
unset(ACG_INTERNAL_QT_LAST_VERSION)
endif()
endif()
set (ACG_INTERNAL_QT_LAST_VERSION "${version}" CACHE INTERNAL "Qt Version, which was used on the last time")
endmacro()
macro (acg_qt5) macro (acg_qt5)
if(POLICY CMP0020) if(POLICY CMP0020)
@@ -63,8 +51,7 @@ macro (acg_qt5)
endif(Qt5Core_FOUND) endif(Qt5Core_FOUND)
if (QT5_FOUND) if (QT5_FOUND)
acg_unset_qt_shared_variables(5)
#set plugin dir #set plugin dir
list(GET Qt5Gui_PLUGINS 0 _plugin) list(GET Qt5Gui_PLUGINS 0 _plugin)
if (_plugin) if (_plugin)

16
src/OpenMesh/Core/IO/reader/OMReader.cc
View File

@@ -380,7 +380,7 @@ bool _OMReader_::read_binary_vertex_chunk(std::istream &_is, BaseImporter &_bi,
{ {
for (; vidx < header_.n_vertices_; ++vidx) for (; vidx < header_.n_vertices_; ++vidx)
{ {
int halfedge_id; int halfedge_id = 0;
bytes_ += restore( _is, halfedge_id, OMFormat::Chunk::Integer_Size(chunk_header_.bits_), _swap ); bytes_ += restore( _is, halfedge_id, OMFormat::Chunk::Integer_Size(chunk_header_.bits_), _swap );
_bi.set_halfedge(VertexHandle(static_cast<int>(vidx)), HalfedgeHandle(halfedge_id)); _bi.set_halfedge(VertexHandle(static_cast<int>(vidx)), HalfedgeHandle(halfedge_id));
@@ -454,7 +454,7 @@ bool _OMReader_::read_binary_face_chunk(std::istream &_is, BaseImporter &_bi, Op
// add faces by simply setting an incident halfedge // add faces by simply setting an incident halfedge
for (; fidx < header_.n_faces_; ++fidx) for (; fidx < header_.n_faces_; ++fidx)
{ {
int halfedge_id; int halfedge_id = 0;
bytes_ += restore( _is, halfedge_id, OMFormat::Chunk::Integer_Size(chunk_header_.bits_), _swap ); bytes_ += restore( _is, halfedge_id, OMFormat::Chunk::Integer_Size(chunk_header_.bits_), _swap );
_bi.add_face(HalfedgeHandle(halfedge_id)); _bi.add_face(HalfedgeHandle(halfedge_id));
@@ -585,16 +585,16 @@ bool _OMReader_::read_binary_halfedge_chunk(std::istream &_is, BaseImporter &_bi
std::vector<HalfedgeHandle> next_halfedges; std::vector<HalfedgeHandle> next_halfedges;
for (size_t e_idx = 0; e_idx < header_.n_edges_; ++e_idx) for (size_t e_idx = 0; e_idx < header_.n_edges_; ++e_idx)
{ {
int next_id_0; int next_id_0 = -1;
int to_vertex_id_0; int to_vertex_id_0 = -1;
int face_id_0; int face_id_0 = -1;
bytes_ += restore( _is, next_id_0, OMFormat::Chunk::Integer_Size(chunk_header_.bits_), _swap ); bytes_ += restore( _is, next_id_0, OMFormat::Chunk::Integer_Size(chunk_header_.bits_), _swap );
bytes_ += restore( _is, to_vertex_id_0, OMFormat::Chunk::Integer_Size(chunk_header_.bits_), _swap ); bytes_ += restore( _is, to_vertex_id_0, OMFormat::Chunk::Integer_Size(chunk_header_.bits_), _swap );
bytes_ += restore( _is, face_id_0, OMFormat::Chunk::Integer_Size(chunk_header_.bits_), _swap ); bytes_ += restore( _is, face_id_0, OMFormat::Chunk::Integer_Size(chunk_header_.bits_), _swap );
int next_id_1; int next_id_1 = -1;
int to_vertex_id_1; int to_vertex_id_1 = -1;
int face_id_1; int face_id_1 = -1;
bytes_ += restore( _is, next_id_1, OMFormat::Chunk::Integer_Size(chunk_header_.bits_), _swap ); bytes_ += restore( _is, next_id_1, OMFormat::Chunk::Integer_Size(chunk_header_.bits_), _swap );
bytes_ += restore( _is, to_vertex_id_1, OMFormat::Chunk::Integer_Size(chunk_header_.bits_), _swap ); bytes_ += restore( _is, to_vertex_id_1, OMFormat::Chunk::Integer_Size(chunk_header_.bits_), _swap );
bytes_ += restore( _is, face_id_1, OMFormat::Chunk::Integer_Size(chunk_header_.bits_), _swap ); bytes_ += restore( _is, face_id_1, OMFormat::Chunk::Integer_Size(chunk_header_.bits_), _swap );