[Libreoffice-commits] core.git: external/libmwaw

[Stephan Bergmann]

 external/libmwaw/0001-values4003-apparently-contains-22-patterns-not-28.patch |   29 ++++++++++
 external/libmwaw/UnpackedTarball_libmwaw.mk                                   |    1 
 2 files changed, 30 insertions(+)

New commits:
commit 90055e3f22d737c31f65a5a84cdd9a31664ac382
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Apr 24 10:54:30 2014 +0200

    libmwaw: values4003 apparently contains 22 patterns, not 28
    
    cf <https://sourceforge.net/p/libmwaw/tickets/4/>
    
    Change-Id: Ib139992b90818838b12d51530c66498b2e2d1dc4

diff --git a/external/libmwaw/0001-values4003-apparently-contains-22-patterns-not-28.patch b/external/libmwaw/0001-values4003-apparently-contains-22-patterns-not-28.patch
new file mode 100644
index 0000000..c06de94
--- /dev/null
+++ b/external/libmwaw/0001-values4003-apparently-contains-22-patterns-not-28.patch
@@ -0,0 +1,29 @@
+From 83188cec2826a2bffdb3daf27702510c3e02edea Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <sbergman at redhat.com>
+Date: Thu, 24 Apr 2014 10:40:05 +0200
+Subject: [PATCH] values4003 apparently contains 22 patterns, not 28
+
+(cherry picked from commit c2ee6f30deb497dcf0ffa18a7ade603f398d889f)
+
+Conflicts:
+	src/lib/MSKGraph.cxx
+---
+ src/lib/MSKGraph.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/lib/MSKGraph.cxx b/src/lib/MSKGraph.cxx
+index 7c1a9f6..f32d7c6 100644
+--- a/src/lib/MSKGraph.cxx
++++ b/src/lib/MSKGraph.cxx
+@@ -728,7 +728,7 @@ void State::initPatterns(int vers)
+     0x55ff, 0x55ff, 0x55ff, 0x55ff,  0x55ff, 0xeeff, 0x55ff, 0xbbff,  0x77ff, 0xddff, 0x77ff, 0xddff,  0x7fff, 0xf7ff, 0x7fff, 0xf7ff,
+     0x7fff, 0xffff, 0xf7ff, 0xffff,  0xffff, 0xffff, 0xffff, 0xffff
+   };
+-  m_rsrcPatternsMap.insert(std::map<long, Patterns>::value_type(4003,Patterns(28, values4003)));
++  m_rsrcPatternsMap.insert(std::map<long, Patterns>::value_type(4003,Patterns(22, values4003)));
+   static uint16_t const (values4004[]) = {
+     0xf0f0, 0xf0f0, 0x0f0f, 0x0f0f,  0xcccc, 0x3333, 0xcccc, 0x3333,  0x3333, 0xcccc, 0x3333, 0xcccc
+   };
+-- 
+1.9.0
+
diff --git a/external/libmwaw/UnpackedTarball_libmwaw.mk b/external/libmwaw/UnpackedTarball_libmwaw.mk
index efd8797..44fa61f 100644
--- a/external/libmwaw/UnpackedTarball_libmwaw.mk
+++ b/external/libmwaw/UnpackedTarball_libmwaw.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libmwaw,1))
 $(eval $(call gb_UnpackedTarball_add_patches,libmwaw,\
 	external/libmwaw/0001-std-isfinite-is-C-11.patch \
 	external/libmwaw/0001-use-correct-type.patch \
+	external/libmwaw/0001-values4003-apparently-contains-22-patterns-not-28.patch \
 ))
 
 # vim: set noet sw=4 ts=4: