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

Merge branch 'implicit_fallthrough' into 'master'

Browse Source 
Fix implicit fallthrough warning on gcc

See merge request OpenMesh/OpenMesh!152
This commit is contained in:
Jan Möbius
2018-01-26 16:06:18 +01:00
parent 59b1daa49d d1088ae2e5
commit 958b7a1c09
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Doc/changelog.docu
View File

@@ -64,6 +64,7 @@
<li>OM Writer: Added Mark to the format header to identify end of stream correctly (Thanks to Jamie Kydd for the patch)</li> <li>OM Writer: Added Mark to the format header to identify end of stream correctly (Thanks to Jamie Kydd for the patch)</li>
<li>PLY Reader: Skip reading extra elements after face</li> <li>PLY Reader: Skip reading extra elements after face</li>
<li>PLY Reader: Return error when reaching EOF</li> <li>PLY Reader: Return error when reaching EOF</li>
<li>OMFormat: Fix implicit fallthrough warning on gcc(Thanks to Manuel Massing for the patch)</li>
</ul> </ul>
<b>Unittests</b> <b>Unittests</b>

8
src/OpenMesh/Core/IO/OMFormat.hh
View File

@@ -315,16 +315,16 @@ namespace OMFormat {
/// Return the size of chunk data in bytes /// Return the size of chunk data in bytes
inline size_t chunk_data_size( Header& _hdr, Chunk::Header& _chunk_hdr ) inline size_t chunk_data_size( Header& _hdr, Chunk::Header& _chunk_hdr )
{ {
size_t C = 0; size_t C;
switch( _chunk_hdr.entity_ ) switch( _chunk_hdr.entity_ )
{ {
case Chunk::Entity_Vertex: C = _hdr.n_vertices_; break; case Chunk::Entity_Vertex: C = _hdr.n_vertices_; break;
case Chunk::Entity_Face: C = _hdr.n_faces_; break; case Chunk::Entity_Face: C = _hdr.n_faces_; break;
case Chunk::Entity_Halfedge: C = _hdr.n_edges_; // no break! case Chunk::Entity_Halfedge: C = _hdr.n_edges_*2; break;
case Chunk::Entity_Edge: C += _hdr.n_edges_; break; case Chunk::Entity_Edge: C = _hdr.n_edges_; break;
case Chunk::Entity_Mesh: C = 1; break; case Chunk::Entity_Mesh: C = 1; break;
default: default:
C = 0;
std::cerr << "Invalid value in _chunk_hdr.entity_\n"; std::cerr << "Invalid value in _chunk_hdr.entity_\n";
assert( false ); assert( false );
break; break;