diff --git a/Packages/Alpha_shapes_2/changes.txt b/Packages/Alpha_shapes_2/changes.txt index f5593882c0d..b2f41ced49c 100644 --- a/Packages/Alpha_shapes_2/changes.txt +++ b/Packages/Alpha_shapes_2/changes.txt @@ -1,3 +1,6 @@ +version 8.0: +-> compatibility with CGAL-2.2-I + version 7.0: -> New doc style. @@ -14,7 +17,7 @@ version 4.0: Mips_IRIX_CC and Borland_CC supported. version 3.0 : -stabilized version waiting for public release. +stabilised version waiting for public release. version 2.0 : new design more appropriated for weighted alpha shapes. @@ -32,7 +35,7 @@ Version 1.3 : -> New Kernel. Version 1.2 : -C++ "standardization". +C++ "standardisation". Version 1.1 : -> basic library. diff --git a/Packages/Alpha_shapes_2/demo/Alpha_shapes_2/Makefile b/Packages/Alpha_shapes_2/demo/Alpha_shapes_2/Makefile index b2e15642d44..7d63358d62b 100644 --- a/Packages/Alpha_shapes_2/demo/Alpha_shapes_2/Makefile +++ b/Packages/Alpha_shapes_2/demo/Alpha_shapes_2/Makefile @@ -5,7 +5,7 @@ #---------------------------------------------------------------------# # Choose the right include file from the /make directory. -CGAL_MAKEFILE = $(UTIL)/CGAL/CGAL-2.1/make/makefile_sparc_SunOS-5.6_g++-2.95.2_LEDA +CGAL_MAKEFILE = $(UTIL)/CGAL/CGAL-2.2-I-24/make/makefile_sparc_SunOS-5.6_g++-2.95.2_LEDA #$(UTIL)/CGAL-I/make/makefile_sparc_SunOS-5.6_eg++-egcs-2.91.66_LEDA #makefile_sparc_SunOS-5.6_eg++-egcs-2.91.66_LEDA diff --git a/Packages/Alpha_shapes_2/demo/Alpha_shapes_2/weights_heuristic_2.h b/Packages/Alpha_shapes_2/demo/Alpha_shapes_2/weights_heuristic_2.h index cac2158b67b..344506c8cb8 100644 --- a/Packages/Alpha_shapes_2/demo/Alpha_shapes_2/weights_heuristic_2.h +++ b/Packages/Alpha_shapes_2/demo/Alpha_shapes_2/weights_heuristic_2.h @@ -89,7 +89,6 @@ public: typedef typename Gt::Coord_type Coord_type; typedef typename Gt::Point Point; - typedef typename Gt::Distance Distance; typedef typename Gt::Ray Ray; typedef typename Gt::Line Line; typedef typename Gt::Direction Direction; diff --git a/Packages/Alpha_shapes_2/examples/Alpha_shapes_2/Makefile b/Packages/Alpha_shapes_2/examples/Alpha_shapes_2/Makefile index 91172ec31fa..75c93ce5a54 100644 --- a/Packages/Alpha_shapes_2/examples/Alpha_shapes_2/Makefile +++ b/Packages/Alpha_shapes_2/examples/Alpha_shapes_2/Makefile @@ -5,7 +5,7 @@ #---------------------------------------------------------------------# # Choose the right include file from the /make directory. -CGAL_MAKEFILE =$(UTIL)/CGAL/CGAL-2.1/make/makefile_sparc_SunOS-5.6_g++-2.95.2_LEDA +CGAL_MAKEFILE =$(UTIL)/CGAL/CGAL-2.2-I-24/make/makefile_sparc_SunOS-5.6_g++-2.95.2_LEDA # for cygwin #\prisme\CGAL\CGAL-2.1-I-30\make\makefile_i686_CYGWINNT-4.0-20.1_CL.EXE-12.00.8168 diff --git a/Packages/Alpha_shapes_2/include/CGAL/Alpha_shape_2.h b/Packages/Alpha_shapes_2/include/CGAL/Alpha_shape_2.h index 02d4337b1e8..a6ed0bcc539 100644 --- a/Packages/Alpha_shapes_2/include/CGAL/Alpha_shape_2.h +++ b/Packages/Alpha_shapes_2/include/CGAL/Alpha_shape_2.h @@ -80,12 +80,10 @@ public: typedef typename Gt::Coord_type Coord_type; typedef typename Gt::Point Point; - typedef typename Gt::Distance Distance; typedef typename Gt::Ray Ray; typedef typename Gt::Line Line; typedef typename Gt::Direction Direction; - typedef typename Dt::Face_handle Face_handle; typedef typename Dt::Vertex_handle Vertex_handle; typedef typename Dt::Edge Edge; 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 5990239e58f..dd66ae5bdd2 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 @@ -57,7 +57,7 @@ public: typedef typename R::FT Coord_type; typedef typename - Regular_triangulation_euclidean_traits_2::Point Point; + Regular_triangulation_euclidean_traits_2::Weighted_point Point; //--------------------------------------------------------------------- diff --git a/Packages/Alpha_shapes_2/include/CGAL/constructions/squared_radius_smallest_orthogonalcircle_ftC2.h b/Packages/Alpha_shapes_2/include/CGAL/constructions/squared_radius_smallest_orthogonalcircle_ftC2.h index 7591a9f7731..61066d5a251 100644 --- a/Packages/Alpha_shapes_2/include/CGAL/constructions/squared_radius_smallest_orthogonalcircle_ftC2.h +++ b/Packages/Alpha_shapes_2/include/CGAL/constructions/squared_radius_smallest_orthogonalcircle_ftC2.h @@ -46,8 +46,8 @@ squared_radius_orthogonalcircleC2( FT dpy = py-ry; FT dqx = qx-rx; FT dqy = qy-ry; - FT dpp = square(dpx)+square(dpy)-pw+rw; - FT dqq = square(dqx)+square(dqy)-qw+rw; + FT dpp = CGAL_NTS square(dpx)+CGAL_NTS square(dpy)-pw+rw; + FT dqq = CGAL_NTS square(dqx)+CGAL_NTS square(dqy)-qw+rw; FT det0 = det2x2_by_formula(dpx, dpy, dqx, dqy); @@ -55,7 +55,7 @@ squared_radius_orthogonalcircleC2( FT det2 = det2x2_by_formula(dpx, dpp, dqx, dqq); - return (square(det1)+square(det2))/(FT4*square(det0)) - rw; + return (CGAL_NTS square(det1)+CGAL_NTS square(det2))/(FT4*CGAL_NTS square(det0)) - rw; } template< class FT > @@ -67,9 +67,9 @@ squared_radius_smallest_orthogonalcircleC2( { FT FT4(4); - FT dpz = square(px-qx)+square(py-qy); + FT dpz = CGAL_NTS square(px-qx)+CGAL_NTS square(py-qy); - return (square(dpz-pw+qw)/(FT4*dpz)-qw); + return (CGAL_NTS square(dpz-pw+qw)/(FT4*dpz)-qw); } //------------------------------------------------------------------- diff --git a/Packages/Alpha_shapes_2/include/CGAL/predicates/in_smallest_orthogonalcircle_ftC2.h b/Packages/Alpha_shapes_2/include/CGAL/predicates/in_smallest_orthogonalcircle_ftC2.h index ee7ffb7e2bc..03bd2d08dc1 100644 --- a/Packages/Alpha_shapes_2/include/CGAL/predicates/in_smallest_orthogonalcircle_ftC2.h +++ b/Packages/Alpha_shapes_2/include/CGAL/predicates/in_smallest_orthogonalcircle_ftC2.h @@ -43,9 +43,9 @@ in_smallest_orthogonalcircleC2(const FT &px, const FT &py, const FT &pw, FT dpy = py-qy; FT dtx = tx-qx; FT dty = ty-qy; - FT dpz = square(dpx)+square(dpy); + FT dpz = CGAL_NTS square(dpx)+CGAL_NTS square(dpy); - return Bounded_side (CGAL::sign(-(square(dtx)+square(dty)-tw+qw)*dpz + return Bounded_side (CGAL_NTS sign(-(CGAL_NTS square(dtx)+CGAL_NTS square(dty)-tw+qw)*dpz +(dpz-pw+qw)*(dpx*dtx+dpy*dty))); } diff --git a/Packages/Alpha_shapes_2/test/Alpha_shapes_2/Makefile b/Packages/Alpha_shapes_2/test/Alpha_shapes_2/Makefile index c8a9745baae..03fc7d95260 100644 --- a/Packages/Alpha_shapes_2/test/Alpha_shapes_2/Makefile +++ b/Packages/Alpha_shapes_2/test/Alpha_shapes_2/Makefile @@ -5,7 +5,7 @@ #---------------------------------------------------------------------# # Choose the right include file from the /make directory. -CGAL_MAKEFILE =$(UTIL)/CGAL/CGAL-2.1/make/makefile_sparc_SunOS-5.6_g++-2.95.2_LEDA +CGAL_MAKEFILE =$(UTIL)/CGAL/CGAL-2.2-I-24/make/makefile_sparc_SunOS-5.6_g++-2.95.2_LEDA # for cygwin #\prisme\CGAL\CGAL-2.1-I-30\make\makefile_i686_CYGWINNT-4.0-20.1_CL.EXE-12.00.8168 diff --git a/Packages/Alpha_shapes_2/version b/Packages/Alpha_shapes_2/version index 93bfd194354..0da0ad61628 100644 --- a/Packages/Alpha_shapes_2/version +++ b/Packages/Alpha_shapes_2/version @@ -1,2 +1,2 @@ -7.2 (14 Apr 2000) +8.0 (11 Jul 2000) Maintainer : Frank Da