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
OpenVolumeMesh
OpenVolumeMesh
Commits
fb81bf64
Commit
fb81bf64
authored
Aug 20, 2019
by
Martin Heistermann
Browse files
fix some signedness mismatches when indexing vectors with handle indexes
parent
8d3434ba
Pipeline
#11829
passed with stage
in 4 minutes and 1 second
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/OpenVolumeMesh/Core/TopologyKernel.hh
View file @
fb81bf64
...
...
@@ -675,7 +675,7 @@ public:
assert
(
has_vertex_bottom_up_incidences
());
assert
(
_vh
.
is_valid
()
&&
_vh
.
uidx
()
<
outgoing_hes_per_vertex_
.
size
());
return
outgoing_hes_per_vertex_
[
_vh
.
idx
()].
size
();
return
outgoing_hes_per_vertex_
[
_vh
.
u
idx
()].
size
();
}
/// Get valence of edge (number of incident faces)
...
...
@@ -684,7 +684,7 @@ public:
assert
(
_eh
.
is_valid
()
&&
_eh
.
uidx
()
<
edges_
.
size
());
assert
(
halfedge_handle
(
_eh
,
0
).
uidx
()
<
incident_hfs_per_he_
.
size
());
return
incident_hfs_per_he_
[
halfedge_handle
(
_eh
,
0
).
idx
()].
size
();
return
incident_hfs_per_he_
[
halfedge_handle
(
_eh
,
0
).
u
idx
()].
size
();
}
/// Get valence of face (number of incident edges)
...
...
@@ -718,12 +718,12 @@ public:
virtual
void
collect_garbage
();
virtual
bool
is_deleted
(
const
VertexHandle
&
_h
)
const
{
return
vertex_deleted_
[
_h
.
idx
()];
}
virtual
bool
is_deleted
(
const
EdgeHandle
&
_h
)
const
{
return
edge_deleted_
[
_h
.
idx
()];
}
virtual
bool
is_deleted
(
const
HalfEdgeHandle
&
_h
)
const
{
return
edge_deleted_
[
_h
.
idx
()
/
2
];
}
virtual
bool
is_deleted
(
const
FaceHandle
&
_h
)
const
{
return
face_deleted_
[
_h
.
idx
()];
}
virtual
bool
is_deleted
(
const
HalfFaceHandle
&
_h
)
const
{
return
face_deleted_
[
_h
.
idx
()
/
2
];
}
virtual
bool
is_deleted
(
const
CellHandle
&
_h
)
const
{
return
cell_deleted_
[
_h
.
idx
()];
}
virtual
bool
is_deleted
(
const
VertexHandle
&
_h
)
const
{
return
vertex_deleted_
[
_h
.
u
idx
()];
}
virtual
bool
is_deleted
(
const
EdgeHandle
&
_h
)
const
{
return
edge_deleted_
[
_h
.
u
idx
()];
}
virtual
bool
is_deleted
(
const
HalfEdgeHandle
&
_h
)
const
{
return
edge_deleted_
[
_h
.
u
idx
()
/
2
];
}
virtual
bool
is_deleted
(
const
FaceHandle
&
_h
)
const
{
return
face_deleted_
[
_h
.
u
idx
()];
}
virtual
bool
is_deleted
(
const
HalfFaceHandle
&
_h
)
const
{
return
face_deleted_
[
_h
.
u
idx
()
/
2
];
}
virtual
bool
is_deleted
(
const
CellHandle
&
_h
)
const
{
return
cell_deleted_
[
_h
.
u
idx
()];
}
private:
...
...
@@ -774,8 +774,8 @@ protected:
newIndices_
(
_newIndices
)
{}
void
operator
()(
Edge
&
_edge
)
{
_edge
.
set_from_vertex
(
VertexHandle
(
newIndices_
[
_edge
.
from_vertex
().
idx
()]));
_edge
.
set_to_vertex
(
VertexHandle
(
newIndices_
[
_edge
.
to_vertex
().
idx
()]));
_edge
.
set_from_vertex
(
VertexHandle
(
newIndices_
[
_edge
.
from_vertex
().
u
idx
()]));
_edge
.
set_to_vertex
(
VertexHandle
(
newIndices_
[
_edge
.
to_vertex
().
u
idx
()]));
}
private:
const
std
::
vector
<
int
>&
newIndices_
;
...
...
@@ -793,7 +793,7 @@ protected:
EdgeHandle
eh
=
edge_handle
(
*
he_it
);
unsigned
char
opp
=
he_it
->
idx
()
==
halfedge_handle
(
eh
,
1
).
idx
();
*
he_it
=
halfedge_handle
(
EdgeHandle
(
newIndices_
[
eh
.
idx
()]),
opp
);
*
he_it
=
halfedge_handle
(
EdgeHandle
(
newIndices_
[
eh
.
u
idx
()]),
opp
);
}
_face
.
set_halfedges
(
hes
);
}
...
...
@@ -813,7 +813,7 @@ protected:
FaceHandle
fh
=
face_handle
(
*
hf_it
);
unsigned
char
opp
=
hf_it
->
idx
()
==
halfface_handle
(
fh
,
1
).
idx
();
*
hf_it
=
halfface_handle
(
FaceHandle
(
newIndices_
[
fh
.
idx
()]),
opp
);
*
hf_it
=
halfface_handle
(
FaceHandle
(
newIndices_
[
fh
.
u
idx
()]),
opp
);
}
_cell
.
set_halffaces
(
hfs
);
}
...
...
@@ -1034,7 +1034,7 @@ public:
assert
(
_halfFaceHandle
.
is_valid
()
&&
_halfFaceHandle
.
uidx
()
<
faces_
.
size
()
*
2u
);
assert
(
has_face_bottom_up_incidences
());
assert
(
_halfFaceHandle
.
uidx
()
<
incident_cell_per_hf_
.
size
());
return
incident_cell_per_hf_
[
_halfFaceHandle
.
idx
()]
==
InvalidCellHandle
;
return
incident_cell_per_hf_
[
_halfFaceHandle
.
u
idx
()]
==
InvalidCellHandle
;
}
bool
is_boundary
(
const
FaceHandle
&
_faceHandle
)
const
{
...
...
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