diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-02-06 11:04:21 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-02-06 16:53:23 +0100 |
| commit | f842037f72d0b29411aa1e10bec89c297e887fcf (patch) | |
| tree | 8fb5d81476c4ac1a5483473eeddc820952493a4b /external | |
| parent | 3946711b03409909333bdb37d40b23a9ae9a34dc (diff) | |
backport glm v0.9.9.0 fix for libetonyek
Change-Id: Id21bd6f5c80e79cad653093090a96d066c56c7e6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88092
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/libetonyek/UnpackedTarball_libetonyek.mk | 1 | ||||
| -rw-r--r-- | external/libetonyek/glm-force-dmat3-initialization-needed-from-v0.9.9.0.patch.1 | 62 |
2 files changed, 63 insertions, 0 deletions
diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk b/external/libetonyek/UnpackedTarball_libetonyek.mk index cd7a30e8adea..5e7780deb7ea 100644 --- a/external/libetonyek/UnpackedTarball_libetonyek.mk +++ b/external/libetonyek/UnpackedTarball_libetonyek.mk @@ -16,6 +16,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libetonyek,0)) $(eval $(call gb_UnpackedTarball_update_autoconf_configs,libetonyek)) $(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\ + external/libetonyek/glm-force-dmat3-initialization-needed-from-v0.9.9.0.patch.1 \ external/libetonyek/win_build.patch.1 \ external/libetonyek/ubsan.patch \ external/libetonyek/rpath.patch \ diff --git a/external/libetonyek/glm-force-dmat3-initialization-needed-from-v0.9.9.0.patch.1 b/external/libetonyek/glm-force-dmat3-initialization-needed-from-v0.9.9.0.patch.1 new file mode 100644 index 000000000000..1add51828ce2 --- /dev/null +++ b/external/libetonyek/glm-force-dmat3-initialization-needed-from-v0.9.9.0.patch.1 @@ -0,0 +1,62 @@ +From 548c2735c09570726f08d5ae9fee8efefb54d529 Mon Sep 17 00:00:00 2001 +From: osnola <alonso@loria.fr> +Date: Sun, 31 Mar 2019 09:34:11 +0200 +Subject: [PATCH] glm: force dmat3 initialization (needed from v0.9.9.0) + +Change-Id: I2cb285f2d9bc1e9818ed946b38caaf8a5de9e61a +Reviewed-on: https://gerrit.libreoffice.org/69993 +Reviewed-by: Laurent Alonso(fr) <alonso.laurent@gmail.com> +Tested-by: Laurent Alonso(fr) <alonso.laurent@gmail.com> +--- + src/lib/IWORKCollector.cpp | 6 +++--- + src/lib/KEYCollector.cpp | 3 +-- + 2 files changed, 4 insertions(+), 5 deletions(-) + +diff --git a/src/lib/IWORKCollector.cpp b/src/lib/IWORKCollector.cpp +index 41a9c79..794b462 100644 +--- a/src/lib/IWORKCollector.cpp ++++ b/src/lib/IWORKCollector.cpp +@@ -183,8 +183,8 @@ private: + IWORKCollector::Level::Level() + : m_geometry() + , m_graphicStyle() +- , m_trafo() +- , m_previousTrafo() ++ , m_trafo(1) ++ , m_previousTrafo(1) + { + } + +@@ -601,7 +601,7 @@ void IWORKCollector::startLevel() + return; + } + +- glm::dmat3 currentTrafo, prevTrafo; ++ glm::dmat3 currentTrafo(1), prevTrafo(1); + if (!m_levelStack.empty()) + { + currentTrafo = m_levelStack.top().m_trafo; +diff --git a/src/lib/KEYCollector.cpp b/src/lib/KEYCollector.cpp +index a9d8cc3..08e7e69 100644 +--- a/src/lib/KEYCollector.cpp ++++ b/src/lib/KEYCollector.cpp +@@ -167,7 +167,7 @@ void KEYCollector::insertTextPlaceholder(const KEYPlaceholderPtr_t &placeholder) + { + if (bool(placeholder)) + { +- glm::dmat3 trafo; ++ glm::dmat3 trafo(1); + if (bool(placeholder->m_geometry)) + trafo = makeTransformation(*placeholder->m_geometry); + trafo *= m_levelStack.top().m_trafo; +@@ -417,7 +417,6 @@ void KEYCollector::drawTextBox(const IWORKTextPtr_t &text, const glm::dmat3 &tra + double w = boundingBox->m_naturalSize.m_width; + double h = boundingBox->m_naturalSize.m_height; + vec = trafo * glm::dvec3(w, h, 0); +- + if (vec[0]>0) + props.insert("svg:width", pt2in(vec[0])); + if (vec[1]>0) +-- +2.24.1 + |