Removes trailing spaces. Removes tabs.

[vlc] / modules / gui / skins2 / utils / bezier.cpp

diff --git a/modules/gui/skins2/utils/bezier.cpp b/modules/gui/skins2/utils/bezier.cpp
index fd4f6210e7012ec48ef425fd3466d3f1594c369d..e15fa20d586edc5b2949135510063ba6f55c08db 100644 (file)
--- a/modules/gui/skins2/utils/bezier.cpp
+++ b/modules/gui/skins2/utils/bezier.cpp
@@ -1,11 +1,11 @@
 /*****************************************************************************
  * bezier.cpp
  *****************************************************************************
- * Copyright (C) 2003 VideoLAN
- * $Id: bezier.cpp,v 1.3 2004/02/01 21:13:04 ipkiss Exp $
+ * Copyright (C) 2003 the VideoLAN team
+ * $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
@@ -19,24 +19,38 @@
  *
  * 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>
 #include "bezier.hpp"
 #include <math.h>
 
+// XXX should be in VLC core
+#ifndef HAVE_LRINTF
+#   ifdef HAVE_LRINT
+#       define lrintf( x ) (int)rint( x )
+#   elif defined WIN32
+        __inline long int lrintf( float x )
+        {
+            int i;
+            _asm fld x __asm fistp i
+            return i;
+        }
+#   endif
+#endif
 
 Bezier::Bezier( intf_thread_t *p_intf, const vector<float> &rAbscissas,
                 const vector<float> &rOrdinates, Flag_t flag )
     : SkinObject( p_intf )
 {
-    // We expect rAbscissas and rOrdinates to have the same size, of course
-    m_nbCtrlPt = rAbscissas.size();
-
     // Copy the control points coordinates
     m_ptx.assign( rAbscissas.begin(), rAbscissas.end() );
     m_pty.assign( rOrdinates.begin(), rOrdinates.end() );
 
+    // We expect m_ptx and m_pty to have the same size, of course
+    m_nbCtrlPt = m_ptx.size();
+
     // Precalculate the factoriels
     m_ft.push_back( 1 );
     for( int i = 1; i < m_nbCtrlPt; i++ )
@@ -44,18 +58,16 @@ Bezier::Bezier( intf_thread_t *p_intf, const vector<float> &rAbscissas,
         m_ft.push_back( i * m_ft[i - 1] );
     }
 
-    // Initialization
-    int cx, cy, oldx, oldy;
-    m_leftVect.reserve( MAX_BEZIER_POINT + 1 );
-    m_topVect.reserve( MAX_BEZIER_POINT + 1 );
-
     // Calculate the first point
+    int oldx, oldy;
     computePoint( 0, oldx, oldy );
-    m_leftVect[0] = oldx;
-    m_topVect[0]  = oldy;
+    m_leftVect.push_back( oldx );
+    m_topVect.push_back( oldy );
+    m_percVect.push_back( 0 );
 
     // Calculate the other points
     float percentage;
+    int cx, cy;
     for( float j = 1; j <= MAX_BEZIER_POINT; j++ )
     {
         percentage = j / MAX_BEZIER_POINT;
@@ -71,9 +83,19 @@ Bezier::Bezier( intf_thread_t *p_intf, const vector<float> &rAbscissas,
             oldy = cy;
         }
     }
-    m_nbPoints = m_percVect.size();
+    m_nbPoints = m_leftVect.size();
+
+    // If we have only one control point, we duplicate it
+    // This allows to simplify the algorithms used in the class
+    if( m_nbPoints == 1 )
+    {
+        m_leftVect.push_back( m_leftVect[0] );
+        m_topVect.push_back( m_topVect[0] );
+        m_percVect.push_back( 1 );
+        m_nbPoints = 2;
+   }
 
-    // Small hack to ensure that the percentage of the last point is always 1
+    // Ensure that the percentage of the last point is always 1
     m_percVect[m_nbPoints - 1] = 1;
 }
 
@@ -85,11 +107,12 @@ float Bezier::getNearestPercent( int x, int y ) const
 }
 
 
-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( (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 );
 }
 
 
@@ -121,9 +144,9 @@ int Bezier::getWidth() const
     int width = 0;
     for( int i = 0; i < m_nbPoints; i++ )
     {
-        if( m_leftVect[i] > width )
+        if( m_leftVect[i] >= width )
         {
-            width = m_leftVect[i];
+            width = m_leftVect[i] + 1;
         }
     }
     return width;
@@ -135,9 +158,9 @@ int Bezier::getHeight() const
     int height = 0;
     for( int i = 0; i < m_nbPoints; i++ )
     {
-        if( m_topVect[i] > height )
+        if( m_topVect[i] >= height )
         {
-            height = m_topVect[i];
+            height = m_topVect[i] + 1;
         }
     }
     return height;
@@ -181,10 +204,8 @@ void Bezier::computePoint( float t, int &x, int &y ) const
         yPos += m_pty[i] * coeff;
     }
 
-    // Float cast to avoid strange truncatures
-    // XXX: not very nice...
-    x = (int)(float)xPos;
-    y = (int)(float)yPos;
+    x = lrintf(xPos);
+    y = lrintf(yPos);
 }
 
 
@@ -202,4 +223,3 @@ inline float Bezier::power( float x, int n ) const
     else
         return 1;
 }
-