summaryrefslogtreecommitdiff
path: root/external/libmwaw/0001-fix-build-with-msvc.patch.1
diff options
context:
space:
mode:
Diffstat (limited to 'external/libmwaw/0001-fix-build-with-msvc.patch.1')
-rw-r--r--external/libmwaw/0001-fix-build-with-msvc.patch.154
1 files changed, 0 insertions, 54 deletions
diff --git a/external/libmwaw/0001-fix-build-with-msvc.patch.1 b/external/libmwaw/0001-fix-build-with-msvc.patch.1
deleted file mode 100644
index 95b5e0cbeb0b..000000000000
--- a/external/libmwaw/0001-fix-build-with-msvc.patch.1
+++ /dev/null
@@ -1,54 +0,0 @@
-From 01495bf788fe32723f222599e34ba1779ca3d594 Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon@redhat.com>
-Date: Fri, 24 Jun 2016 14:01:14 +0200
-Subject: [PATCH] fix build with msvc
-
----
- src/lib/CricketDrawParser.cxx | 4 ++--
- src/lib/FreeHandParser.cxx | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/lib/CricketDrawParser.cxx b/src/lib/CricketDrawParser.cxx
-index f04be91..9fe5a32 100644
---- a/src/lib/CricketDrawParser.cxx
-+++ b/src/lib/CricketDrawParser.cxx
-@@ -930,12 +930,12 @@ bool CricketDrawParser::readShape()
- MWAWBox2f box(shape.m_vertices[0], shape.m_vertices[2]);
- int angle[2] = { shape.m_angles[0], shape.m_angles[1] };
- if (box.min()[1]>box.max()[1]) {
-- std::swap<float>(box.min()[1],box.max()[1]);
-+ std::swap(box.min()[1],box.max()[1]);
- angle[0]=180-shape.m_angles[1];
- angle[1]=180-shape.m_angles[0];
- }
- if (angle[1]<=angle[0])
-- std::swap<int>(angle[0],angle[1]);
-+ std::swap(angle[0],angle[1]);
- if (angle[1]>360) {
- int numLoop=int(angle[1]/360)-1;
- angle[0]-=numLoop*360;
-diff --git a/src/lib/FreeHandParser.cxx b/src/lib/FreeHandParser.cxx
-index 78d8b08..e97e6e3 100644
---- a/src/lib/FreeHandParser.cxx
-+++ b/src/lib/FreeHandParser.cxx
-@@ -999,7 +999,7 @@ bool FreeHandParser::checkHeader(MWAWHeader *header, bool strict)
- getPageSpan().setFormOrientation(MWAWPageSpan::LANDSCAPE);
- for (int j=0; j<4; ++j) {
- if (j==1) continue;
-- std::swap<float>(dim[2*j],dim[2*j+1]);
-+ std::swap(dim[2*j],dim[2*j+1]);
- }
- val &= 0xFFDF;
- }
-@@ -1016,7 +1016,7 @@ bool FreeHandParser::checkHeader(MWAWHeader *header, bool strict)
- f << "landscape,";
- getPageSpan().setFormOrientation(MWAWPageSpan::LANDSCAPE);
- for (int j=0; j<4; ++j)
-- std::swap<float>(dim[2*j],dim[2*j+1]);
-+ std::swap(dim[2*j],dim[2*j+1]);
- }
- if (val&2) f << "crop[mark],";
- if (val&4) f << "center[mark],";
---
-2.7.4
-