summaryrefslogtreecommitdiff
path: root/slideshow
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2016-02-20 08:20:06 -0800
committerMichael Stahl <mstahl@redhat.com>2016-02-22 17:22:00 +0100
commit013afef129d80628c3caff04999c952cf55212ee (patch)
treeddf74ae16cf6d615adcc69ee1e6676891eb88662 /slideshow
parent40f807e1129e75068f30a9fc654571f434fab88a (diff)
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@libreoffice.org> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> (cherry picked from commit a5eae091da3b9d3918a41fcbc5ff8b68dc0fd933) Signed-off-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'slideshow')
-rw-r--r--slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
index fc66cb6cba2a..39a68bc0424f 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();
}