Commit 22dbf3d0 authored by Davis King's avatar Davis King

A minor change to avoid getting a compiler error about functions

being ambiguous when the rectangle is used with floating point
vectors.

--HG--
extra : convert_revision : svn%3Afdd8eb12-d10e-0410-9acb-85c331704f74/trunk%404238
parent 09729e95
...@@ -70,9 +70,10 @@ namespace dlib ...@@ -70,9 +70,10 @@ namespace dlib
{ {
} }
template <typename T>
rectangle ( rectangle (
const point& p1, const vector<T,2>& p1,
const point& p2 const vector<T,2>& p2
) )
{ {
*this = rectangle(p1) + rectangle(p2); *this = rectangle(p1) + rectangle(p2);
......
...@@ -90,9 +90,10 @@ namespace dlib ...@@ -90,9 +90,10 @@ namespace dlib
- #bottom() == p.y() - #bottom() == p.y()
!*/ !*/
template <typename T>
rectangle ( rectangle (
const point& p1, const vector<T,2>& p1,
const point& p2 const vector<T,2>& p2
); );
/*! /*!
ensures ensures
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment