Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
OpenMesh
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
11
Issues
11
List
Boards
Labels
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenMesh
OpenMesh
Commits
958b7a1c
Commit
958b7a1c
authored
Jan 26, 2018
by
Jan Möbius
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'implicit_fallthrough' into 'master'
Fix implicit fallthrough warning on gcc See merge request
!152
parents
59b1daa4
d1088ae2
Pipeline
#6093
passed with stage
in 72 minutes and 22 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
+5
-4
Doc/changelog.docu
Doc/changelog.docu
+1
-0
src/OpenMesh/Core/IO/OMFormat.hh
src/OpenMesh/Core/IO/OMFormat.hh
+4
-4
No files found.
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
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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