Skip to content

Commit

Permalink
fixed friend issues (pb with conversions)
Browse files Browse the repository at this point in the history
  • Loading branch information
skramm committed Jul 12, 2021
1 parent 838636b commit f918478
Showing 1 changed file with 10 additions and 7 deletions.
17 changes: 10 additions & 7 deletions homog2d.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -243,8 +243,7 @@ Templated by Floating-Point Type (FPT) and by type M (type::IsEpipmat or type::I
template<typename M,typename FPT>
class Hmatrix_
{
template<typename T1,typename T2>
friend class Root;
template<typename T1,typename T2> friend class Root;

template<typename T1,typename T2,typename FPT1,typename FPT2>
friend void
Expand Down Expand Up @@ -942,7 +941,9 @@ class IntersectM
template<typename FPT>
class FRect_
{
private:
template<typename T> friend class FRect_;

private:
Point2d_<FPT> _ptR1,_ptR2;

public:
Expand Down Expand Up @@ -1174,6 +1175,8 @@ HOMOG2D_INUMTYPE width( const FRect_<FPT>& rect )
template<typename FPT>
class Circle_
{
template<typename T> friend class Circle_;

private:
FPT _radius;
Point2d_<FPT> _center;
Expand Down Expand Up @@ -1411,12 +1414,10 @@ enum class Dtype : char
template<typename LP,typename FPT>
class Root
{
template<typename U,typename V>
friend class Hmatrix_;
template<typename U,typename V> friend class Hmatrix_;

// This is needed so we can convert from, say, Point2d_<float> to Point2d_<double>
template<typename U,typename V>
friend class Root;
template<typename U,typename V> friend class Root;

template<typename FPT1,typename FPT2>
friend Point2d_<FPT1>
Expand Down Expand Up @@ -2279,6 +2280,8 @@ Hmatrix_<M,FPT>::buildFrom4Points(
template<typename FPT>
class Segment_
{
template<typename T> friend class Segment_;

private:
Point2d_<FPT> _ptS1, _ptS2;

Expand Down

0 comments on commit f918478

Please sign in to comment.