Skip to content
GitLab
Menu
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
aec2fa24
Commit
aec2fa24
authored
Nov 07, 2016
by
Jan Möbius
Browse files
Merge branch 'warnings' of
https://www.graphics.rwth-aachen.de:9000/OpenMesh/OpenMesh
into warnings
parents
74ada2ea
d966d44a
Pipeline
#3524
failed with stage
in 8 minutes and 1 second
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/OpenMesh/Tools/Subdivider/Adaptive/Composite/RulesT.cc
View file @
aec2fa24
...
...
@@ -650,7 +650,7 @@ Tvv4<M>::raise(typename M::VertexHandle& _vh, state_t _target_state)
this
->
update
(
_vh
,
_target_state
);
// multiply old position by 4
MOBJ
(
_vh
).
set_position
(
_target_state
,
MOBJ
(
_vh
).
position
(
_target_state
-
1
)
*
4.0
);
MOBJ
(
_vh
).
set_position
(
_target_state
,
MOBJ
(
_vh
).
position
(
_target_state
-
1
)
*
static_cast
<
typename
M
::
Point
::
value_type
>
(
4.0
)
)
;
MOBJ
(
_vh
).
inc_state
();
}
...
...
src/Unittests/unittests_trimesh_circulator_current_halfedge_handle_replacement.cc
View file @
aec2fa24
...
...
@@ -328,7 +328,7 @@ TEST_F(OpenMeshTrimeshCirculatorCurrentHalfedgeHandleReplacement, vf_iter_bounda
* \ /
* 5
*/
size_
t
current_halfedge_handles
[
9
]
=
{
in
t
current_halfedge_handles
[
9
]
=
{
0
,
2
,
12
,
4
,
6
,
8
,
16
,
10
,
14
};
std
::
vector
<
Mesh
::
FaceHandle
>
fh0
;
...
...
src/Unittests/unittests_trimesh_others.cc
View file @
aec2fa24
...
...
@@ -164,7 +164,7 @@ TEST_F(OpenMeshOthers, CalcDihedralAngre ) {
EXPECT_EQ
(
0.0
,
mesh_
.
calc_dihedral_angle
(
eh
)
)
<<
"Wrong Dihedral angle!"
<<
std
::
endl
;
// Modify point
Mesh
::
Point
tmp
=
(
Mesh
::
Point
(
0.0
,
0.0
,
-
1.0
)
+
Mesh
::
Point
(
1.0
,
1.0
,
-
1.0
)
)
*
0.5
;
Mesh
::
Point
tmp
=
(
Mesh
::
Point
(
0.0
,
0.0
,
-
1.0
)
+
Mesh
::
Point
(
1.0
,
1.0
,
-
1.0
)
)
*
static_cast
<
typename
Mesh
::
Point
::
value_type
>
(
0.5
)
;
mesh_
.
point
(
vhandle
[
2
])
=
tmp
;
double
difference
=
fabs
(
1.36944
-
mesh_
.
calc_dihedral_angle
(
eh
)
);
...
...
src/Unittests/unittests_tutorials.cc
View file @
aec2fa24
...
...
@@ -57,7 +57,7 @@ struct MyData
bool
operator
!=
(
const
MyData
&
_rhs
)
const
{
return
!
(
*
this
==
_rhs
);
}
};
typedef
std
::
map
<
std
::
string
,
unsigned
in
t
>
MyMap
;
typedef
std
::
map
<
std
::
string
,
size_
t
>
MyMap
;
namespace
OpenMesh
{
namespace
IO
{
...
...
@@ -114,7 +114,7 @@ namespace OpenMesh {
return
sizeof
(
unsigned
int
);
value_type
::
const_iterator
it
=
_v
.
begin
();
unsigned
in
t
N
=
_v
.
size
();
size_
t
N
=
_v
.
size
();
size_t
bytes
=
IO
::
size_of
(
N
);
for
(;
it
!=
_v
.
end
();
++
it
)
{
...
...
@@ -128,7 +128,7 @@ namespace OpenMesh {
size_t
store
(
std
::
ostream
&
_os
,
const
value_type
&
_v
,
bool
_swap
=
false
)
{
size_t
bytes
=
0
;
unsigned
in
t
N
=
_v
.
size
();
size_
t
N
=
_v
.
size
();
value_type
::
const_iterator
it
=
_v
.
begin
();
bytes
+=
IO
::
store
(
_os
,
N
,
_swap
);
for
(;
it
!=
_v
.
end
()
&&
_os
.
good
();
++
it
)
...
...
Write
Preview
Supports
Markdown
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