diff --git a/AABB_tree/include/CGAL/internal/AABB_tree/AABB_ray_intersection.h b/AABB_tree/include/CGAL/internal/AABB_tree/AABB_ray_intersection.h index c5c388d4304..c05a0a34ef5 100644 --- a/AABB_tree/include/CGAL/internal/AABB_tree/AABB_ray_intersection.h +++ b/AABB_tree/include/CGAL/internal/AABB_tree/AABB_ray_intersection.h @@ -180,7 +180,14 @@ private: struct as_ray_param_visitor { typedef FT result_type; - as_ray_param_visitor(const Ray* ray) : ray(ray) {} + as_ray_param_visitor(const Ray* ray) + : ray(ray), max_i(0) + { + typename AABB_traits::Geom_traits::Vector_3 v = ray->to_vector(); + for (int i=1; i<3; ++i) + if( CGAL::abs(v[i]) > CGAL::abs(v[max_i]) ) + max_i = i; + } template FT operator()(const T& s) @@ -196,16 +203,11 @@ private: typename AABB_traits::Geom_traits::Vector_3 x(ray->source(), point); typename AABB_traits::Geom_traits::Vector_3 v = ray->to_vector(); - for(int i = 0; i < 3; ++i) { - if(v[i] != FT(0.)) { - return x[i] / v[i]; - } - } - CGAL_assertion(false); // should never end-up here - return FT(0.); + return x[max_i] / v[max_i]; } const Ray* ray; + int max_i; }; }; diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_polycurve_traits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_polycurve_traits_2.h index 5fb8b3fb479..b16ee23a142 100644 --- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_polycurve_traits_2.h +++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_polycurve_traits_2.h @@ -1,12 +1,3 @@ -/// \ingroup PkgArrangement2Macros -/// @{ -/*! - * If the macro is set to one, then \f$x\f$-monotone curves are always - * directed from left-to-right. - */ -#define CGAL_ALWAYS_LEFT_TO_RIGHT -/// @} - namespace CGAL { /*! \ingroup PkgArrangement2TraitsClasses * diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_on_surface_base_2.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_on_surface_base_2.h index 5da2a35fb2b..4d28d31d31d 100644 --- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_on_surface_base_2.h +++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_on_surface_base_2.h @@ -1112,6 +1112,15 @@ protected: } } while(something_was_updated); + // last loop, if some tags are not set it means that they are the only ccb + // of the face and that they have to be the outer ccb + BOOST_FOREACH(Halfedge_handle h, halfedges_that_was_on_an_outer_ccb) + { + if (h->flag()!=NOT_VISITED) continue; + std::size_t face_master_id=(*uf_faces.find(face_handles[h->face()->id()]))->id(); + set_flag_of_halfedges_of_final_argt(h,ON_OUTER_CCB); + face_outer_ccb_set[face_master_id]=true; + } // at this position there might be some bits in face_outer_ccb_set not set // but they are corresponding to the unbounded face // End tagging ccbs diff --git a/Documentation/doc/Documentation/Developer_manual/developer_manual.txt b/Documentation/doc/Documentation/Developer_manual/developer_manual.txt index a2d5ae21d41..7d96af6c9e6 100644 --- a/Documentation/doc/Documentation/Developer_manual/developer_manual.txt +++ b/Documentation/doc/Documentation/Developer_manual/developer_manual.txt @@ -19,5 +19,6 @@ - \subpage devman_testing - \subpage devman_submission - \subpage devman_info +- \subpage deprecated */ diff --git a/Documentation/doc/Documentation/deprecated.txt b/Documentation/doc/Documentation/deprecated.txt new file mode 100644 index 00000000000..74c64425716 --- /dev/null +++ b/Documentation/doc/Documentation/deprecated.txt @@ -0,0 +1,11 @@ +/*! + +\page deprecated Deprecation Notice + +In \cgal, we are trying as much as possible not to break the backward compatibility. If we have to do it, it will be announced in the release notes , +and a solution will always be provided. When possible, we keep the deprecated API for two releases before removing it. +If you reached this page after clicking on a link, it must probably mean that the documentation page you were trying to reach +is now deprecated. Have a look at the release notes for more information. + + +*/ diff --git a/Documentation/doc/resources/1.8.13/deprecated.html b/Documentation/doc/resources/1.8.13/deprecated.html deleted file mode 100644 index 4d8329a9fb2..00000000000 --- a/Documentation/doc/resources/1.8.13/deprecated.html +++ /dev/null @@ -1,146 +0,0 @@ - - - - - -CGAL 4.3 - Manual: $title - - - - - - - - - - - - - - - -\( \newcommand{\E}{\mathrm{E}} \) \( \newcommand{\A}{\mathrm{A}} \) -\( \newcommand{\R}{\mathrm{R}} \) \( \newcommand{\N}{\mathrm{N}} \) \( \newcommand{\Q}{\mathrm{Q}} \) \( \newcommand{\Z}{\mathrm{Z}} \) -\( -\def\ccSum #1#2#3{ - \sum_{#1}^{#2}{#3} -} -\def\ccProd #1#2#3{ - \sum_{#1}^{#2}{#3} -}\) - -
- -
- - - - - - -
-
CGAL 4.3 - Manual -
-
-
- - - - - -
- -
- - -
-
- -
-
-
- -
- - - - -
- -
- -
-

The documentation page you are trying to reach has been removed from the documentation since CGAL 4.3 because it was deprecated

-
-
- - - - diff --git a/Documentation/doc/resources/1.8.14/deprecated.html b/Documentation/doc/resources/1.8.14/deprecated.html deleted file mode 100644 index 60d1c4e90bc..00000000000 --- a/Documentation/doc/resources/1.8.14/deprecated.html +++ /dev/null @@ -1,146 +0,0 @@ - - - - - -CGAL 4.3 - Manual: $title - - - - - - - - - - - - - - - -\( \newcommand{\E}{\mathrm{E}} \) \( \newcommand{\A}{\mathrm{A}} \) -\( \newcommand{\R}{\mathrm{R}} \) \( \newcommand{\N}{\mathrm{N}} \) \( \newcommand{\Q}{\mathrm{Q}} \) \( \newcommand{\Z}{\mathrm{Z}} \) -\( -\def\ccSum #1#2#3{ - \sum_{#1}^{#2}{#3} -} -\def\ccProd #1#2#3{ - \sum_{#1}^{#2}{#3} -}\) - -
- -
- - - - - - -
-
CGAL 4.3 - Manual -
-
-
- - - - - -
- -
- - -
-
- -
-
-
- -
- - - - -
- -
- -
-

The documentation page you are trying to reach has been removed from the documentation since CGAL 4.3 because it was deprecated

-
-
- - - - diff --git a/Documentation/doc/resources/1.8.4/deprecated.html b/Documentation/doc/resources/1.8.4/deprecated.html deleted file mode 100644 index 4d8329a9fb2..00000000000 --- a/Documentation/doc/resources/1.8.4/deprecated.html +++ /dev/null @@ -1,146 +0,0 @@ - - - - - -CGAL 4.3 - Manual: $title - - - - - - - - - - - - - - - -\( \newcommand{\E}{\mathrm{E}} \) \( \newcommand{\A}{\mathrm{A}} \) -\( \newcommand{\R}{\mathrm{R}} \) \( \newcommand{\N}{\mathrm{N}} \) \( \newcommand{\Q}{\mathrm{Q}} \) \( \newcommand{\Z}{\mathrm{Z}} \) -\( -\def\ccSum #1#2#3{ - \sum_{#1}^{#2}{#3} -} -\def\ccProd #1#2#3{ - \sum_{#1}^{#2}{#3} -}\) - -
- -
- - - - - - -
-
CGAL 4.3 - Manual -
-
-
- - - - - -
- -
- - -
-
- -
-
-
- -
- - - - -
- -
- -
-

The documentation page you are trying to reach has been removed from the documentation since CGAL 4.3 because it was deprecated

-
-
- - - - diff --git a/Documentation/doc/scripts/html_output_post_processing.py b/Documentation/doc/scripts/html_output_post_processing.py index c2a0b34941f..a6ba5edda43 100755 --- a/Documentation/doc/scripts/html_output_post_processing.py +++ b/Documentation/doc/scripts/html_output_post_processing.py @@ -386,8 +386,5 @@ removes some unneeded files, and performs minor repair on some glitches.''') canonical_link="\n" re_replace_first_in_file(r'', r'\n'+canonical_link+"\n", os.path.join("Manual","how_to_cite.html")) - #copy deprecated.html - shutil.copy(path.join(resources_absdir,"deprecated.html"),path.join("Manual/", "deprecated.html")) - if __name__ == "__main__": main() diff --git a/Periodic_2_triangulation_2/doc/Periodic_2_triangulation_2/CGAL/Periodic_2_triangulation_2.h b/Periodic_2_triangulation_2/doc/Periodic_2_triangulation_2/CGAL/Periodic_2_triangulation_2.h index 7efd97aab28..a3960a43c5d 100644 --- a/Periodic_2_triangulation_2/doc/Periodic_2_triangulation_2/CGAL/Periodic_2_triangulation_2.h +++ b/Periodic_2_triangulation_2/doc/Periodic_2_triangulation_2/CGAL/Periodic_2_triangulation_2.h @@ -889,13 +889,13 @@ public: /*! returns the vertex of the \f$ i^{th}\f$ neighbor of `f` that is opposite to `f`. - \pre $0 \\leqle i \\leqle 2$. + \pre \f$ 0 \leq i \leq 2\f$. */ Vertex_handle mirror_vertex(Face_handle f, int i) const; /*! returns the index of `f` in its \f$ i^{th}\f$ neighbor. - \pre $0 \\leqle i \\leqle 2$. + \pre \f$0 \leq i \leq 2\f$. */ int mirror_index(Face_handle f, int i) const; @@ -1062,12 +1062,12 @@ public: /// @{ /*! - Returns \f$ i+1\f$ modulo 3.\pre $0 \\leqle i \\leqle 2$. + Returns \f$ i+1\f$ modulo 3.\pre \f$0 \leq i \leq 2\f$. */ int ccw(int i) const; /*! - Returns \f$ i+2\f$ modulo 3.\pre $0 \\leqle i \\leqle 2$. + Returns \f$ i+2\f$ modulo 3.\pre \f$0 \leq i \leq 2\f$. */ int cw(int i) const;