[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - slideshow/source

[David Tardon]

 slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.cxx |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 832951ed5bac5800910293e29d2ccaeb7e032e72
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Oct 31 19:51:56 2016 +0100

    convert angle from degrees to radians for glm
    
    This makes simple (i.e., not implemented as a shader) OpenGL transitions
    work correctly again.
    
    (cherry picked from commit 7445399af829c48e8c71eed66f132d96fa195c37)
    
    Change-Id: I773f686089bce3611940743b1a7f5046093886e8
    Reviewed-on: https://gerrit.libreoffice.org/30449
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.cxx
index c61209f..97d8902 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.cxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.cxx
@@ -31,6 +31,8 @@
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/gtc/type_ptr.hpp>
 
+#include <basegfx/numeric/ftools.hxx>
+
 #include "OGLTrans_Operation.hxx"
 
 SRotate::SRotate(const glm::vec3& Axis, const glm::vec3& Origin,
@@ -38,7 +40,7 @@ SRotate::SRotate(const glm::vec3& Axis, const glm::vec3& Origin,
     Operation(bInter, T0, T1),
     axis(Axis),
     origin(Origin),
-    angle(Angle)
+    angle(basegfx::deg2rad(Angle))
 {
 }
 
@@ -55,7 +57,7 @@ RotateAndScaleDepthByWidth::RotateAndScaleDepthByWidth(const glm::vec3& Axis,
     Operation(bInter, T0, T1),
     axis(Axis),
     origin(Origin),
-    angle(Angle),
+    angle(basegfx::deg2rad(Angle)),
     scale(bScale)
 {
 }
@@ -65,7 +67,7 @@ RotateAndScaleDepthByHeight::RotateAndScaleDepthByHeight(const glm::vec3& Axis,
     Operation(bInter, T0, T1),
     axis(Axis),
     origin(Origin),
-    angle(Angle),
+    angle(basegfx::deg2rad(Angle)),
     scale(bScale)
 {
 }