parent
e06bd3aea4
commit
b1bbf89c42
@ -1,33 +0,0 @@
|
||||
From 4b4d879a6db69ea05b89fdf99df8cb5d902d16b6 Mon Sep 17 00:00:00 2001
|
||||
From: Roland Illig <roland.illig@gmx.de>
|
||||
Date: Tue, 19 May 2020 08:43:39 +0200
|
||||
Subject: [PATCH] add missing include for std::for_each
|
||||
|
||||
On NetBSD 8.0 x86_64, gcc complains:
|
||||
NUM3Parser.cpp: In member function 'virtual bool libetonyek::NUM3Parser::parseDocument()':
|
||||
NUM3Parser.cpp:46:3: error: 'for_each' is not a member of 'std'
|
||||
std::for_each(sheetListRefs.begin(), sheetListRefs.end(), std::bind(&NUM3Parser::parseSheet, this, std::placeholders::_1));
|
||||
|
||||
Change-Id: I723ba1bcbd10ed9215ceea8c5b224fdc5242be65
|
||||
Reviewed-on: https://gerrit.libreoffice.org/c/libetonyek/+/94450
|
||||
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
|
||||
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
|
||||
---
|
||||
src/lib/NUM3Parser.cpp | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/lib/NUM3Parser.cpp b/src/lib/NUM3Parser.cpp
|
||||
index 66fb195..c19b611 100644
|
||||
--- a/src/lib/NUM3Parser.cpp
|
||||
+++ b/src/lib/NUM3Parser.cpp
|
||||
@@ -7,6 +7,7 @@
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
*/
|
||||
|
||||
+#include <algorithm>
|
||||
#include <functional>
|
||||
|
||||
#include "NUM3Parser.h"
|
||||
--
|
||||
2.26.2
|
||||
|
@ -1,62 +0,0 @@
|
||||
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
|
||||
|
@ -1 +1 @@
|
||||
SHA512 (libetonyek-0.1.9.tar.xz) = 3f439b369d450bb1a4bdb3fe92023bda234b323cf676570f1738318c56867a97910f536280b9b164c3fdaa423a3ee669c935df75a5c700bc1530ea5b9a00391e
|
||||
SHA512 (libetonyek-0.1.10.tar.xz) = 516a14fcb7b7b5898484a4263d593a036ac728b90144da9d1c22a5d0fdffc879839e19a7b390f99d924c390d433e64433fb08939b1e04ca24359315571c5772b
|
||||
|
Loading…
Reference in new issue