[Libreoffice-commits] core.git: slideshow/source

[Norbert Thiebaud]

 slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx |   12 +++++-----
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit a5eae091da3b9d3918a41fcbc5ff8b68dc0fd933
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Feb 20 08:20:06 2016 -0800

    WaE unqualifed float literal are double
    
    1.0 - float => double  which then trigger a warning when implicitely
    downcasted to float
    
    Change-Id: Ic48f753e7ccf834fd36ff1b26d315b1267a15955
    Reviewed-on: https://gerrit.libreoffice.org/22594
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>

diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
index 43184c5..86e1131 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
@@ -2150,9 +2150,9 @@ void HoneycombTransition::displaySlides_( double nTime, sal_Int32 glLeavingSlide
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
     glUniform1f(mnShadowLocation, 1.0);
     glUniform1f(maSelectedTextureLocation, 1.0);
-    glUniform1f(maHexagonSizeLocation, 1.0 - borderSize);
+    glUniform1f(maHexagonSizeLocation, 1.0f - borderSize);
     displaySlide(nTime, glLeavingSlideTex, getScene().getLeavingSlide(), SlideWidthScale, SlideHeightScale);
-    glUniform1f(maHexagonSizeLocation, 1.0 + borderSize);
+    glUniform1f(maHexagonSizeLocation, 1.0f + borderSize);
     displaySlide(nTime, glLeavingSlideTex, getScene().getLeavingSlide(), SlideWidthScale, SlideHeightScale);
 
     // The back (entering) slide needs to be drawn before the front (leaving) one in order for blending to work.
@@ -2160,14 +2160,14 @@ void HoneycombTransition::displaySlides_( double nTime, sal_Int32 glLeavingSlide
     glBindFramebuffer(GL_FRAMEBUFFER, 0);
     glUniform1f(mnShadowLocation, 0.0);
     glUniform1f(maSelectedTextureLocation, 0.0);
-    glUniform1f(maHexagonSizeLocation, 1.0 - borderSize);
+    glUniform1f(maHexagonSizeLocation, 1.0f - borderSize);
     displaySlide(nTime, glEnteringSlideTex, getScene().getEnteringSlide(), SlideWidthScale, SlideHeightScale);
-    glUniform1f(maHexagonSizeLocation, 1.0 + borderSize);
+    glUniform1f(maHexagonSizeLocation, 1.0f + borderSize);
     displaySlide(nTime, glEnteringSlideTex, getScene().getEnteringSlide(), SlideWidthScale, SlideHeightScale);
     glUniform1f(maSelectedTextureLocation, 1.0);
-    glUniform1f(maHexagonSizeLocation, 1.0 - borderSize);
+    glUniform1f(maHexagonSizeLocation, 1.0f - borderSize);
     displaySlide(nTime, glLeavingSlideTex, getScene().getLeavingSlide(), SlideWidthScale, SlideHeightScale);
-    glUniform1f(maHexagonSizeLocation, 1.0 + borderSize);
+    glUniform1f(maHexagonSizeLocation, 1.0f + borderSize);
     displaySlide(nTime, glLeavingSlideTex, getScene().getLeavingSlide(), SlideWidthScale, SlideHeightScale);
     CHECK_GL_ERROR();
 }