diff --git a/Packages/Alpha_shapes_2/changes.txt b/Packages/Alpha_shapes_2/changes.txt index 148970d59bd..500702bb858 100644 --- a/Packages/Alpha_shapes_2/changes.txt +++ b/Packages/Alpha_shapes_2/changes.txt @@ -1,3 +1,6 @@ +Version 11.44 [af] +- Moved \chapter from alpha2.tex to main.tex + Version 11.43 - new headers diff --git a/Packages/Alpha_shapes_2/doc_tex/Alpha_shapes_2/alpha2.tex b/Packages/Alpha_shapes_2/doc_tex/Alpha_shapes_2/alpha2.tex index b038afbfb5d..4c634eed2fa 100644 --- a/Packages/Alpha_shapes_2/doc_tex/Alpha_shapes_2/alpha2.tex +++ b/Packages/Alpha_shapes_2/doc_tex/Alpha_shapes_2/alpha2.tex @@ -1,53 +1,3 @@ -% ====================================================================== -% -% Copyright (c) 1999 The GALIA Consortium -% -% This software and related documentation is part of the -% Computational Geometry Algorithms Library (CGAL). -% -% Every use of CGAL requires a license. Licenses come in three kinds: -% -% - For academic research and teaching purposes, permission to use and -% copy the software and its documentation is hereby granted free of -% charge, provided that -% (1) it is not a component of a commercial product, and -% (2) this notice appears in all copies of the software and -% related documentation. -% - Development licenses grant access to the source code of the library -% to develop programs. These programs may be sold to other parties as -% executable code. To obtain a development license, please contact -% the GALIA Consortium (at cgal@cs.uu.nl). -% - Commercialization licenses grant access to the source code and the -% right to sell development licenses. To obtain a commercialization -% license, please contact the GALIA Consortium (at cgal@cs.uu.nl). -% -% This software and documentation is provided "as-is" and without -% warranty of any kind. In no event shall the CGAL Consortium be -% liable for any damage of any kind. -% -% The GALIA Consortium consists of Utrecht University (The Netherlands), -% ETH Zurich (Switzerland), Free University of Berlin (Germany), -% INRIA Sophia-Antipolis (France), Martin-Luther-University Halle-Wittenberg -% (Germany), Max-Planck-Institute Saarbrucken (Germany), -% and Tel-Aviv University (Israel). -% -% ---------------------------------------------------------------------- -% -% package : Alpha_shapes_2 -% author(s) : Tran Kai Frank DA -% -% coordinator : INRIA Sophia-Antipolis () -% -% ====================================================================== - -\RCSdef{\alphashapeRevision}{$Revision$} -\RCSdefDate{\alphashapeDate}{$Date$} - -%---------------------------------------------------------------------- - -\chapter{2D Alpha Shapes} \label{I1_ChapterAlphashapes2D} - -\minitoc %\ccChapterSubTitle{\alphashapeRevision, \alphashapeDate} \begin{ccTexOnly} diff --git a/Packages/Alpha_shapes_2/doc_tex/Alpha_shapes_2/main.tex b/Packages/Alpha_shapes_2/doc_tex/Alpha_shapes_2/main.tex index 44b23844eb2..f14136a2b6a 100644 --- a/Packages/Alpha_shapes_2/doc_tex/Alpha_shapes_2/main.tex +++ b/Packages/Alpha_shapes_2/doc_tex/Alpha_shapes_2/main.tex @@ -1,3 +1,12 @@ + +\RCSdef{\alphashapeRevision}{$Revision$} +\RCSdefDate{\alphashapeDate}{$Date$} + +\chapter{2D Alpha Shapes} \label{I1_ChapterAlphashapes2D} + +\minitoc + + \input{alpha2} %\input{Alpha_shapes_2_ref/main} diff --git a/Packages/Alpha_shapes_2/doc_tex/basic/Alpha_shapes_2/alpha2.tex b/Packages/Alpha_shapes_2/doc_tex/basic/Alpha_shapes_2/alpha2.tex index b038afbfb5d..4c634eed2fa 100644 --- a/Packages/Alpha_shapes_2/doc_tex/basic/Alpha_shapes_2/alpha2.tex +++ b/Packages/Alpha_shapes_2/doc_tex/basic/Alpha_shapes_2/alpha2.tex @@ -1,53 +1,3 @@ -% ====================================================================== -% -% Copyright (c) 1999 The GALIA Consortium -% -% This software and related documentation is part of the -% Computational Geometry Algorithms Library (CGAL). -% -% Every use of CGAL requires a license. Licenses come in three kinds: -% -% - For academic research and teaching purposes, permission to use and -% copy the software and its documentation is hereby granted free of -% charge, provided that -% (1) it is not a component of a commercial product, and -% (2) this notice appears in all copies of the software and -% related documentation. -% - Development licenses grant access to the source code of the library -% to develop programs. These programs may be sold to other parties as -% executable code. To obtain a development license, please contact -% the GALIA Consortium (at cgal@cs.uu.nl). -% - Commercialization licenses grant access to the source code and the -% right to sell development licenses. To obtain a commercialization -% license, please contact the GALIA Consortium (at cgal@cs.uu.nl). -% -% This software and documentation is provided "as-is" and without -% warranty of any kind. In no event shall the CGAL Consortium be -% liable for any damage of any kind. -% -% The GALIA Consortium consists of Utrecht University (The Netherlands), -% ETH Zurich (Switzerland), Free University of Berlin (Germany), -% INRIA Sophia-Antipolis (France), Martin-Luther-University Halle-Wittenberg -% (Germany), Max-Planck-Institute Saarbrucken (Germany), -% and Tel-Aviv University (Israel). -% -% ---------------------------------------------------------------------- -% -% package : Alpha_shapes_2 -% author(s) : Tran Kai Frank DA -% -% coordinator : INRIA Sophia-Antipolis () -% -% ====================================================================== - -\RCSdef{\alphashapeRevision}{$Revision$} -\RCSdefDate{\alphashapeDate}{$Date$} - -%---------------------------------------------------------------------- - -\chapter{2D Alpha Shapes} \label{I1_ChapterAlphashapes2D} - -\minitoc %\ccChapterSubTitle{\alphashapeRevision, \alphashapeDate} \begin{ccTexOnly} diff --git a/Packages/Alpha_shapes_2/doc_tex/basic/Alpha_shapes_2/main.tex b/Packages/Alpha_shapes_2/doc_tex/basic/Alpha_shapes_2/main.tex index 44b23844eb2..f14136a2b6a 100644 --- a/Packages/Alpha_shapes_2/doc_tex/basic/Alpha_shapes_2/main.tex +++ b/Packages/Alpha_shapes_2/doc_tex/basic/Alpha_shapes_2/main.tex @@ -1,3 +1,12 @@ + +\RCSdef{\alphashapeRevision}{$Revision$} +\RCSdefDate{\alphashapeDate}{$Date$} + +\chapter{2D Alpha Shapes} \label{I1_ChapterAlphashapes2D} + +\minitoc + + \input{alpha2} %\input{Alpha_shapes_2_ref/main} diff --git a/Packages/Alpha_shapes_2/include/CGAL/Weighted_alpha_shape_euclidean_traits_2.h b/Packages/Alpha_shapes_2/include/CGAL/Weighted_alpha_shape_euclidean_traits_2.h index 0e556e8ef16..21a78ec76ba 100644 --- a/Packages/Alpha_shapes_2/include/CGAL/Weighted_alpha_shape_euclidean_traits_2.h +++ b/Packages/Alpha_shapes_2/include/CGAL/Weighted_alpha_shape_euclidean_traits_2.h @@ -88,8 +88,8 @@ class Side_of_bounded_orthogonalcircleC2 public: typedef Bounded_side result_type; typedef Arity_tag< 3 > Arity; - typedef typename K::Point T; - result_type operator()(const T& p, const T& q, const T& t) + typedef typename K::Point Point; + result_type operator()(const Point& p, const Point& q, const Point& t) { typedef typename K::Coord_type FT; FT px(p.point().x());