* $Id$
*
* Authors: Cyril Deguet <asmax@via.ecp.fr>
- * Olivier Teulière <ipkiss@via.ecp.fr>
+ * Olivier Teulière <ipkiss@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#include <vlc/vlc.h>
# ifdef HAVE_LRINT
# define lrintf( x ) (int)rint( x )
# elif defined WIN32
- __inline long int lrintf( float x )
- {
+ __inline long int lrintf( float x )
+ {
int i;
_asm fld x __asm fistp i
- return i;
- }
+ return i;
+ }
# endif
#endif
}
-float Bezier::getMinDist( int x, int y ) const
+float Bezier::getMinDist( int x, int y, float xScale, float yScale ) const
{
int nearest = findNearestPoint( x, y );
- return sqrt( (double)((m_leftVect[nearest] - x) * (m_leftVect[nearest] - x) +
- (m_topVect[nearest] - y) * (m_topVect[nearest] - y)) );
+ double xDist = xScale * (m_leftVect[nearest] - x);
+ double yDist = yScale * (m_topVect[nearest] - y);
+ return sqrt( xDist * xDist + yDist * yDist );
}