diff --git a/.gitattributes b/.gitattributes index c8c7f3aa112..26bd9196d36 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1780,6 +1780,7 @@ Interpolation/doc_tex/Interpolation/nn_coords.gif -text svneol=unset#image/gif Interpolation/doc_tex/Interpolation/nn_coords.ipe -text svneol=unset#application/postscript Interpolation/doc_tex/Interpolation/nn_coords.pdf -text svneol=unset#application/pdf Interpolation/doc_tex/Interpolation/nn_coords.xml svneol=native#text/xml +Intersections_2/include/CGAL/Circle_2_Line_2_intersection.h -text Interval_skip_list/doc_tex/Interval_skip_list/query.png -text Interval_skip_list/examples/Interval_skip_list/terrain.pts -text Jet_fitting_3/clean_tree.csh eol=lf diff --git a/Intersections_2/include/CGAL/Circle_2_Circle_2_intersection.h b/Intersections_2/include/CGAL/Circle_2_Circle_2_intersection.h index e533f26327d..41275ab299c 100644 --- a/Intersections_2/include/CGAL/Circle_2_Circle_2_intersection.h +++ b/Intersections_2/include/CGAL/Circle_2_Circle_2_intersection.h @@ -49,7 +49,6 @@ do_intersect(const typename K::Circle_2 & circ1, } // namespace CGALi - template inline bool diff --git a/Intersections_2/include/CGAL/Circle_2_Line_2_intersection.h b/Intersections_2/include/CGAL/Circle_2_Line_2_intersection.h new file mode 100644 index 00000000000..ce2948262ec --- /dev/null +++ b/Intersections_2/include/CGAL/Circle_2_Line_2_intersection.h @@ -0,0 +1,82 @@ +// Copyright (c) 2000 Utrecht University (The Netherlands), +// ETH Zurich (Switzerland), Freie Universitaet Berlin (Germany), +// INRIA Sophia-Antipolis (France), Martin-Luther-University Halle-Wittenberg +// (Germany), Max-Planck-Institute Saarbruecken (Germany), RISC Linz (Austria), +// and Tel-Aviv University (Israel). All rights reserved. +// +// This file is part of CGAL (www.cgal.org); you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public License as +// published by the Free Software Foundation; version 2.1 of the License. +// See the file LICENSE.LGPL distributed with CGAL. +// +// Licensees holding a valid commercial license may use this file in +// accordance with the commercial license agreement provided with the software. +// +// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE +// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. +// +// $URL: svn+ssh://pmachado@scm.gforge.inria.fr/svn/cgal/trunk/Intersections_2/include/CGAL/Circle_2_Circle_2_intersection.h $ +// $Id: Circle_2_Circle_2_intersection.h 39776 2007-08-08 15:15:20Z spion $ +// +// +// Author(s) : Geert-Jan Giezeman + + +#ifndef CGAL_CIRCLE_2_LINE_2_INTERSECTION_H +#define CGAL_CIRCLE_2_LINE_2_INTERSECTION_H + +#include +#include +#include +#include + +CGAL_BEGIN_NAMESPACE + +namespace CGALi { + +template +bool +do_intersect(const typename K::Circle_2 & c, + const typename K::Line_2& l, + const K&) +{ + return squared_distance(c.center(), l) <= c.squared_radius(); +} + +template +bool +do_intersect(const typename K::Line_2& l, + const typename K::Circle_2 & c, + const K&) +{ + return squared_distance(c.center(), l) <= c.squared_radius(); +} + +} // namespace CGALi + +template +inline +bool +do_intersect(const Circle_2 & c, + const Line_2 & l) +{ + typedef typename K::Do_intersect_2 Do_intersect; + return Do_intersect()(c, l); +} + +template +inline +bool +do_intersect(const Line_2 & l, + const Circle_2 & c) +{ + typedef typename K::Do_intersect_2 Do_intersect; + return Do_intersect()(c, l); +} + + +CGAL_END_NAMESPACE + +#endif + + diff --git a/Intersections_2/include/CGAL/intersection_2_3.h b/Intersections_2/include/CGAL/intersection_2_3.h index aa96425b835..717b8f8927a 100644 --- a/Intersections_2/include/CGAL/intersection_2_3.h +++ b/Intersections_2/include/CGAL/intersection_2_3.h @@ -27,5 +27,6 @@ #define CGAL_INTERSECTION_2_3_H #include +#include #endif