Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
OpenMesh
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
11
Issues
11
List
Boards
Labels
Service Desk
Milestones
Merge Requests
5
Merge Requests
5
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenMesh
OpenMesh
Commits
7c1a8012
Commit
7c1a8012
authored
May 29, 2019
by
Jan Möbius
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed more clang warnings
parent
417a4606
Pipeline
#10649
failed with stage
in 19 minutes and 18 seconds
Changes
11
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
19 additions
and
20 deletions
+19
-20
CI/ci-cppcheck.sh
CI/ci-cppcheck.sh
+1
-1
src/OpenMesh/Core/Utils/Property.hh
src/OpenMesh/Core/Utils/Property.hh
+2
-2
src/OpenMesh/Tools/Decimater/ModHausdorffT.hh
src/OpenMesh/Tools/Decimater/ModHausdorffT.hh
+1
-1
src/OpenMesh/Tools/Decimater/ModIndependentSetsT.hh
src/OpenMesh/Tools/Decimater/ModIndependentSetsT.hh
+1
-1
src/OpenMesh/Tools/Decimater/ModNormalDeviationT.hh
src/OpenMesh/Tools/Decimater/ModNormalDeviationT.hh
+1
-1
src/OpenMesh/Tools/Decimater/ModProgMeshT.hh
src/OpenMesh/Tools/Decimater/ModProgMeshT.hh
+1
-1
src/OpenMesh/Tools/Decimater/ModQuadricT.hh
src/OpenMesh/Tools/Decimater/ModQuadricT.hh
+1
-1
src/OpenMesh/Tools/Subdivider/Adaptive/Composite/RulesT.hh
src/OpenMesh/Tools/Subdivider/Adaptive/Composite/RulesT.hh
+9
-9
src/OpenMesh/Tools/Subdivider/Uniform/CatmullClarkT_impl.hh
src/OpenMesh/Tools/Subdivider/Uniform/CatmullClarkT_impl.hh
+0
-1
src/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeT.hh
...OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeT.hh
+1
-1
src/OpenMesh/Tools/Subdivider/Uniform/Sqrt3InterpolatingSubdividerLabsikGreinerT.hh
...der/Uniform/Sqrt3InterpolatingSubdividerLabsikGreinerT.hh
+1
-1
No files found.
CI/ci-cppcheck.sh
View file @
7c1a8012
...
...
@@ -30,7 +30,7 @@ echo "CPPCHECK Summary"
echo
"=============================================================================="
echo
-e
"
${
NC
}
"
MAX_COUNT
=
2
7
MAX_COUNT
=
2
6
if
[
$COUNT
-gt
$MAX_COUNT
]
;
then
echo
-e
${
WARNING
}
...
...
src/OpenMesh/Core/Utils/Property.hh
View file @
7c1a8012
...
...
@@ -363,7 +363,7 @@ public:
}
/// Make a copy of self.
PropertyT
<
bool
>*
clone
()
const
PropertyT
<
bool
>*
clone
()
const
override
{
PropertyT
<
bool
>*
p
=
new
PropertyT
<
bool
>
(
*
this
);
return
p
;
...
...
@@ -451,7 +451,7 @@ public:
return
((
value_type
*
)
&
data_
[
0
])[
_idx
];
}
PropertyT
<
value_type
>*
clone
()
const
{
PropertyT
<
value_type
>*
clone
()
const
override
{
PropertyT
<
value_type
>*
p
=
new
PropertyT
<
value_type
>
(
*
this
);
return
p
;
}
...
...
src/OpenMesh/Tools/Decimater/ModHausdorffT.hh
View file @
7c1a8012
...
...
@@ -123,7 +123,7 @@ class ModHausdorffT: public ModBaseT<MeshT> {
virtual
float
collapse_priority
(
const
CollapseInfo
&
_ci
);
/// re-distribute points
virtual
void
postprocess_collapse
(
const
CollapseInfo
&
_ci
);
virtual
void
postprocess_collapse
(
const
CollapseInfo
&
_ci
)
override
;
/// set the percentage of tolerance
void
set_error_tolerance_factor
(
double
_factor
);
...
...
src/OpenMesh/Tools/Decimater/ModIndependentSetsT.hh
View file @
7c1a8012
...
...
@@ -77,7 +77,7 @@ class ModIndependentSetsT: public ModBaseT<MeshT> {
}
/// override
void
postprocess_collapse
(
const
CollapseInfo
&
_ci
)
{
void
postprocess_collapse
(
const
CollapseInfo
&
_ci
)
override
{
typename
Mesh
::
VertexVertexIter
vv_it
;
Base
::
mesh
().
status
(
_ci
.
v1
).
set_locked
(
true
);
...
...
src/OpenMesh/Tools/Decimater/ModNormalDeviationT.hh
View file @
7c1a8012
...
...
@@ -216,7 +216,7 @@ public:
}
void
postprocess_collapse
(
const
CollapseInfo
&
_ci
)
{
void
postprocess_collapse
(
const
CollapseInfo
&
_ci
)
override
{
// account for changed normals
typename
Mesh
::
VertexFaceIter
vf_it
(
mesh_
,
_ci
.
v1
);
for
(;
vf_it
.
is_valid
();
++
vf_it
)
...
...
src/OpenMesh/Tools/Decimater/ModProgMeshT.hh
View file @
7c1a8012
...
...
@@ -130,7 +130,7 @@ public: // inherited
/// Stores collapse information in a queue.
/// \see infolist()
void
postprocess_collapse
(
const
CollapseInfo
&
_ci
)
void
postprocess_collapse
(
const
CollapseInfo
&
_ci
)
override
{
pmi_
.
push_back
(
Info
(
_ci
)
);
}
...
...
src/OpenMesh/Tools/Decimater/ModQuadricT.hh
View file @
7c1a8012
...
...
@@ -131,7 +131,7 @@ public: // inherited
/// Post-process halfedge collapse (accumulate quadrics)
virtual
void
postprocess_collapse
(
const
CollapseInfo
&
_ci
)
virtual
void
postprocess_collapse
(
const
CollapseInfo
&
_ci
)
override
{
Base
::
mesh
().
property
(
quadrics_
,
_ci
.
v1
)
+=
Base
::
mesh
().
property
(
quadrics_
,
_ci
.
v0
);
...
...
src/OpenMesh/Tools/Subdivider/Adaptive/Composite/RulesT.hh
View file @
7c1a8012
...
...
@@ -101,8 +101,8 @@ public:
explicit
Tvv3
(
M
&
_mesh
)
:
Inherited
(
_mesh
)
{
Base
::
set_subdiv_type
(
3
);
};
void
raise
(
typename
M
::
FaceHandle
&
_fh
,
state_t
_target_state
);
void
raise
(
typename
M
::
VertexHandle
&
_vh
,
state_t
_target_state
);
void
raise
(
typename
M
::
FaceHandle
&
_fh
,
state_t
_target_state
)
override
;
void
raise
(
typename
M
::
VertexHandle
&
_vh
,
state_t
_target_state
)
override
;
MIPS_WARN_WA
(
Edge
)
// avoid warning
};
...
...
@@ -126,9 +126,9 @@ public:
explicit
Tvv4
(
M
&
_mesh
)
:
Inherited
(
_mesh
)
{
Base
::
set_subdiv_type
(
4
);
};
void
raise
(
typename
M
::
FaceHandle
&
_fh
,
state_t
_target_state
)
;
void
raise
(
typename
M
::
VertexHandle
&
_vh
,
state_t
_target_state
);
void
raise
(
typename
M
::
EdgeHandle
&
_eh
,
state_t
_target_state
);
void
raise
(
typename
M
::
FaceHandle
&
_fh
,
state_t
_target_state
)
override
;
void
raise
(
typename
M
::
VertexHandle
&
_vh
,
state_t
_target_state
)
override
;
void
raise
(
typename
M
::
EdgeHandle
&
_eh
,
state_t
_target_state
)
override
;
private:
...
...
@@ -154,7 +154,7 @@ public:
explicit
VF
(
M
&
_mesh
)
:
Inherited
(
_mesh
)
{}
void
raise
(
typename
M
::
FaceHandle
&
_fh
,
state_t
_target_state
);
void
raise
(
typename
M
::
FaceHandle
&
_fh
,
state_t
_target_state
)
override
;
MIPS_WARN_WA
(
Edge
)
MIPS_WARN_WA
(
Vertex
)
};
...
...
@@ -176,7 +176,7 @@ public:
explicit
FF
(
M
&
_mesh
)
:
Inherited
(
_mesh
)
{}
void
raise
(
typename
M
::
FaceHandle
&
_fh
,
state_t
_target_state
);
void
raise
(
typename
M
::
FaceHandle
&
_fh
,
state_t
_target_state
)
override
;
MIPS_WARN_WA
(
Vertex
)
// avoid warning
MIPS_WARN_WA
(
Edge
)
// avoid warning
};
...
...
@@ -198,7 +198,7 @@ public:
explicit
FFc
(
M
&
_mesh
)
:
Inherited
(
_mesh
)
{}
void
raise
(
typename
M
::
FaceHandle
&
_fh
,
state_t
_target_state
);
void
raise
(
typename
M
::
FaceHandle
&
_fh
,
state_t
_target_state
)
override
;
MIPS_WARN_WA
(
Vertex
)
// avoid warning
MIPS_WARN_WA
(
Edge
)
// avoid warning
};
...
...
@@ -220,7 +220,7 @@ public:
explicit
FV
(
M
&
_mesh
)
:
Inherited
(
_mesh
)
{}
void
raise
(
typename
M
::
VertexHandle
&
_vh
,
state_t
_target_state
);
void
raise
(
typename
M
::
VertexHandle
&
_vh
,
state_t
_target_state
)
override
;
MIPS_WARN_WA
(
Face
)
// avoid warning
MIPS_WARN_WA
(
Edge
)
// avoid warning
};
...
...
src/OpenMesh/Tools/Subdivider/Uniform/CatmullClarkT_impl.hh
View file @
7c1a8012
...
...
@@ -333,7 +333,6 @@ CatmullClarkT<MeshType,RealType>::update_vertex( MeshType& _m, const VertexHandl
// and http://www.cs.utah.edu/~lacewell/subdeval
if
(
_m
.
is_boundary
(
_vh
))
{
Normal
Vec
;
pos
=
_m
.
point
(
_vh
);
VertexEdgeIter
ve_itr
;
for
(
ve_itr
=
_m
.
ve_iter
(
_vh
);
ve_itr
.
is_valid
();
++
ve_itr
)
...
...
src/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeT.hh
View file @
7c1a8012
...
...
@@ -122,7 +122,7 @@ protected: // inherited interface
}
#ifdef NDEBUG
bool
cleanup
(
MeshType
&
)
bool
cleanup
(
MeshType
&
)
override
#else
bool
cleanup
(
MeshType
&
_m
)
override
#endif
...
...
src/OpenMesh/Tools/Subdivider/Uniform/Sqrt3InterpolatingSubdividerLabsikGreinerT.hh
View file @
7c1a8012
...
...
@@ -409,7 +409,7 @@ private:
typename
MeshType
::
HalfedgeHandle
heh
;
typename
MeshType
::
VertexHandle
vh1
,
vh2
,
vh3
,
vh4
,
vhl
,
vhr
;
typename
MeshType
::
Point
zero
(
0
,
0
,
0
),
P1
,
P2
,
P3
,
P4
;
typename
MeshType
::
Point
P1
,
P2
,
P3
,
P4
;
/*
// *---------*---------*
...
...
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