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

Easy fixes after Mael's review

This commit is contained in:
Andreas Fabri 2019-04-17 22:33:04 +02:00
parent a22bc68939
commit f6e3221d98
4 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Partition_2/include/CGAL/Partition_2/Indirect_edge_compare.h
View File

@ -37,7 +37,7 @@ template <class ForwardCirculator, class Traits>
class Indirect_edge_compare class Indirect_edge_compare
{ {
public: public:
typedef typename Traits::Orientation_2 Orientation_2; typedef typename Traits::Orientation_2 Orientation_2;
typedef typename Traits::Compare_y_2 Compare_y_2; typedef typename Traits::Compare_y_2 Compare_y_2;
typedef typename Traits::Compare_x_2 Compare_x_2; typedef typename Traits::Compare_x_2 Compare_x_2;
typedef typename Traits::Point_2 Point_2; typedef typename Traits::Point_2 Point_2;
@ -74,11 +74,6 @@ class Indirect_edge_compare
Comparison_result compare_x_at_y(const Point_2& p, const Point_2& a, const Point_2& b) const Comparison_result compare_x_at_y(const Point_2& p, const Point_2& a, const Point_2& b) const
{ {
Comparison_result cr = _compare_x_2(a, b);
if(cr == EQUAL){
// line ab is vertical
return _compare_x_2(p,a);
}
Orientation ori = _orientation_2(a, b, p); Orientation ori = _orientation_2(a, b, p);
if(ori == COLLINEAR){ if(ori == COLLINEAR){
return EQUAL; return EQUAL;
@ -119,7 +114,7 @@ class Indirect_edge_compare
{ {
if(_compare_y_2(Point_2(*q), Point_2(*after_q)) == EQUAL) if(_compare_y_2(Point_2(*q), Point_2(*after_q)) == EQUAL)
{ {
Point_2 p_max; Point_2 p_max;
Point_2 q_max; Point_2 q_max;
if (_compare_x_2(Point_2(*p), Point_2(*after_p)) == SMALLER) if (_compare_x_2(Point_2(*p), Point_2(*after_p)) == SMALLER)
p_max = *after_p; p_max = *after_p;

2
Partition_2/include/CGAL/Partition_2/Partition_vertex_map.h
View File

@ -74,7 +74,7 @@ template<class Traits_>
class Vertex_info_less class Vertex_info_less
{ {
public: public:
Vertex_info_less(const Traits_ traits) Vertex_info_less(const Traits_& traits)
: traits(traits) : traits(traits)
{} {}

6
Partition_2/include/CGAL/Partition_traits_adapter_2.h
View File

@ -44,11 +44,12 @@ private:
PointPropertyMap ppmap; PointPropertyMap ppmap;
public: public:
Partition_traits_adapter_2(Base_traits base=Base_traits()) Partition_traits_adapter_2(const Base_traits& base=Base_traits())
: Base_traits(base) : Base_traits(base)
{} {}
Partition_traits_adapter_2(const PointPropertyMap& ppmap,Base_traits base=Base_traits()) Partition_traits_adapter_2(const PointPropertyMap& ppmap,
const Base_traits& base=Base_traits())
: Base_traits(base),ppmap(ppmap) : Base_traits(base),ppmap(ppmap)
{} {}
@ -58,7 +59,6 @@ public:
typedef ::std::list<Point_2> Container; typedef ::std::list<Point_2> Container;
typedef CGAL::Polygon_2<Self, Container> Polygon_2; typedef CGAL::Polygon_2<Self, Container> Polygon_2;
template <typename BaseFct> template <typename BaseFct>
struct Pmap_fct : public BaseFct { struct Pmap_fct : public BaseFct {

2
Spatial_sorting/doc/Spatial_sorting/CGAL/Spatial_sort_traits_adapter_2.h
View File

@ -25,7 +25,7 @@ public:
/*! /*!
*/ */
typdef boost::property_traits<PointPropertyMap>::key_type Point_2; typedef boost::property_traits<PointPropertyMap>::key_type Point_2;
/// @} /// @}