[Libreoffice-commits] core.git: vcl/opengl

[Tomaž Vajngerl]

 vcl/opengl/gdiimpl.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit cb4015bb28dd7430efaaa523d04a155eb7e46305
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date:   Thu Apr 14 16:10:23 2016 +0900

    use atan2 from std instead of glm
    
    Some system glm libs don't (yet) have atan2 available and it is not
    really needed in this case anyway (as we don't use it for glm::vec2
    for example) so just replace it with std::atan2.
    
    Change-Id: I5d417338ec167489f0252821650c64be454cca8a

diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 8b8046f..b8d6fb6 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -39,7 +39,6 @@
 
 #include <glm/gtc/type_ptr.hpp>
 #include <glm/gtx/norm.hpp>
-#include <glm/gtx/compatibility.hpp>
 
 #include <stdlib.h>
 
@@ -869,7 +868,7 @@ void OpenGLSalGraphicsImpl::DrawPolyLine(const basegfx::B2DPolygon& rPolygon, fl
 
             if (eLineJoin == basegfx::B2DLineJoin::Miter)
             {
-                float angle = glm::atan2(previousLineVector.x * nextLineVector.y - previousLineVector.y * nextLineVector.x,
+                float angle = std::atan2(previousLineVector.x * nextLineVector.y - previousLineVector.y * nextLineVector.x,
                                          previousLineVector.x * nextLineVector.x + previousLineVector.y * nextLineVector.y);
 
                 angle = (F_PI - std::fabs(angle)) / F_PI180;