songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

removed cross filtering kernel

This commit is contained in:
Sven Oesau 2015-07-06 16:19:11 +02:00 committed by Sébastien Loriot
parent 81033fd37d
commit 44a01d3b4c
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Cone.h
View File

@ -201,8 +201,6 @@ namespace CGAL {
m_neg_sin_ang = -sin(m_angle); m_neg_sin_ang = -sin(m_angle);
m_cos_ang = cos(m_angle); m_cos_ang = cos(m_angle);
this->m_cross_mask = (m_angle <= M_PI_4);
this->m_is_valid = true; this->m_is_valid = true;
} }

8
Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Shape_base.h
View File

@ -93,8 +93,7 @@ namespace CGAL {
m_score(0), m_score(0),
m_sum_expected_value(0), m_sum_expected_value(0),
m_nb_subset_used(0), m_nb_subset_used(0),
m_has_connected_component(false), m_has_connected_component(false) {
m_cross_mask(false) {
} }
virtual ~Shape_base() {} virtual ~Shape_base() {}
@ -180,8 +179,8 @@ namespace CGAL {
continue; continue;
unsigned int w = (x > 0) ? bitmap[y * u_extent + x - 1] : 0; unsigned int w = (x > 0) ? bitmap[y * u_extent + x - 1] : 0;
unsigned int n = (y > 0) ? bitmap[(y - 1) * u_extent + x] : 0; unsigned int n = (y > 0) ? bitmap[(y - 1) * u_extent + x] : 0;
unsigned int nw = (m_cross_mask) ? 0 : ((x > 0 && y > 0) ? bitmap[(y - 1) * u_extent + x - 1] : 0); unsigned int nw = (x > 0 && y > 0) ? bitmap[(y - 1) * u_extent + x - 1];
unsigned int ne = (m_cross_mask) ? 0 : (((x + 1 < u_extent) && y > 0) ? bitmap[(y - 1) * u_extent + x + 1] : 0); unsigned int ne = ((x + 1 < u_extent) && y > 0) ? bitmap[(y - 1) * u_extent + x + 1];
// Find smallest set label; // Find smallest set label;
unsigned int curLabel = map.size(); unsigned int curLabel = map.size();
@ -597,7 +596,6 @@ namespace CGAL {
//and thus indicate the next one to use //and thus indicate the next one to use
std::size_t m_nb_subset_used; std::size_t m_nb_subset_used;
bool m_has_connected_component; bool m_has_connected_component;
bool m_cross_mask;
Input_iterator m_first; Input_iterator m_first;