From 9bf61b7977c861671020d48a20706aef9fa2d759 Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Wed, 22 Apr 2020 11:02:16 +0200 Subject: [PATCH] more fixes --- CGAL_ipelets/demo/CGAL_ipelets/diagrams.cpp | 4 ++-- CGAL_ipelets/demo/CGAL_ipelets/mesh_2.cpp | 4 ++-- CGAL_ipelets/demo/CGAL_ipelets/minkowski.cpp | 2 +- CGAL_ipelets/demo/CGAL_ipelets/multi_regular.cpp | 4 ++-- CGAL_ipelets/demo/CGAL_ipelets/svdlinf.cpp | 4 ++-- CGAL_ipelets/include/CGAL/CGAL_Ipelet_base_v6.h | 4 ++-- Kernel_23/include/CGAL/Kernel/hash_functions.h | 8 ++++---- Kernel_d/test/Kernel_d/Iso_box_d_with_Cartesian.cpp | 4 ++-- .../test/Kernel_d/Iso_box_d_with_homogeneous.cpp | 4 ++-- .../Polygon_mesh_processing/polygon_mesh_slicer.cpp | 6 +++--- .../Plugins/AABB_tree/Do_trees_intersect_plugin.cpp | 6 +++--- .../Plugins/PCA/Affine_transform_plugin.cpp | 12 ++++++------ 12 files changed, 31 insertions(+), 31 deletions(-) diff --git a/CGAL_ipelets/demo/CGAL_ipelets/diagrams.cpp b/CGAL_ipelets/demo/CGAL_ipelets/diagrams.cpp index b0edf574baa..643bc96f2c7 100644 --- a/CGAL_ipelets/demo/CGAL_ipelets/diagrams.cpp +++ b/CGAL_ipelets/demo/CGAL_ipelets/diagrams.cpp @@ -135,8 +135,8 @@ void diagrammeIpelet::protected_run(int fn) Kernel::FT incr_len=(fn<2)?50:75; //slightly increase the size of the Bbox - bbox=Iso_rectangle_2(bbox.min()+Kernel::Vector_2(-incr_len,-incr_len), - bbox.max()+Kernel::Vector_2(incr_len,incr_len)); + bbox=Iso_rectangle_2((bbox.min)()+Kernel::Vector_2(-incr_len,-incr_len), + (bbox.max)()+Kernel::Vector_2(incr_len,incr_len)); diff --git a/CGAL_ipelets/demo/CGAL_ipelets/mesh_2.cpp b/CGAL_ipelets/demo/CGAL_ipelets/mesh_2.cpp index 2bc329c15df..a450cac2c7e 100644 --- a/CGAL_ipelets/demo/CGAL_ipelets/mesh_2.cpp +++ b/CGAL_ipelets/demo/CGAL_ipelets/mesh_2.cpp @@ -90,8 +90,8 @@ void IpeletMesh2::protected_run(int fn) double alpha=0; - int x=static_cast( floor(bbox.max().x()-bbox.min().x()) ); - int y=static_cast( floor(bbox.max().y()-bbox.min().y()) ); + int x=static_cast( floor((bbox.max)().x()-(bbox.min)().x()) ); + int y=static_cast( floor((bbox.max)().y()-(bbox.min)().y()) ); int ret_val; boost::tie(ret_val,alpha)=request_value_from_user((boost::format("Max edge length (BBox %1%x%2%)") % x % y).str() ); diff --git a/CGAL_ipelets/demo/CGAL_ipelets/minkowski.cpp b/CGAL_ipelets/demo/CGAL_ipelets/minkowski.cpp index 92cd9c40b34..03877ef424e 100644 --- a/CGAL_ipelets/demo/CGAL_ipelets/minkowski.cpp +++ b/CGAL_ipelets/demo/CGAL_ipelets/minkowski.cpp @@ -76,7 +76,7 @@ void SubSelectIpelet::protected_run(int fn) for (std::list::iterator it=cir_list.begin();it!=cir_list.end();++it) r_offsets.push_back(sqrt(CGAL::to_double(it->squared_radius()))); - IpeMatrix tfm (1,0,0,1,-CGAL::to_double(bbox.min().x()),-CGAL::to_double(bbox.min().y())); + IpeMatrix tfm (1,0,0,1,-CGAL::to_double((bbox.min)().x()),-CGAL::to_double((bbox.min)().y())); for (std::list::iterator it=pol_list.begin();it!=pol_list.end();++it) if(!it->is_simple()){ diff --git a/CGAL_ipelets/demo/CGAL_ipelets/multi_regular.cpp b/CGAL_ipelets/demo/CGAL_ipelets/multi_regular.cpp index 42b85c79dd1..3727c487040 100644 --- a/CGAL_ipelets/demo/CGAL_ipelets/multi_regular.cpp +++ b/CGAL_ipelets/demo/CGAL_ipelets/multi_regular.cpp @@ -95,8 +95,8 @@ void MregularIpelet::protected_run(int fn) draw_in_ipe(rt); else{//Draw kth Power diagram double incr_len=75; - bbox=Iso_rectangle_2(bbox.min()+Kernel::Vector_2(-incr_len,-incr_len), - bbox.max()+Kernel::Vector_2(incr_len,incr_len)); + bbox=Iso_rectangle_2((bbox.min)()+Kernel::Vector_2(-incr_len,-incr_len), + (bbox.max)()+Kernel::Vector_2(incr_len,incr_len)); draw_dual_in_ipe(rt,bbox); //draw Voronoi Diagram } } diff --git a/CGAL_ipelets/demo/CGAL_ipelets/svdlinf.cpp b/CGAL_ipelets/demo/CGAL_ipelets/svdlinf.cpp index 9bef1fbe29c..392fffb7aa0 100644 --- a/CGAL_ipelets/demo/CGAL_ipelets/svdlinf.cpp +++ b/CGAL_ipelets/demo/CGAL_ipelets/svdlinf.cpp @@ -96,8 +96,8 @@ namespace CGAL_svdlinf { Kernel::FT incr_len = 75; // slightly increase the size of the bbox bbox = Iso_rectangle_2( - bbox.min()+Kernel::Vector_2(-incr_len,-incr_len), - bbox.max()+Kernel::Vector_2(incr_len,incr_len)); + (bbox.min)()+Kernel::Vector_2(-incr_len,-incr_len), + (bbox.max)()+Kernel::Vector_2(incr_len,incr_len)); for (std::list::iterator sit = sg_list.begin(); diff --git a/CGAL_ipelets/include/CGAL/CGAL_Ipelet_base_v6.h b/CGAL_ipelets/include/CGAL/CGAL_Ipelet_base_v6.h index 1fb9f94d78d..de68972f1fb 100644 --- a/CGAL_ipelets/include/CGAL/CGAL_Ipelet_base_v6.h +++ b/CGAL_ipelets/include/CGAL/CGAL_Ipelet_base_v6.h @@ -256,8 +256,8 @@ public: _page->DeselectAll(); Iso_rectangle_2 bbox_cgal( - static_cast(bbox_ipe.Min().iX),static_cast(bbox_ipe.Min().iY), - static_cast(bbox_ipe.Max().iX),static_cast(bbox_ipe.Max().iY) + static_cast((bbox_ipe.Min)().iX),static_cast((bbox_ipe.Min)().iY), + static_cast((bbox_ipe.Max)().iX),static_cast((bbox_ipe.Max)().iY) ); return bbox_cgal; diff --git a/Kernel_23/include/CGAL/Kernel/hash_functions.h b/Kernel_23/include/CGAL/Kernel/hash_functions.h index 145d58bd38c..a68197941d8 100644 --- a/Kernel_23/include/CGAL/Kernel/hash_functions.h +++ b/Kernel_23/include/CGAL/Kernel/hash_functions.h @@ -57,8 +57,8 @@ template inline std::enable_if_t::value, std::size_t> hash_value (const Iso_rectangle_2& iso_rectangle) { - std::size_t result = hash_value(iso_rectangle.min()); - boost::hash_combine(result, hash_value(iso_rectangle.max())); + std::size_t result = hash_value((iso_rectangle.min)()); + boost::hash_combine(result, hash_value((iso_rectangle.max)())); return result; } @@ -126,8 +126,8 @@ template inline std::enable_if_t::value, std::size_t> hash_value (const Iso_cuboid_3& iso_cuboid) { - std::size_t result = hash_value(iso_cuboid.min()); - boost::hash_combine(result, hash_value(iso_cuboid.max())); + std::size_t result = hash_value((iso_cuboid.min)()); + boost::hash_combine(result, hash_value((iso_cuboid.max)())); return result; } diff --git a/Kernel_d/test/Kernel_d/Iso_box_d_with_Cartesian.cpp b/Kernel_d/test/Kernel_d/Iso_box_d_with_Cartesian.cpp index 0ea94fb0992..38b9ec62d7d 100644 --- a/Kernel_d/test/Kernel_d/Iso_box_d_with_Cartesian.cpp +++ b/Kernel_d/test/Kernel_d/Iso_box_d_with_Cartesian.cpp @@ -91,8 +91,8 @@ int main() { assert(b1.bounded_side(qq1)==CGAL::ON_BOUNDARY); assert(b1.bounded_side(qq4)==CGAL::ON_UNBOUNDED_SIDE); assert(b1.bounded_side(mm1)==CGAL::ON_BOUNDED_SIDE); - // std::cout << "b1.min()=" << b1.min() << std::endl; - // std::cout << "b1.max()=" << b1.max() << std::endl; + // std::cout << "(b1.min)()=" << (b1.min)() << std::endl; + // std::cout << "(b1.max)()=" << (b1.max)() << std::endl; std::cout << "volume of b1=" << b1.volume() << std::endl; std::cout << "volume of b4=" << b4.volume() << std::endl; std::cout << "volume of b5=" << b5.volume() << std::endl; diff --git a/Kernel_d/test/Kernel_d/Iso_box_d_with_homogeneous.cpp b/Kernel_d/test/Kernel_d/Iso_box_d_with_homogeneous.cpp index 8af8cbc3fad..8db8c7ddc7b 100644 --- a/Kernel_d/test/Kernel_d/Iso_box_d_with_homogeneous.cpp +++ b/Kernel_d/test/Kernel_d/Iso_box_d_with_homogeneous.cpp @@ -94,8 +94,8 @@ int main() { assert(b1.bounded_side(qq1)==CGAL::ON_BOUNDARY); assert(b1.bounded_side(qq4)==CGAL::ON_UNBOUNDED_SIDE); assert(b1.bounded_side(mm1)==CGAL::ON_BOUNDED_SIDE); - // std::cout << "b1.min()=" << b1.min() << std::endl; - // std::cout << "b1.max()=" << b1.max() << std::endl; + // std::cout << "(b1.min)()=" << (b1.min)() << std::endl; + // std::cout << "(b1.max)()=" << (b1.max)() << std::endl; std::cout << "volume of b1=" << b1.volume() << std::endl; std::cout << "volume of b4=" << b4.volume() << std::endl; std::cout << "volume of b5=" << b5.volume() << std::endl; diff --git a/Polygon_mesh_processing/benchmark/Polygon_mesh_processing/polygon_mesh_slicer.cpp b/Polygon_mesh_processing/benchmark/Polygon_mesh_processing/polygon_mesh_slicer.cpp index 03d0337f915..86c308e45ea 100644 --- a/Polygon_mesh_processing/benchmark/Polygon_mesh_processing/polygon_mesh_slicer.cpp +++ b/Polygon_mesh_processing/benchmark/Polygon_mesh_processing/polygon_mesh_slicer.cpp @@ -106,9 +106,9 @@ int main(int argc, char* argv[]) t.start(); std::cerr << "bbox"<< std::endl; Iso_cuboid_3 ic = CGAL::bounding_box(points(m).begin(), points(m).end()); - Point_3 p = midpoint(ic.min(), ic.max()); - double zmin = ic.min().z(); - double zmax = ic.max().z(); + Point_3 p = midpoint((ic.min)(), (ic.max)()); + double zmin = (ic.min)().z(); + double zmax = (ic.max)().z(); double delta = (zmax - zmin)/N; std::cerr << "slicer"<< std::endl; diff --git a/Polyhedron/demo/Polyhedron/Plugins/AABB_tree/Do_trees_intersect_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/AABB_tree/Do_trees_intersect_plugin.cpp index dfa516c1333..08a8ef803e4 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/AABB_tree/Do_trees_intersect_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/AABB_tree/Do_trees_intersect_plugin.cpp @@ -102,9 +102,9 @@ private Q_SLOTS: connect(item, &Scene_surface_mesh_item::aboutToBeDestroyed, this, &DoTreesIntersectplugin::cleanup); - CGAL::qglviewer::Vec pos((item->bbox().min(0) + item->bbox().max(0))/2.0, - (item->bbox().min(1) + item->bbox().max(1))/2.0, - (item->bbox().min(2) + item->bbox().max(2))/2.0); + CGAL::qglviewer::Vec pos(((item->bbox().min)(0) + (item->bbox().max)(0))/2.0, + ((item->bbox().min)(1) + (item->bbox().max)(1))/2.0, + ((item->bbox().min)(2) + (item->bbox().max)(2))/2.0); Scene_movable_sm_item* mov_item = new Scene_movable_sm_item(pos,item->face_graph(),""); connect(mov_item->manipulatedFrame(), &CGAL::qglviewer::ManipulatedFrame::modified, diff --git a/Polyhedron/demo/Polyhedron/Plugins/PCA/Affine_transform_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/PCA/Affine_transform_plugin.cpp index 57700e79d13..0eebfb574ab 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PCA/Affine_transform_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/PCA/Affine_transform_plugin.cpp @@ -417,12 +417,12 @@ void Polyhedron_demo_affine_transform_plugin::grid() Scene_item::Bbox b = item->bbox(); - double x_t(CGAL::sqrt(CGAL::squared_distance(Kernel::Point_3(b.min(0), b.min(1), b.min(2)), - Kernel::Point_3(b.max(0), b.min(1), b.min(2))))), - y_t(CGAL::sqrt(CGAL::squared_distance(Kernel::Point_3(b.min(0), b.min(1), b.min(2)), - Kernel::Point_3(b.min(0), b.max(1), b.min(2))))), - z_t(CGAL::sqrt(CGAL::squared_distance(Kernel::Point_3(b.min(0), b.min(1), b.min(2)), - Kernel::Point_3(b.min(0), b.min(1), b.max(2))))); + double x_t(CGAL::sqrt(CGAL::squared_distance(Kernel::Point_3((b.min)(0), (b.min)(1), (b.min)(2)), + Kernel::Point_3((b.max)(0), (b.min)(1), (b.min)(2))))), + y_t(CGAL::sqrt(CGAL::squared_distance(Kernel::Point_3((b.min)(0), (b.min)(1), (b.min)(2)), + Kernel::Point_3((b.min)(0), (b.max)(1), (b.min)(2))))), + z_t(CGAL::sqrt(CGAL::squared_distance(Kernel::Point_3((b.min)(0), (b.min)(1), (b.min)(2)), + Kernel::Point_3((b.min)(0), (b.min)(1), (b.max)(2))))); GridDialog dialog(mw); dialog.x_space_doubleSpinBox->setValue(x_t);