From 77a3d4f14b9a67ba33f2ddab4cb30e5ebabdc46a Mon Sep 17 00:00:00 2001 From: Sylvain Pion Date: Thu, 21 Jun 2001 20:56:28 +0000 Subject: [PATCH] - Cleanup kernel_to_kernel.h --- Old_Packages/Kernel_basic/changes.txt | 3 + .../include/CGAL/kernel_to_kernel.h | 63 ++----------------- .../Kernel_23/include/CGAL/kernel_to_kernel.h | 63 ++----------------- 3 files changed, 15 insertions(+), 114 deletions(-) diff --git a/Old_Packages/Kernel_basic/changes.txt b/Old_Packages/Kernel_basic/changes.txt index 570a4ddb94d..667e64aac82 100644 --- a/Old_Packages/Kernel_basic/changes.txt +++ b/Old_Packages/Kernel_basic/changes.txt @@ -1,3 +1,6 @@ +3.47 (?? June 2001) +- Cleanup kernel_to_kernel.h + 3.46 (21 June 2001) - Traits update. diff --git a/Old_Packages/Kernel_basic/include/CGAL/kernel_to_kernel.h b/Old_Packages/Kernel_basic/include/CGAL/kernel_to_kernel.h index 8ac75074541..2677cb33177 100644 --- a/Old_Packages/Kernel_basic/include/CGAL/kernel_to_kernel.h +++ b/Old_Packages/Kernel_basic/include/CGAL/kernel_to_kernel.h @@ -38,11 +38,11 @@ struct Cartesian_double_to_Homogeneous typedef Segment_2< Homogeneous< NumberType> > Segment; Point2 - operator()( const Point_2 >& p) + operator()( const Point_2 >& p) const { return Point2( NumberType(p.x()), NumberType(p.y()) ); } Segment - operator()( const Segment_2 >& s) + operator()( const Segment_2 >& s) const { return Segment( Point2( NumberType(s.source().x()), NumberType(s.source().y()) ), @@ -51,55 +51,6 @@ struct Cartesian_double_to_Homogeneous } }; - -template -struct Cartesian_double_to_Cartesian -{ - typedef Point_2< Cartesian< NumberType> > Point2; - typedef Point_3< Cartesian< NumberType> > Point3; - typedef Segment_2< Cartesian< NumberType> > Segment; - - Point2 - operator()( const Point_2 >& p) - { return Point2( NumberType(p.x()), NumberType(p.y()) ); } - - Point3 - operator()( const Point_3 >& p) - { return Point3( NumberType(p.x()), - NumberType(p.y()), - NumberType(p.z()) ); } - - Segment - operator()( const Segment_2 >& s) - { - return Segment( Point2( NumberType(s.source().x()), - NumberType(s.source().y()) ), - Point2( NumberType(s.target().x()), - NumberType(s.target().y()) ) ); - } -}; - -template -struct Cartesian_float_to_Cartesian -{ - typedef Point_2< Cartesian< NumberType> > Point2; - typedef Segment_2< Cartesian< NumberType> > Segment; - - Point2 - operator()( const Point_2 >& p) - { return Point2( NumberType(p.x()), NumberType(p.y()) ); } - - Segment - operator()( const Segment_2 >& s) - { - return Segment( Point2( NumberType(s.source().x()), - NumberType(s.source().y()) ), - Point2( NumberType(s.target().x()), - NumberType(s.target().y()) ) ); - } -}; - - #ifdef CGAL_USE_LEDA struct Cartesian_double_to_H_double_int { @@ -107,13 +58,12 @@ struct Cartesian_double_to_H_double_int typedef Segment_2< Homogeneous< double> > Segment; Segment - operator()( const Segment_2< Cartesian< double> >& s) + operator()( const Segment_2< Cartesian< double> >& s) const { leda_rat_point rs = leda_point(s.source().x(), s.source().y()); leda_rat_point rt = leda_point(s.target().x(), s.target().y()); - return - Segment( + return Segment( Point2(::to_double(rs.X()),::to_double(rs.Y()),::to_double(rs.W())), Point2(::to_double(rt.X()),::to_double(rt.Y()),::to_double(rt.W())) ); } @@ -125,13 +75,12 @@ struct Cartesian_float_to_H_double_int typedef Segment_2< Homogeneous< double> > Segment; Segment - operator()( const Segment_2< Cartesian< float> >& s) + operator()( const Segment_2< Cartesian< float> >& s) const { leda_rat_point rs = leda_point(s.source().x(), s.source().y()); leda_rat_point rt = leda_point(s.target().x(), s.target().y()); - return - Segment( + return Segment( Point2(::to_double(rs.X()),::to_double(rs.Y()),::to_double(rs.W())), Point2(::to_double(rt.X()),::to_double(rt.Y()),::to_double(rt.W())) ); } diff --git a/Packages/Kernel_23/include/CGAL/kernel_to_kernel.h b/Packages/Kernel_23/include/CGAL/kernel_to_kernel.h index 8ac75074541..2677cb33177 100644 --- a/Packages/Kernel_23/include/CGAL/kernel_to_kernel.h +++ b/Packages/Kernel_23/include/CGAL/kernel_to_kernel.h @@ -38,11 +38,11 @@ struct Cartesian_double_to_Homogeneous typedef Segment_2< Homogeneous< NumberType> > Segment; Point2 - operator()( const Point_2 >& p) + operator()( const Point_2 >& p) const { return Point2( NumberType(p.x()), NumberType(p.y()) ); } Segment - operator()( const Segment_2 >& s) + operator()( const Segment_2 >& s) const { return Segment( Point2( NumberType(s.source().x()), NumberType(s.source().y()) ), @@ -51,55 +51,6 @@ struct Cartesian_double_to_Homogeneous } }; - -template -struct Cartesian_double_to_Cartesian -{ - typedef Point_2< Cartesian< NumberType> > Point2; - typedef Point_3< Cartesian< NumberType> > Point3; - typedef Segment_2< Cartesian< NumberType> > Segment; - - Point2 - operator()( const Point_2 >& p) - { return Point2( NumberType(p.x()), NumberType(p.y()) ); } - - Point3 - operator()( const Point_3 >& p) - { return Point3( NumberType(p.x()), - NumberType(p.y()), - NumberType(p.z()) ); } - - Segment - operator()( const Segment_2 >& s) - { - return Segment( Point2( NumberType(s.source().x()), - NumberType(s.source().y()) ), - Point2( NumberType(s.target().x()), - NumberType(s.target().y()) ) ); - } -}; - -template -struct Cartesian_float_to_Cartesian -{ - typedef Point_2< Cartesian< NumberType> > Point2; - typedef Segment_2< Cartesian< NumberType> > Segment; - - Point2 - operator()( const Point_2 >& p) - { return Point2( NumberType(p.x()), NumberType(p.y()) ); } - - Segment - operator()( const Segment_2 >& s) - { - return Segment( Point2( NumberType(s.source().x()), - NumberType(s.source().y()) ), - Point2( NumberType(s.target().x()), - NumberType(s.target().y()) ) ); - } -}; - - #ifdef CGAL_USE_LEDA struct Cartesian_double_to_H_double_int { @@ -107,13 +58,12 @@ struct Cartesian_double_to_H_double_int typedef Segment_2< Homogeneous< double> > Segment; Segment - operator()( const Segment_2< Cartesian< double> >& s) + operator()( const Segment_2< Cartesian< double> >& s) const { leda_rat_point rs = leda_point(s.source().x(), s.source().y()); leda_rat_point rt = leda_point(s.target().x(), s.target().y()); - return - Segment( + return Segment( Point2(::to_double(rs.X()),::to_double(rs.Y()),::to_double(rs.W())), Point2(::to_double(rt.X()),::to_double(rt.Y()),::to_double(rt.W())) ); } @@ -125,13 +75,12 @@ struct Cartesian_float_to_H_double_int typedef Segment_2< Homogeneous< double> > Segment; Segment - operator()( const Segment_2< Cartesian< float> >& s) + operator()( const Segment_2< Cartesian< float> >& s) const { leda_rat_point rs = leda_point(s.source().x(), s.source().y()); leda_rat_point rt = leda_point(s.target().x(), s.target().y()); - return - Segment( + return Segment( Point2(::to_double(rs.X()),::to_double(rs.Y()),::to_double(rs.W())), Point2(::to_double(rt.X()),::to_double(rt.Y()),::to_double(rt.W())) ); }