[Libreoffice-commits] .: libmspub/libmspub-0.0.1.patch

[Fridrich Strba]

 libmspub/libmspub-0.0.1.patch |   37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

New commits:
commit 32b06bb3fdb4245718ed8674e010a55716eeaaff
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Thu Jul 12 01:54:15 2012 +0200

    Some more Windows fixes for libmspub
    
    Change-Id: Ieb87876dbe40eedf9dc57b7ef5da1d5000f4b265

diff --git a/libmspub/libmspub-0.0.1.patch b/libmspub/libmspub-0.0.1.patch
index a28169b..6cc7c5f 100644
--- a/libmspub/libmspub-0.0.1.patch
+++ b/libmspub/libmspub-0.0.1.patch
@@ -1,3 +1,40 @@
+--- misc/libmspub-0.0.1/src/lib/ColorReference.cpp	2012-07-11 15:03:45.000000000 -0600
++++ misc/build/libmspub-0.0.1/src/lib/ColorReference.cpp	2012-07-11 17:43:45.293869000 -0600
+@@ -44,13 +44,13 @@
+   return l.m_baseColor == r.m_baseColor && l.m_modifiedColor == r.m_modifiedColor;
+ }
+ 
+-// const unsigned char ColorReference::COLOR_PALETTE;
++// const unsigned char ColorReference::COLOR_PALETTE = 0x8;
+ 
+-const unsigned char ColorReference::CHANGE_INTENSITY;
++const unsigned char ColorReference::CHANGE_INTENSITY = 0x10;
+ 
+-const unsigned char ColorReference::BLACK_BASE;
++const unsigned char ColorReference::BLACK_BASE = 0x1;
+ 
+-const unsigned char ColorReference::WHITE_BASE;
++const unsigned char ColorReference::WHITE_BASE  = 0x2;
+ 
+ }
+ 
+--- misc/libmspub-0.0.1/src/lib/ColorReference.h	2012-07-11 15:03:07.000000000 -0600
++++ misc/build/libmspub-0.0.1/src/lib/ColorReference.h	2012-07-11 17:43:38.741857500 -0600
+@@ -37,10 +37,10 @@
+ {
+   unsigned m_baseColor;
+   unsigned m_modifiedColor;
+-//  static const unsigned char COLOR_PALETTE = 0x8;
+-  static const unsigned char CHANGE_INTENSITY = 0x10;
+-  static const unsigned char BLACK_BASE = 0x1;
+-  static const unsigned char WHITE_BASE  = 0x2;
++//  static const unsigned char COLOR_PALETTE;
++  static const unsigned char CHANGE_INTENSITY;
++  static const unsigned char BLACK_BASE;
++  static const unsigned char WHITE_BASE;
+   Color getRealColor(unsigned c, const std::vector<Color> &palette) const;
+ public:
+   explicit ColorReference(unsigned color) : m_baseColor(color), m_modifiedColor(color) { }
 --- misc/libmspub-0.0.1/src/lib/MSPUBCollector.cpp	2012-07-10 08:13:15.000000000 +0200
 +++ misc/build/libmspub-0.0.1/src/lib/MSPUBCollector.cpp	2012-07-12 01:29:28.154982030 +0200
 @@ -28,6 +28,7 @@