[vlc-commits] commit: Ambiguity between std::log(double) and std::log(float) ( Francois Cartegnie )

git at videolan.org git at videolan.org
Fri Jun 18 09:16:39 CEST 2010


vlc/vlc-1.1 | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Mon Jun 14 18:36:53 2010 +0200| [f6e1a870b7e1170bd9609beec9f948ca788b59b7] | committer: Jean-Baptiste Kempf 

Ambiguity between std::log(double) and std::log(float)

Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>
(cherry picked from commit b72555737405cb4f31071ee28367ba42d3150ce7)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=f6e1a870b7e1170bd9609beec9f948ca788b59b7
---

 modules/gui/qt4/components/interface_widgets.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp
index 104291f..c930277 100644
--- a/modules/gui/qt4/components/interface_widgets.cpp
+++ b/modules/gui/qt4/components/interface_widgets.cpp
@@ -428,7 +428,7 @@ void SpeedControlWidget::updateControls( float rate )
         return;
     }
 
-    double value = 17 * log( rate ) / log( 2 );
+    double value = 17 * log( rate ) / log( 2. );
     int sliderValue = (int) ( ( value > 0 ) ? value + .5 : value - .5 );
 
     if( sliderValue < speedSlider->minimum() )



More information about the vlc-commits mailing list