songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed definition of Nop_decomposition (added Container parameter)

This commit is contained in:
Efi Fogel 2021-11-03 15:10:16 +02:00
parent c8107012b5
commit 4e48b0b984
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Minkowski_sum_2/include/CGAL/minkowski_sum_2.h
View File

@ -761,10 +761,10 @@ minkowski_sum_by_decomposition_2
const Decomposition_& decomp, const Decomposition_& decomp,
const Gps_segment_traits_2<Kernel_, Container_>& traits) const Gps_segment_traits_2<Kernel_, Container_>& traits)
{ {
typedef Kernel_ Kernel; typedef Kernel_ Kernel;
typedef Container_ Container; typedef Container_ Container;
typedef Decomposition_ Decomposition; typedef Decomposition_ Decomposition;
typedef Polygon_nop_decomposition_2<Kernel> Nop_decomposition; typedef Polygon_nop_decomposition_2<Kernel, Container> Nop_decomposition;
if (pgn1.is_convex()) { if (pgn1.is_convex()) {
Nop_decomposition decomp_nop; Nop_decomposition decomp_nop;
@ -839,11 +839,11 @@ minkowski_sum_by_decomposition_2
const WithHolesDecomposition_& decomp_with_holes, const WithHolesDecomposition_& decomp_with_holes,
const Gps_segment_traits_2<Kernel_, Container_>& traits) const Gps_segment_traits_2<Kernel_, Container_>& traits)
{ {
typedef Kernel_ Kernel; typedef Kernel_ Kernel;
typedef Container_ Container; typedef Container_ Container;
typedef NoHolesDecomposition_ No_holes_decomposition; typedef NoHolesDecomposition_ No_holes_decomposition;
typedef WithHolesDecomposition_ With_holes_decomposition; typedef WithHolesDecomposition_ With_holes_decomposition;
typedef Polygon_nop_decomposition_2<Kernel> Nop_decomposition; typedef Polygon_nop_decomposition_2<Kernel, Container> Nop_decomposition;
Hole_filter_2<Kernel, Container> hole_filter; Hole_filter_2<Kernel, Container> hole_filter;
Polygon_with_holes_2<Kernel, Container> filtered_pgn1; Polygon_with_holes_2<Kernel, Container> filtered_pgn1;
@ -982,11 +982,11 @@ minkowski_sum_by_decomposition_2
const WithHolesDecomposition_& decomp_with_holes, const WithHolesDecomposition_& decomp_with_holes,
const Gps_segment_traits_2<Kernel_, Container_>& traits) const Gps_segment_traits_2<Kernel_, Container_>& traits)
{ {
typedef Kernel_ Kernel; typedef Kernel_ Kernel;
typedef Container_ Container; typedef Container_ Container;
typedef NoHolesDecomposition_ No_holes_decomposition; typedef NoHolesDecomposition_ No_holes_decomposition;
typedef WithHolesDecomposition_ With_holes_decomposition; typedef WithHolesDecomposition_ With_holes_decomposition;
typedef Polygon_nop_decomposition_2<Kernel> Nop_decomposition; typedef Polygon_nop_decomposition_2<Kernel, Container> Nop_decomposition;
Hole_filter_2<Kernel, Container> hole_filter; Hole_filter_2<Kernel, Container> hole_filter;
Polygon_with_holes_2<Kernel,Container> filtered_pgn2; Polygon_with_holes_2<Kernel,Container> filtered_pgn2;