From 46e53c0360a38f620cf8c86fd0a3dc46c8238e0e Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Wed, 5 Feb 2020 23:26:19 +0100
Subject: Revert "upgrade to latest glm"

This reverts commit 494092dc0c2f6fd04dbd973d6f76f1df720dbcf7.  For reasons that
are still unclear, it appears to be the cause for CppunitTest_vcl_pdfexport
often (but not always) failing in Windows debug buidls, both --disable-64-bit
and --enable-64-bit.  At least the 32 bit builds seem to all fail with

> Assertion failed: false && "out of range", file ...\include\tools/bigint.hxx, line 146

Change-Id: I472a83fa709e79f7a6bf00b118c041cbc7500e6a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88069
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
---
 slideshow/source/engine/opengl/Operation.cxx      | 4 ++--
 slideshow/source/engine/opengl/TransitionImpl.cxx | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'slideshow/source')

diff --git a/slideshow/source/engine/opengl/Operation.cxx b/slideshow/source/engine/opengl/Operation.cxx
index e70f203edad7..6789fcc5ae6c 100644
--- a/slideshow/source/engine/opengl/Operation.cxx
+++ b/slideshow/source/engine/opengl/Operation.cxx
@@ -28,11 +28,11 @@
 
 #include <sal/config.h>
 
-#include <basegfx/numeric/ftools.hxx>
-
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/gtc/type_ptr.hpp>
 
+#include <basegfx/numeric/ftools.hxx>
+
 #include "Operation.hxx"
 
 SRotate::SRotate(const glm::vec3& Axis, const glm::vec3& Origin,
diff --git a/slideshow/source/engine/opengl/TransitionImpl.cxx b/slideshow/source/engine/opengl/TransitionImpl.cxx
index d1926ab854f9..5078a8c23bfd 100644
--- a/slideshow/source/engine/opengl/TransitionImpl.cxx
+++ b/slideshow/source/engine/opengl/TransitionImpl.cxx
@@ -37,8 +37,8 @@
 
 #include <comphelper/random.hxx>
 
-#include "Operation.hxx"
 #include "TransitionImpl.hxx"
+#include "Operation.hxx"
 #include <math.h>
 
 TransitionScene::TransitionScene(TransitionScene const& rOther)
-- 
cgit v1.2.3