diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2016-04-14 16:10:23 +0900 |
|---|---|---|
| committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2016-04-14 16:16:36 +0900 |
| commit | cb4015bb28dd7430efaaa523d04a155eb7e46305 (patch) | |
| tree | 369008dd271edb40d0b3da7975743e784682efa6 | |
| parent | 85dd50819b8b736e8a791ed3f001145a0df54265 (diff) | |
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
| -rw-r--r-- | vcl/opengl/gdiimpl.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx index 8b8046f7a5fa..b8d6fb6d9c73 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; |