@@ -42,7 +42,7 @@ See https://github.com/skramm/homog2d
42
42
#include < Eigen/Dense>
43
43
#endif
44
44
45
- #define HOMOG2D_VERSION 2.62
45
+ #define HOMOG2D_VERSION 2.7
46
46
47
47
#ifdef HOMOG2D_USE_OPENCV
48
48
#include " opencv2/imgproc.hpp"
@@ -1872,8 +1872,8 @@ s0 | | s2
1872
1872
detail::IntersectM<FPT> intersects ( const FRect_<FPT2>& rect ) const
1873
1873
{
1874
1874
HOMOG2D_START;
1875
- if ( *this == rect )
1876
- return detail::IntersectM<FPT>();
1875
+ if ( *this == rect ) // if rectangles are the same,
1876
+ return detail::IntersectM<FPT>(); // no intersection
1877
1877
return p_intersects_R_C ( rect );
1878
1878
}
1879
1879
// /@}
@@ -2738,7 +2738,8 @@ Please check out warning described in impl_getAngle()
2738
2738
}
2739
2739
2740
2740
// / Line/Circle intersection
2741
- /* * <br>The Sfinae below is needed to avoid ambiguity with the other 2 args function (with 2 points defining a FRect, see above) */
2741
+ /* * <br>The Sfinae below is needed to avoid ambiguity with the other 2 args "intersects()" function
2742
+ (with 2 points defining a FRect, see above) */
2742
2743
template <
2743
2744
typename T,
2744
2745
typename std::enable_if<
@@ -2751,13 +2752,15 @@ Please check out warning described in impl_getAngle()
2751
2752
HOMOG2D_START;
2752
2753
return impl_intersectsCircle ( pt0, radius, detail::RootHelper<LP>() );
2753
2754
}
2755
+
2754
2756
// / Line/Circle intersection
2755
2757
template <typename T>
2756
2758
detail::Intersect<detail::Inters_2,FPT> intersects ( const Circle_<T>& cir ) const
2757
2759
{
2758
2760
HOMOG2D_START;
2759
2761
return impl_intersectsCircle ( cir.center (), cir.radius (), detail::RootHelper<LP>() );
2760
2762
}
2763
+
2761
2764
// / Line/Polyline intersection
2762
2765
template <typename PLT,typename FPT2>
2763
2766
detail::IntersectM<FPT> intersects ( const base::PolylineBase<PLT,FPT2>& pl ) const
0 commit comments