From 919d9ae67dfea9cbc9bd0f22bec2f81c5bdf00c8 Mon Sep 17 00:00:00 2001 From: Efi Fogel Date: Thu, 23 Jan 2003 15:03:10 +0000 Subject: [PATCH] shorten long names --- .../include/CGAL/Snap_rounding_2.h | 108 +++++++++--------- 1 file changed, 54 insertions(+), 54 deletions(-) diff --git a/Packages/Snap_rounding_2/include/CGAL/Snap_rounding_2.h b/Packages/Snap_rounding_2/include/CGAL/Snap_rounding_2.h index b7097b1c005..ec304c6bcd5 100644 --- a/Packages/Snap_rounding_2/include/CGAL/Snap_rounding_2.h +++ b/Packages/Snap_rounding_2/include/CGAL/Snap_rounding_2.h @@ -280,30 +280,30 @@ inline void Segment_data::set_data(NT inp_x1,NT inp_y1,NT inp_x2, template void Segment_data::determine_direction() - { - if(x1 < x2) { - if(y1 < y2) - Snap_rounding_2::set_direction(Snap_rounding_2::UP_RIGHT); - else if(y1 == y2) - Snap_rounding_2::set_direction(Snap_rounding_2::RIGHT); - else - Snap_rounding_2::set_direction(Snap_rounding_2::DOWN_RIGHT); - } else if(x1 == x2) { - if(y1 < y2) - Snap_rounding_2::set_direction(Snap_rounding_2::UP); - else if(y1 == y2) - Snap_rounding_2::set_direction(Snap_rounding_2::POINT_SEG); - else - Snap_rounding_2::set_direction(Snap_rounding_2::DOWN); - } else { - if(y1 < y2) - Snap_rounding_2::set_direction(Snap_rounding_2::UP_LEFT); - else if(y1 == y2) - Snap_rounding_2::set_direction(Snap_rounding_2::LEFT); - else - Snap_rounding_2::set_direction(Snap_rounding_2::DOWN_LEFT); - } +{ + if(x1 < x2) { + if(y1 < y2) + Snap_rounding_2::set_direction(Snap_rounding_2::UP_RIGHT); + else if(y1 == y2) + Snap_rounding_2::set_direction(Snap_rounding_2::RIGHT); + else + Snap_rounding_2::set_direction(Snap_rounding_2::DOWN_RIGHT); + } else if(x1 == x2) { + if(y1 < y2) + Snap_rounding_2::set_direction(Snap_rounding_2::UP); + else if(y1 == y2) + Snap_rounding_2::set_direction(Snap_rounding_2::POINT_SEG); + else + Snap_rounding_2::set_direction(Snap_rounding_2::DOWN); + } else { + if(y1 < y2) + Snap_rounding_2::set_direction(Snap_rounding_2::UP_LEFT); + else if(y1 == y2) + Snap_rounding_2::set_direction(Snap_rounding_2::LEFT); + else + Snap_rounding_2::set_direction(Snap_rounding_2::DOWN_LEFT); } +} template @@ -492,35 +492,35 @@ bool hot_pixel_auclidian_cmp::operator()(const Hot_Pixel *h1, template bool hot_pixel_dir_cmp::operator ()(const Hot_Pixel *h1,\ const Hot_Pixel *h2) - { - return( - // Point segment intersects only one pixel, thus ignored - Snap_rounding_2::get_direction() == - Snap_rounding_2::UP_RIGHT && - (h1->get_x() < h2->get_x() || - h1->get_x() == h2->get_x() && h1->get_y() < h2->get_y()) || - Snap_rounding_2::get_direction() == - Snap_rounding_2::UP_LEFT && - (h1->get_x() > h2->get_x() || - h1->get_x() == h2->get_x() && h1->get_y() < h2->get_y()) || - Snap_rounding_2::get_direction() == - Snap_rounding_2::DOWN_RIGHT && - (h1->get_x() < h2->get_x() || - h1->get_x() == h2->get_x() && h1->get_y() > h2->get_y()) || - Snap_rounding_2::get_direction() == - Snap_rounding_2::DOWN_LEFT && - (h1->get_x() > h2->get_x() || - h1->get_x() == h2->get_x() && h1->get_y() > h2->get_y()) || - Snap_rounding_2::get_direction() == Snap_rounding_2::UP && - h1->get_y() < h2->get_y() || - Snap_rounding_2::get_direction() == Snap_rounding_2::DOWN && - h1->get_y() > h2->get_y() || - Snap_rounding_2::get_direction() == Snap_rounding_2::LEFT && - h1->get_x() > h2->get_x() || - Snap_rounding_2::get_direction() == - Snap_rounding_2::RIGHT && - h1->get_x() < h2->get_x()); - } +{ + return( + // Point segment intersects only one pixel, thus ignored + Snap_rounding_2::get_direction() == + Snap_rounding_2::UP_RIGHT && + (h1->get_x() < h2->get_x() || + h1->get_x() == h2->get_x() && h1->get_y() < h2->get_y()) || + Snap_rounding_2::get_direction() == + Snap_rounding_2::UP_LEFT && + (h1->get_x() > h2->get_x() || + h1->get_x() == h2->get_x() && h1->get_y() < h2->get_y()) || + Snap_rounding_2::get_direction() == + Snap_rounding_2::DOWN_RIGHT && + (h1->get_x() < h2->get_x() || + h1->get_x() == h2->get_x() && h1->get_y() > h2->get_y()) || + Snap_rounding_2::get_direction() == + Snap_rounding_2::DOWN_LEFT && + (h1->get_x() > h2->get_x() || + h1->get_x() == h2->get_x() && h1->get_y() > h2->get_y()) || + Snap_rounding_2::get_direction() == Snap_rounding_2::UP && + h1->get_y() < h2->get_y() || + Snap_rounding_2::get_direction() == Snap_rounding_2::DOWN && + h1->get_y() > h2->get_y() || + Snap_rounding_2::get_direction() == Snap_rounding_2::LEFT && + h1->get_x() > h2->get_x() || + Snap_rounding_2::get_direction() == + Snap_rounding_2::RIGHT && + h1->get_x() < h2->get_x()); +} @@ -643,8 +643,8 @@ void Snap_rounding_2::reroute_sr(std::set *, template void Snap_rounding_2::reroute_isr(std::set *, - hot_pixel_dir_cmp > &inp_hot_pixels_intersected_set, - std::list &seg_output,int number_of_intersections,bool first_time) + hot_pixel_dir_cmp > &inp_hot_pixels_intersected_set, + std::list &seg_output,int number_of_intersections,bool first_time) { typename std::set *,hot_pixel_dir_cmp >:: iterator hot_pixel_iter,next_hot_pixel_iter,before_last_hot_pixel_iter;