diff options
| author | Thorsten Behrens <thb@documentfoundation.org> | 2015-02-13 14:47:26 +0100 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@suse.com> | 2015-03-20 18:26:46 +0100 |
| commit | cfdbecc90cb81a5855d0745a4f99fc2cbe80ed55 (patch) | |
| tree | 054bad0a2f8a88bb53c37ee252bb3c0840877904 | |
| parent | unintended condition (diff) | |
| download | core-feature/opengl-canvas-rework.tar.gz core-feature/opengl-canvas-rework.zip | |
Fix build for newer glm versions.
feature/opengl-canvas-rework
There were some changes in (indirect) includes.
Change-Id: I24a5c461a179b92ded5dcdc2b9a70c05b5d49843
| -rw-r--r-- | basegfx/source/tools/canvastools.cxx | 2 | ||||
| -rw-r--r-- | canvas/source/opengl/ogl_canvastools.cxx | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/basegfx/source/tools/canvastools.cxx b/basegfx/source/tools/canvastools.cxx index f59f44781a48..b4f884d43767 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 6490cff5bdf0..1a065c2e7740 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 |