Skip to content

Commit a67d2ed

Browse files
committed
minor
1 parent 24e9897 commit a67d2ed

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

docs/homog2d_qa.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@ Q: Why do yo use (Gnu)Make as build tool (and not CMake or another fancy thing)?
7474
</dt>
7575
<dd>
7676
Because:<br>
77-
1. it is really powerful<br>
78-
2. there is no need for more<br>
79-
3. I like it
77+
1. it is really powerful<br>
78+
2. there is no need for more<br>
79+
3. I like it
8080

8181
(Actually, I have the feeling that most people criticizing that tool never really understood how it works.)
8282

homog2d.hpp

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ See https://github.com/skramm/homog2d
4242
#include <Eigen/Dense>
4343
#endif
4444

45-
#define HOMOG2D_VERSION 2.62
45+
#define HOMOG2D_VERSION 2.7
4646

4747
#ifdef HOMOG2D_USE_OPENCV
4848
#include "opencv2/imgproc.hpp"
@@ -1872,8 +1872,8 @@ s0 | | s2
18721872
detail::IntersectM<FPT> intersects( const FRect_<FPT2>& rect ) const
18731873
{
18741874
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
18771877
return p_intersects_R_C( rect );
18781878
}
18791879
///@}
@@ -2738,7 +2738,8 @@ Please check out warning described in impl_getAngle()
27382738
}
27392739

27402740
/// 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) */
27422743
template<
27432744
typename T,
27442745
typename std::enable_if<
@@ -2751,13 +2752,15 @@ Please check out warning described in impl_getAngle()
27512752
HOMOG2D_START;
27522753
return impl_intersectsCircle( pt0, radius, detail::RootHelper<LP>() );
27532754
}
2755+
27542756
/// Line/Circle intersection
27552757
template<typename T>
27562758
detail::Intersect<detail::Inters_2,FPT> intersects( const Circle_<T>& cir ) const
27572759
{
27582760
HOMOG2D_START;
27592761
return impl_intersectsCircle( cir.center(), cir.radius(), detail::RootHelper<LP>() );
27602762
}
2763+
27612764
/// Line/Polyline intersection
27622765
template<typename PLT,typename FPT2>
27632766
detail::IntersectM<FPT> intersects( const base::PolylineBase<PLT,FPT2>& pl ) const

0 commit comments

Comments
 (0)