mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use atan2 from std instead of glm

Browse Source 
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
This commit is contained in:
Tomaž Vajngerl
2016-04-14 16:10:23 +09:00
parent 85dd50819b
commit cb4015bb28
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
vcl/opengl/gdiimpl.cxx
View File

@@ -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;