slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d0f4081d59e185091b2f5fbe690c885d1068a1d5
Author: Fridrich Å trba <fridrich.st...@bluewin.ch>
Date: Fri Sep 19 09:56:04 2014 +0200
Fix build with system glm by catering for explicit constructors
Change-Id: I9bb8542514aad0882935d4a347cbe452cc8fa819
diff --git
a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
index 2ccc375..86d11bf 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
@@ -687,7 +687,7 @@ inline glm::vec3 randNormVectorInXYPlane()
template<typename T>
T clamp(const T& rIn)
{
- return glm::clamp(rIn, -1.0, 1.0);
+ return glm::clamp(rIn, T(-1.0), T(1.0));
}
boost::shared_ptr<OGLTransitionImpl> makeRevolvingCircles( ::sal_uInt16
nCircles , ::sal_uInt16 nPointsOnCircles )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
