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

Merge pull request #6297 from afabri/Spatial_searching-dangling_pointer_warning-GF 

Spatial_searching: Add a variable as we had a warning about a potentially dangling pointer
This commit is contained in:
Laurent Rineau 2022-02-18 15:21:40 +01:00
parent 4ba68e654f d6398b5d37
commit 03d415ee4b
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Spatial_searching/include/CGAL/Manhattan_distance_iso_box_point.h
View File

@ -33,6 +33,7 @@ namespace CGAL {
typedef typename SearchTraits::FT FT;
typedef Iso_box_d Query_item;
typedef typename internal::Get_dimension_tag<SearchTraits>::Dimension Dimension;
typedef typename CGAL::cpp11::result_of<typename SearchTraits::Construct_min_vertex_d(Query_item)>::type Min_vertex;
typedef typename CGAL::cpp11::result_of<typename SearchTraits::Construct_max_vertex_d(Query_item)>::type Max_vertex;
Manhattan_distance_iso_box_point(const SearchTraits& traits_=SearchTraits()):traits(traits_) {}
@ -46,9 +47,10 @@ namespace CGAL {
traits.construct_cartesian_const_iterator_d_object();
typename SearchTraits::Construct_min_vertex_d construct_min_vertex;
typename SearchTraits::Construct_max_vertex_d construct_max_vertex;
Min_vertex minv = construct_min_vertex(q);
Max_vertex maxv = construct_max_vertex(q);
typename SearchTraits::Cartesian_const_iterator_d qmaxit = construct_it(maxv),
qe = construct_it(maxv,1), qminit = construct_it(construct_min_vertex(q)),
qe = construct_it(maxv,1), qminit = construct_it(minv),
pit = construct_it(p);
for (; qmaxit != qe; ++pit,++qmaxit,++qminit) {
if ((*pit)>(*qmaxit)) distance +=
@ -67,9 +69,10 @@ namespace CGAL {
traits.construct_cartesian_const_iterator_d_object();
typename SearchTraits::Construct_min_vertex_d construct_min_vertex;
typename SearchTraits::Construct_max_vertex_d construct_max_vertex;
Min_vertex minv = construct_min_vertex(q);
Max_vertex maxv = construct_max_vertex(q);
typename SearchTraits::Cartesian_const_iterator_d qmaxit = construct_it(maxv),
qe = construct_it(maxv,1), qminit = construct_it(construct_min_vertex(q));
qe = construct_it(maxv,1), qminit = construct_it(minv);
for (unsigned int i = 0; qmaxit != qe; ++ qmaxit, ++qminit, ++i) {
if (r.min_coord(i)>(*qmaxit))
distance +=(r.min_coord(i)-(*qmaxit));
@ -86,9 +89,10 @@ namespace CGAL {
traits.construct_cartesian_const_iterator_d_object();
typename SearchTraits::Construct_min_vertex_d construct_min_vertex;
typename SearchTraits::Construct_max_vertex_d construct_max_vertex;
Min_vertex minv = construct_min_vertex(q);
Max_vertex maxv = construct_max_vertex(q);
typename SearchTraits::Cartesian_const_iterator_d qmaxit = construct_it(maxv),
qe = construct_it(maxv,1), qminit = construct_it(construct_min_vertex(q));
qe = construct_it(maxv,1), qminit = construct_it(minv);
for (unsigned int i = 0; qmaxit != qe; ++ qmaxit, ++qminit, ++i) {
if (r.min_coord(i)>(*qmaxit)) {
dists[i]=(r.min_coord(i)-(*qmaxit));
@ -111,9 +115,10 @@ namespace CGAL {
traits.construct_cartesian_const_iterator_d_object();
typename SearchTraits::Construct_min_vertex_d construct_min_vertex;
typename SearchTraits::Construct_max_vertex_d construct_max_vertex;
Min_vertex minv = construct_min_vertex(q);
Max_vertex maxv = construct_max_vertex(q);
typename SearchTraits::Cartesian_const_iterator_d qmaxit = construct_it(maxv),
qe = construct_it(maxv,1), qminit = construct_it(construct_min_vertex(q));
qe = construct_it(maxv,1), qminit = construct_it(minv);
for (unsigned int i = 0; qmaxit != qe; ++ qmaxit, ++qminit, ++i) {
if ( r.max_coord(i)-(*qminit) >(*qmaxit)-r.min_coord(i) )
distance += (r.max_coord(i)-(*qminit));
@ -132,9 +137,10 @@ namespace CGAL {
traits.construct_cartesian_const_iterator_d_object();
typename SearchTraits::Construct_min_vertex_d construct_min_vertex;
typename SearchTraits::Construct_max_vertex_d construct_max_vertex;
Min_vertex minv = construct_min_vertex(q);
Max_vertex maxv = construct_max_vertex(q);
typename SearchTraits::Cartesian_const_iterator_d qmaxit = construct_it(maxv),
qe = construct_it(maxv,1), qminit = construct_it(construct_min_vertex(q));
qe = construct_it(maxv,1), qminit = construct_it(minv);
for (unsigned int i = 0; qmaxit != qe; ++ qmaxit, ++qminit, ++i) {
if ( r.max_coord(i)-(*qminit) >(*qmaxit)-r.min_coord(i) ) {
dists[i]=(r.max_coord(i)-(*qminit));