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

- Make Iso_rectangleC2 only know R::Point_2, not R::Point_2_base.

This commit is contained in:
Sylvain Pion 2002-01-07 13:40:56 +00:00
parent 2dfa831470
commit 0145835bf5
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Packages/Cartesian_kernel/changes.txt
View File

@ -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.

3
Packages/Cartesian_kernel/include/CGAL/Cartesian.h
View File

@ -239,8 +239,7 @@ struct Cartesian
Circle_handle_2;
typedef CGAL::Handle_for<CGAL::Threetuple<CGAL_TYPENAME_MSVC_NULL
Kernel_base::Point_2> > Triangle_handle_2;
typedef CGAL::Handle_for<CGAL::Twotuple<CGAL_TYPENAME_MSVC_NULL
Kernel_base::Point_2> > Iso_rectangle_handle_2;
typedef CGAL::Handle_for<CGAL::Twotuple<Point_2> > Iso_rectangle_handle_2;
typedef CGAL::Handle_for_virtual< Aff_transformation_rep_baseC2<Self> >
Aff_transformation_handle_2;

10
Packages/Cartesian_kernel/include/CGAL/Cartesian/Iso_rectangle_2.h
View File

@ -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;

3
Packages/Cartesian_kernel/include/CGAL/Simple_cartesian.h
View File

@ -252,8 +252,7 @@ struct Simple_cartesian
typedef CGAL::Simple_Handle_for<CGAL::Threetuple<
CGAL_TYPENAME_MSVC_NULL Kernel_base::Point_2> >
Triangle_handle_2;
typedef CGAL::Simple_Handle_for<CGAL::Twotuple<
CGAL_TYPENAME_MSVC_NULL Kernel_base::Point_2> >
typedef CGAL::Simple_Handle_for<CGAL::Twotuple<Point_2> >
Iso_rectangle_handle_2;
typedef CGAL::Handle_for_virtual< Aff_transformation_rep_baseC2<Self> >
Aff_transformation_handle_2;