From f644dfaa5f7fcbe944e572dcd7c1c1a3ebe2d5a7 Mon Sep 17 00:00:00 2001 From: Michael Kerber Date: Thu, 24 Apr 2008 08:46:52 +0000 Subject: [PATCH] Adapted to changes in ACK_2 --- .../CGAL/Curved_kernel_via_analysis_2/Arc_2.h | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/Curved_kernel_via_analysis_2/include/CGAL/Curved_kernel_via_analysis_2/Arc_2.h b/Curved_kernel_via_analysis_2/include/CGAL/Curved_kernel_via_analysis_2/Arc_2.h index 3b40ec5eeb0..0dd8c5c64a0 100755 --- a/Curved_kernel_via_analysis_2/include/CGAL/Curved_kernel_via_analysis_2/Arc_2.h +++ b/Curved_kernel_via_analysis_2/include/CGAL/Curved_kernel_via_analysis_2/Arc_2.h @@ -1948,7 +1948,7 @@ protected: << "; arcno_on_g: " << cv2.arcno() << "; where: " << where ); if (where == CGAL::ARR_INTERIOR) { - CERR("; x = " << NiX::to_double(x0)); // TODO replace by CGAL:: + CERR("; x = " << CGAL::to_double(x0)); // TODO replace by CGAL:: } CERR("\n"); #endif @@ -2241,14 +2241,13 @@ protected: typename Curve_analysis_2::Polynomial_2 mult = cpa_2.curve_analysis(0).polynomial_2() * cpa_2.curve_analysis(1).polynomial_2(); - typedef typename Curve_kernel_2::Polynomial_2_CGAL Poly_2; - typename Curve_kernel_2::NiX2CGAL_converter cvt; + typedef typename Curve_kernel_2::Polynomial_2 Poly_2; typename CGAL::Polynomial_traits_d::Total_degree deg; ); // common parts and full parts CGAL_precondition(CGAL::CGALi::resultant(mult, f).is_zero()); CGAL_precondition(mult.degree() == f.degree()); - CGAL_precondition(deg(cvt(mult)) == deg(cvt(f))); + CGAL_precondition(deg(mult) == deg(f)); X_coordinate_1 x0; if(is_vertical()) { @@ -2814,12 +2813,11 @@ protected: std::pair ipair; int arcno1, arcno2, mult; - typedef typename Curve_kernel_2::Polynomial_2_CGAL Poly_2; - typename Curve_kernel_2::NiX2CGAL_converter cvt; + typedef typename Curve_kernel_2::Polynomial_2 Poly_2; typename CGAL::Polynomial_traits_d::Total_degree deg; - bool which_curve = (deg(cvt(f.polynomial_2())) < - deg(cvt(g.polynomial_2()))); + bool which_curve = (deg(f.polynomial_2()) < + deg(g.polynomial_2())); for(int i = low_idx; i <= high_idx; i++) { typename Curve_pair_analysis_2::Status_line_1 tmp = cpa_2.status_line_at_event(i);