Kaydet (Commit) 90055e3f authored tarafından Stephan Bergmann's avatar Stephan Bergmann

libmwaw: values4003 apparently contains 22 patterns, not 28

cf <https://sourceforge.net/p/libmwaw/tickets/4/>

Change-Id: Ib139992b90818838b12d51530c66498b2e2d1dc4
üst b45a12c3
From 83188cec2826a2bffdb3daf27702510c3e02edea Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@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
...@@ -16,6 +16,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libmwaw,1)) ...@@ -16,6 +16,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libmwaw,1))
$(eval $(call gb_UnpackedTarball_add_patches,libmwaw,\ $(eval $(call gb_UnpackedTarball_add_patches,libmwaw,\
external/libmwaw/0001-std-isfinite-is-C-11.patch \ external/libmwaw/0001-std-isfinite-is-C-11.patch \
external/libmwaw/0001-use-correct-type.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: # vim: set noet sw=4 ts=4:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment