diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2014-09-19 09:56:04 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2014-09-19 09:56:23 +0200 |
| commit | d0f4081d59e185091b2f5fbe690c885d1068a1d5 (patch) | |
| tree | 641153df55587668cad6755ff5810bef5ece1d76 /slideshow | |
| parent | e9645402b1e5aaf399aed68fe961fe6ebdb2df1e (diff) | |
Fix build with system glm by catering for explicit constructors
Change-Id: I9bb8542514aad0882935d4a347cbe452cc8fa819
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx index 2ccc375e31b0..86d11bf58c9b 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 ) |