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
13
Issues
13
List
Boards
Labels
Service Desk
Milestones
Merge Requests
4
Merge Requests
4
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
76e33791
Commit
76e33791
authored
Apr 05, 2018
by
Jan Möbius
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed some cppcheck warnings
parent
bd3ec6a9
Pipeline
#6732
passed with stage
in 85 minutes and 29 seconds
Changes
15
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
28 additions
and
32 deletions
+28
-32
Doc/Tutorial/04-stl_algorithms/smooth_algo.hh
Doc/Tutorial/04-stl_algorithms/smooth_algo.hh
+1
-1
src/OpenMesh/Apps/Decimating/CmdOption.hh
src/OpenMesh/Apps/Decimating/CmdOption.hh
+1
-1
src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.hh
src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.hh
+1
-1
src/OpenMesh/Apps/QtViewer/MeshViewerWidget.hh
src/OpenMesh/Apps/QtViewer/MeshViewerWidget.hh
+1
-1
src/OpenMesh/Apps/Unsupported/Streaming-qt4/Client/VDPMClientViewerWidget.cc
...nsupported/Streaming-qt4/Client/VDPMClientViewerWidget.cc
+4
-6
src/OpenMesh/Apps/Unsupported/Streaming/Client/VDPMClientViewerWidget.cc
...ps/Unsupported/Streaming/Client/VDPMClientViewerWidget.cc
+4
-6
src/OpenMesh/Core/IO/reader/PLYReader.cc
src/OpenMesh/Core/IO/reader/PLYReader.cc
+1
-1
src/OpenMesh/Core/IO/reader/STLReader.cc
src/OpenMesh/Core/IO/reader/STLReader.cc
+1
-1
src/OpenMesh/Core/IO/writer/OMWriter.cc
src/OpenMesh/Core/IO/writer/OMWriter.cc
+1
-1
src/OpenMesh/Core/IO/writer/STLWriter.cc
src/OpenMesh/Core/IO/writer/STLWriter.cc
+8
-8
src/OpenMesh/Examples/Tutorial04/smooth_algo.hh
src/OpenMesh/Examples/Tutorial04/smooth_algo.hh
+1
-1
src/Unittests/unittests_decimater.cc
src/Unittests/unittests_decimater.cc
+1
-1
src/Unittests/unittests_mc_decimater.cc
src/Unittests/unittests_mc_decimater.cc
+1
-1
src/Unittests/unittests_mixed_decimater.cc
src/Unittests/unittests_mixed_decimater.cc
+1
-1
src/Unittests/unittests_tutorials.cc
src/Unittests/unittests_tutorials.cc
+1
-1
No files found.
Doc/Tutorial/04-stl_algorithms/smooth_algo.hh
View file @
76e33791
...
...
@@ -13,7 +13,7 @@ public:
public:
// construct with a given mesh
SmootherT
(
Mesh
&
_mesh
)
explicit
SmootherT
(
Mesh
&
_mesh
)
:
mesh_
(
_mesh
)
{
mesh_
.
add_property
(
cog_
);
...
...
src/OpenMesh/Apps/Decimating/CmdOption.hh
View file @
76e33791
...
...
@@ -56,7 +56,7 @@ public:
typedef
T
value_type
;
CmdOption
(
const
T
&
_val
)
:
val_
(
_val
),
valid_
(
true
),
enabled_
(
false
)
{
}
explicit
CmdOption
(
const
T
&
_val
)
:
val_
(
_val
),
valid_
(
true
),
enabled_
(
false
)
{
}
CmdOption
()
:
val_
(
T
()),
valid_
(
false
),
enabled_
(
false
)
{
}
// has been set and has a value
...
...
src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.hh
View file @
76e33791
...
...
@@ -123,7 +123,7 @@ public:
/// default constructor
DecimaterViewerWidget
(
QWidget
*
_parent
=
0
)
explicit
DecimaterViewerWidget
(
QWidget
*
_parent
=
0
)
:
MeshViewerWidget
(
_parent
),
animate_
(
false
),
timer_
(
0
),
...
...
src/OpenMesh/Apps/QtViewer/MeshViewerWidget.hh
View file @
76e33791
...
...
@@ -82,7 +82,7 @@ class MeshViewerWidget : public MeshViewerWidgetT<MyMesh>
Q_OBJECT
public:
/// default constructor
MeshViewerWidget
(
QWidget
*
parent
=
0
)
:
MeshViewerWidgetT
<
MyMesh
>
(
parent
)
explicit
MeshViewerWidget
(
QWidget
*
parent
=
0
)
:
MeshViewerWidgetT
<
MyMesh
>
(
parent
)
{}
OpenMesh
::
IO
::
Options
&
options
()
{
return
_options
;
}
const
OpenMesh
::
IO
::
Options
&
options
()
const
{
return
_options
;
}
...
...
src/OpenMesh/Apps/Unsupported/Streaming-qt4/Client/VDPMClientViewerWidget.cc
View file @
76e33791
...
...
@@ -139,17 +139,15 @@ void VDPMClientViewerWidget::mesh_coloring()
vEnd
(
mesh_
.
vertices_end
());
VHierarchyNodeHandle
node_handle
;
float
ratio
;
unsigned
char
r
,
g
,
b
;
for
(;
vIt
!=
vEnd
;
++
vIt
)
{
node_handle
=
mesh_
.
data
(
*
vIt
).
vhierarchy_node_handle
();
ratio
=
vhierarchy_
.
node
(
node_handle
).
ratio
();
const
float
ratio
=
vhierarchy_
.
node
(
node_handle
).
ratio
();
r
=
(
unsigned
char
)
((
1.0
f
-
ratio
)
*
myYellow
[
0
]
+
ratio
*
myBlue
[
0
]);
g
=
(
unsigned
char
)
((
1.0
f
-
ratio
)
*
myYellow
[
1
]
+
ratio
*
myBlue
[
1
]);
b
=
(
unsigned
char
)
((
1.0
f
-
ratio
)
*
myYellow
[
2
]
+
ratio
*
myBlue
[
2
]);
const
unsigned
char
r
=
(
unsigned
char
)
((
1.0
f
-
ratio
)
*
myYellow
[
0
]
+
ratio
*
myBlue
[
0
]);
const
unsigned
char
g
=
(
unsigned
char
)
((
1.0
f
-
ratio
)
*
myYellow
[
1
]
+
ratio
*
myBlue
[
1
]);
const
unsigned
char
b
=
(
unsigned
char
)
((
1.0
f
-
ratio
)
*
myYellow
[
2
]
+
ratio
*
myBlue
[
2
]);
mesh_
.
set_color
(
*
vIt
,
OpenMesh
::
Vec3uc
(
r
,
g
,
b
));
}
...
...
src/OpenMesh/Apps/Unsupported/Streaming/Client/VDPMClientViewerWidget.cc
View file @
76e33791
...
...
@@ -138,17 +138,15 @@ void VDPMClientViewerWidget::mesh_coloring()
vEnd
(
mesh_
.
vertices_end
());
VHierarchyNodeHandle
node_handle
;
float
ratio
;
unsigned
char
r
,
g
,
b
;
for
(;
vIt
!=
vEnd
;
++
vIt
)
{
node_handle
=
mesh_
.
data
(
*
vIt
).
vhierarchy_node_handle
();
ratio
=
vhierarchy_
.
node
(
node_handle
).
ratio
();
const
float
ratio
=
vhierarchy_
.
node
(
node_handle
).
ratio
();
r
=
(
unsigned
char
)
((
1.0
f
-
ratio
)
*
myYellow
[
0
]
+
ratio
*
myBlue
[
0
]);
g
=
(
unsigned
char
)
((
1.0
f
-
ratio
)
*
myYellow
[
1
]
+
ratio
*
myBlue
[
1
]);
b
=
(
unsigned
char
)
((
1.0
f
-
ratio
)
*
myYellow
[
2
]
+
ratio
*
myBlue
[
2
]);
const
unsigned
char
r
=
(
unsigned
char
)
((
1.0
f
-
ratio
)
*
myYellow
[
0
]
+
ratio
*
myBlue
[
0
]);
const
unsigned
char
g
=
(
unsigned
char
)
((
1.0
f
-
ratio
)
*
myYellow
[
1
]
+
ratio
*
myBlue
[
1
]);
const
unsigned
char
b
=
(
unsigned
char
)
((
1.0
f
-
ratio
)
*
myYellow
[
2
]
+
ratio
*
myBlue
[
2
]);
mesh_
.
set_color
(
*
vIt
,
OpenMesh
::
Vec3uc
(
r
,
g
,
b
));
}
...
...
src/OpenMesh/Core/IO/reader/PLYReader.cc
View file @
76e33791
...
...
@@ -1062,7 +1062,7 @@ std::string get_property_name(std::string _string1, std::string _string2) {
//-----------------------------------------------------------------------------
_PLYReader_
::
ValueType
get_property_type
(
std
::
string
_string1
,
std
::
string
_string2
)
{
_PLYReader_
::
ValueType
get_property_type
(
std
::
string
&
_string1
,
std
::
string
&
_string2
)
{
if
(
_string1
==
"float32"
||
_string2
==
"float32"
)
...
...
src/OpenMesh/Core/IO/reader/STLReader.cc
View file @
76e33791
...
...
@@ -176,7 +176,7 @@ class CmpVec
{
public:
CmpVec
(
float
_eps
=
FLT_MIN
)
:
eps_
(
_eps
)
{}
explicit
CmpVec
(
float
_eps
=
FLT_MIN
)
:
eps_
(
_eps
)
{}
bool
operator
()(
const
Vec3f
&
_v0
,
const
Vec3f
&
_v1
)
const
{
...
...
src/OpenMesh/Core/IO/writer/OMWriter.cc
View file @
76e33791
...
...
@@ -163,7 +163,7 @@ _OMWriter_::write(std::ostream& _os, BaseExporter& _be, Options _opt, std::strea
#ifndef DOXY_IGNORE_THIS
template
<
typename
T
>
struct
Enabler
{
Enabler
(
T
&
obj
)
:
obj_
(
obj
)
explicit
Enabler
(
T
&
obj
)
:
obj_
(
obj
)
{}
~
Enabler
()
{
obj_
.
enable
();
}
...
...
src/OpenMesh/Core/IO/writer/STLWriter.cc
View file @
76e33791
...
...
@@ -158,7 +158,7 @@ write_stla(const std::string& _filename, BaseExporter& _be, Options /* _opt */)
int
i
,
nF
(
int
(
_be
.
n_faces
()))
,
nV
;
int
i
,
nF
(
int
(
_be
.
n_faces
()));
Vec3f
a
,
b
,
c
,
n
;
std
::
vector
<
VertexHandle
>
vhandles
;
FaceHandle
fh
;
...
...
@@ -172,7 +172,7 @@ write_stla(const std::string& _filename, BaseExporter& _be, Options /* _opt */)
for
(
i
=
0
;
i
<
nF
;
++
i
)
{
fh
=
FaceHandle
(
i
);
nV
=
_be
.
get_vhandles
(
fh
,
vhandles
);
const
int
nV
=
_be
.
get_vhandles
(
fh
,
vhandles
);
if
(
nV
==
3
)
{
...
...
@@ -211,7 +211,7 @@ write_stla(std::ostream& _out, BaseExporter& _be, Options /* _opt */, std::strea
{
omlog
()
<<
"[STLWriter] : write ascii file
\n
"
;
int
i
,
nF
(
int
(
_be
.
n_faces
()))
,
nV
;
int
i
,
nF
(
int
(
_be
.
n_faces
()));
Vec3f
a
,
b
,
c
,
n
;
std
::
vector
<
VertexHandle
>
vhandles
;
FaceHandle
fh
;
...
...
@@ -226,7 +226,7 @@ write_stla(std::ostream& _out, BaseExporter& _be, Options /* _opt */, std::strea
for
(
i
=
0
;
i
<
nF
;
++
i
)
{
fh
=
FaceHandle
(
i
);
nV
=
_be
.
get_vhandles
(
fh
,
vhandles
);
const
int
nV
=
_be
.
get_vhandles
(
fh
,
vhandles
);
if
(
nV
==
3
)
{
...
...
@@ -273,7 +273,7 @@ write_stlb(const std::string& _filename, BaseExporter& _be, Options /* _opt */)
}
int
i
,
nF
(
int
(
_be
.
n_faces
()))
,
nV
;
int
i
,
nF
(
int
(
_be
.
n_faces
()));
Vec3f
a
,
b
,
c
,
n
;
std
::
vector
<
VertexHandle
>
vhandles
;
FaceHandle
fh
;
...
...
@@ -294,7 +294,7 @@ write_stlb(const std::string& _filename, BaseExporter& _be, Options /* _opt */)
for
(
i
=
0
;
i
<
nF
;
++
i
)
{
fh
=
FaceHandle
(
i
);
nV
=
_be
.
get_vhandles
(
fh
,
vhandles
);
const
int
nV
=
_be
.
get_vhandles
(
fh
,
vhandles
);
if
(
nV
==
3
)
{
...
...
@@ -344,7 +344,7 @@ write_stlb(std::ostream& _out, BaseExporter& _be, Options /* _opt */, std::strea
omlog
()
<<
"[STLWriter] : write binary file
\n
"
;
int
i
,
nF
(
int
(
_be
.
n_faces
()))
,
nV
;
int
i
,
nF
(
int
(
_be
.
n_faces
()));
Vec3f
a
,
b
,
c
,
n
;
std
::
vector
<
VertexHandle
>
vhandles
;
FaceHandle
fh
;
...
...
@@ -366,7 +366,7 @@ write_stlb(std::ostream& _out, BaseExporter& _be, Options /* _opt */, std::strea
for
(
i
=
0
;
i
<
nF
;
++
i
)
{
fh
=
FaceHandle
(
i
);
nV
=
_be
.
get_vhandles
(
fh
,
vhandles
);
const
int
nV
=
_be
.
get_vhandles
(
fh
,
vhandles
);
if
(
nV
==
3
)
{
...
...
src/OpenMesh/Examples/Tutorial04/smooth_algo.hh
View file @
76e33791
...
...
@@ -13,7 +13,7 @@ public:
public:
// construct with a given mesh
SmootherT
(
Mesh
&
_mesh
)
explicit
SmootherT
(
Mesh
&
_mesh
)
:
mesh_
(
_mesh
)
{
mesh_
.
add_property
(
cog_
);
...
...
src/Unittests/unittests_decimater.cc
View file @
76e33791
...
...
@@ -134,7 +134,7 @@ class UnittestObserver : public OpenMesh::Decimater::Observer
size_t
notifies_
;
size_t
all_steps_
;
public:
UnittestObserver
(
size_t
_steps
)
:
Observer
(
_steps
),
notifies_
(
0
),
all_steps_
(
0
)
{}
explicit
UnittestObserver
(
size_t
_steps
)
:
Observer
(
_steps
),
notifies_
(
0
),
all_steps_
(
0
)
{}
void
notify
(
size_t
_step
)
{
...
...
src/Unittests/unittests_mc_decimater.cc
View file @
76e33791
...
...
@@ -112,7 +112,7 @@ class UnittestObserver : public OpenMesh::Decimater::Observer
size_t
notifies_
;
size_t
all_steps_
;
public:
UnittestObserver
(
size_t
_steps
)
:
Observer
(
_steps
),
notifies_
(
0
),
all_steps_
(
0
)
{}
explicit
UnittestObserver
(
size_t
_steps
)
:
Observer
(
_steps
),
notifies_
(
0
),
all_steps_
(
0
)
{}
void
notify
(
size_t
_step
)
{
...
...
src/Unittests/unittests_mixed_decimater.cc
View file @
76e33791
...
...
@@ -112,7 +112,7 @@ class UnittestObserver : public OpenMesh::Decimater::Observer
size_t
notifies_
;
size_t
all_steps_
;
public:
UnittestObserver
(
size_t
_steps
)
:
Observer
(
_steps
),
notifies_
(
0
),
all_steps_
(
0
)
{}
explicit
UnittestObserver
(
size_t
_steps
)
:
Observer
(
_steps
),
notifies_
(
0
),
all_steps_
(
0
)
{}
void
notify
(
size_t
_step
)
{
...
...
src/Unittests/unittests_tutorials.cc
View file @
76e33791
...
...
@@ -197,7 +197,7 @@ public:
public:
// construct with a given mesh
SmootherT
(
Mesh
&
_mesh
)
explicit
SmootherT
(
Mesh
&
_mesh
)
:
mesh_
(
_mesh
)
{
mesh_
.
add_property
(
cog_
);
...
...
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