[Libreoffice-commits] core.git: Branch 'feature/opengl-canvas-rework' - basegfx/source canvas/source

[Thorsten Behrens]

 basegfx/source/tools/canvastools.cxx     |    2 ++
 canvas/source/opengl/ogl_canvastools.cxx |    1 +
 2 files changed, 3 insertions(+)

New commits:
commit cfdbecc90cb81a5855d0745a4f99fc2cbe80ed55
Author: Thorsten Behrens <thb at documentfoundation.org>
Date:   Fri Feb 13 14:47:26 2015 +0100

    Fix build for newer glm versions.
    
    There were some changes in (indirect) includes.
    
    Change-Id: I24a5c461a179b92ded5dcdc2b9a70c05b5d49843

diff --git a/basegfx/source/tools/canvastools.cxx b/basegfx/source/tools/canvastools.cxx
index f59f447..b4f884d 100644
--- a/basegfx/source/tools/canvastools.cxx
+++ b/basegfx/source/tools/canvastools.cxx
@@ -49,6 +49,8 @@
 #include <basegfx/tools/canvastools.hxx>
 #include <limits>
 
+#include <glm/glm.hpp>
+
 using namespace ::com::sun::star;
 
 namespace basegfx
diff --git a/canvas/source/opengl/ogl_canvastools.cxx b/canvas/source/opengl/ogl_canvastools.cxx
index 6490cff..1a065c2 100644
--- a/canvas/source/opengl/ogl_canvastools.cxx
+++ b/canvas/source/opengl/ogl_canvastools.cxx
@@ -21,6 +21,7 @@
 #include <com/sun/star/rendering/ARGBColor.hpp>
 
 #include <GL/glew.h>
+#include <glm/gtc/type_ptr.hpp>
 
 //subdivision count of bezier segments
 #define COUNT_OF_ADAPTIVE_SUBDIVISION 40