diff --git a/Packages/Cartesian_kernel/changes.txt b/Packages/Cartesian_kernel/changes.txt index 0c0212d0269..c4a8e7215ac 100644 --- a/Packages/Cartesian_kernel/changes.txt +++ b/Packages/Cartesian_kernel/changes.txt @@ -1,3 +1,6 @@ +Version 6.48 (7 January 2002) +- Make Iso_rectangleC2 only know R::Point_2, not R::Point_2_base. + Version 6.47 (5 January 2002) - Move Cartesian_dynamic_d.h to Cd. diff --git a/Packages/Cartesian_kernel/include/CGAL/Cartesian.h b/Packages/Cartesian_kernel/include/CGAL/Cartesian.h index dcb92ed7000..5cd0d3ae659 100644 --- a/Packages/Cartesian_kernel/include/CGAL/Cartesian.h +++ b/Packages/Cartesian_kernel/include/CGAL/Cartesian.h @@ -239,8 +239,7 @@ struct Cartesian Circle_handle_2; typedef CGAL::Handle_for > Triangle_handle_2; - typedef CGAL::Handle_for > Iso_rectangle_handle_2; + typedef CGAL::Handle_for > Iso_rectangle_handle_2; typedef CGAL::Handle_for_virtual< Aff_transformation_rep_baseC2 > Aff_transformation_handle_2; diff --git a/Packages/Cartesian_kernel/include/CGAL/Cartesian/Iso_rectangle_2.h b/Packages/Cartesian_kernel/include/CGAL/Cartesian/Iso_rectangle_2.h index e69f1a139fc..03a4c859a56 100644 --- a/Packages/Cartesian_kernel/include/CGAL/Cartesian/Iso_rectangle_2.h +++ b/Packages/Cartesian_kernel/include/CGAL/Cartesian/Iso_rectangle_2.h @@ -33,7 +33,7 @@ class Iso_rectangleC2 CGAL_ADVANCED_KERNEL_PARTIAL_SPEC typedef typename R_::Iso_rectangle_handle_2 base; typedef typename base::element_type rep; - typedef typename R_::Kernel_base::Point_2 Point_2; + typedef typename R_::Point_2 Point_2; typedef typename R_::Kernel_base::Aff_transformation_2 Aff_transformation_2; public: @@ -50,14 +50,14 @@ public: if (p.y() < q.y()) { miny = p.y(); maxy = q.y(); } else { miny = q.y(); maxy = p.y(); } initialize_with(rep(Point_2(minx, miny), - Point_2(maxx, maxy))); + Point_2(maxx, maxy))); } Iso_rectangleC2(const FT& min_x, const FT& min_y, const FT& max_x, const FT& max_y) { initialize_with(rep(Point_2(min_x, min_y), - Point_2(max_x, max_y))); + Point_2(max_x, max_y))); } Iso_rectangleC2(const FT& min_hx, const FT& min_hy, @@ -65,10 +65,10 @@ public: { if (hw == FT(1)) initialize_with(rep(Point_2(min_hx, min_hy), - Point_2(max_hx, max_hy))); + Point_2(max_hx, max_hy))); else initialize_with(rep(Point_2(min_hx/hw, min_hy/hw), - Point_2(max_hx/hw, max_hy/hw))); + Point_2(max_hx/hw, max_hy/hw))); } bool operator==(const Iso_rectangleC2 &s) const; diff --git a/Packages/Cartesian_kernel/include/CGAL/Simple_cartesian.h b/Packages/Cartesian_kernel/include/CGAL/Simple_cartesian.h index c83b9b1401d..80e7effb927 100644 --- a/Packages/Cartesian_kernel/include/CGAL/Simple_cartesian.h +++ b/Packages/Cartesian_kernel/include/CGAL/Simple_cartesian.h @@ -252,8 +252,7 @@ struct Simple_cartesian typedef CGAL::Simple_Handle_for > Triangle_handle_2; - typedef CGAL::Simple_Handle_for > + typedef CGAL::Simple_Handle_for > Iso_rectangle_handle_2; typedef CGAL::Handle_for_virtual< Aff_transformation_rep_baseC2 > Aff_transformation_handle_2;