Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
OpenMesh
OpenMesh
Commits
958b7a1c
Commit
958b7a1c
authored
Jan 26, 2018
by
Jan Möbius
Browse files
Merge branch 'implicit_fallthrough' into 'master'
Fix implicit fallthrough warning on gcc See merge request
!152
parents
59b1daa4
d1088ae2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Doc/changelog.docu
View file @
958b7a1c
...
...
@@ -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>PLY Reader: Skip reading extra elements after face</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>
<b>Unittests</b>
...
...
src/OpenMesh/Core/IO/OMFormat.hh
View file @
958b7a1c
...
...
@@ -315,16 +315,16 @@ namespace OMFormat {
/// Return the size of chunk data in bytes
inline
size_t
chunk_data_size
(
Header
&
_hdr
,
Chunk
::
Header
&
_chunk_hdr
)
{
size_t
C
=
0
;
size_t
C
;
switch
(
_chunk_hdr
.
entity_
)
{
case
Chunk
::
Entity_Vertex
:
C
=
_hdr
.
n_vertices_
;
break
;
case
Chunk
::
Entity_Face
:
C
=
_hdr
.
n_faces_
;
break
;
case
Chunk
::
Entity_Halfedge
:
C
=
_hdr
.
n_edges_
;
// no
break
!
case
Chunk
::
Entity_Edge
:
C
+
=
_hdr
.
n_edges_
;
break
;
case
Chunk
::
Entity_Halfedge
:
C
=
_hdr
.
n_edges_
*
2
;
break
;
case
Chunk
::
Entity_Edge
:
C
=
_hdr
.
n_edges_
;
break
;
case
Chunk
::
Entity_Mesh
:
C
=
1
;
break
;
default:
C
=
0
;
std
::
cerr
<<
"Invalid value in _chunk_hdr.entity_
\n
"
;
assert
(
false
);
break
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment