[Libreoffice-commits] libmspub.git: src/lib

[Fridrich Å trba]

 src/lib/Fill.cpp           |    4 ++--
 src/lib/MSPUBCollector.cpp |    3 ++-
 src/lib/MSPUBParser.cpp    |   20 ++++++++++----------
 3 files changed, 14 insertions(+), 13 deletions(-)

New commits:
commit c3e812fd9e15e41ca4d1dc3ff0e438c5afa05257
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Thu Nov 14 14:30:14 2013 +0100

    Adapt to API change in librevenge
    
    Change-Id: I55f75085307279ab280c3645ff4ccc993615fa90

diff --git a/src/lib/Fill.cpp b/src/lib/Fill.cpp
index dc33802..f8174ff 100644
--- a/src/lib/Fill.cpp
+++ b/src/lib/Fill.cpp
@@ -86,11 +86,11 @@ librevenge::RVNGPropertyListVector PatternFill::getProperties(librevenge::RVNGPr
       fixedImg.append(fgColor.b);
       fixedImg.append(fgColor.g);
       fixedImg.append(fgColor.r);
-      fixedImg.append('\0');
+      fixedImg.append((unsigned char)'\0');
       fixedImg.append(bgColor.b);
       fixedImg.append(bgColor.g);
       fixedImg.append(bgColor.r);
-      fixedImg.append('\0');
+      fixedImg.append((unsigned char)'\0');
       fixedImg.append(data->getDataBuffer() + 0x36 + 8, data->size() - 0x36 - 8);
       data = &fixedImg;
     }
diff --git a/src/lib/MSPUBCollector.cpp b/src/lib/MSPUBCollector.cpp
index 16d9ae7..d1f0832 100644
--- a/src/lib/MSPUBCollector.cpp
+++ b/src/lib/MSPUBCollector.cpp
@@ -944,7 +944,8 @@ void libmspub::MSPUBCollector::writeImage(double x, double y,
   props.insert("svg:width", width);
   props.insert("svg:height", height);
   props.insert("librevenge:mime-type", mimeByImgType(type));
-  m_painter->drawGraphicObject(props, blob);
+  props.insert("office:binary-data", blob);
+  m_painter->drawGraphicObject(props);
 }
 
 double libmspub::MSPUBCollector::getSpecialValue(const ShapeInfo &info, const CustomShape &shape, int arg, const std::vector<int> &adjustValues) const
diff --git a/src/lib/MSPUBParser.cpp b/src/lib/MSPUBParser.cpp
index 7282c1e..c3bf61d 100644
--- a/src/lib/MSPUBParser.cpp
+++ b/src/lib/MSPUBParser.cpp
@@ -293,23 +293,23 @@ bool libmspub::MSPUBParser::parseEscherDelay(librevenge::RVNGInputStream *input)
         }
 
         librevenge::RVNGBinaryData tmpImg;
-        tmpImg.append(0x42);
-        tmpImg.append(0x4d);
+        tmpImg.append((unsigned char)0x42);
+        tmpImg.append((unsigned char)0x4d);
 
         tmpImg.append((unsigned char)((img.size() + 14) & 0x000000ff));
         tmpImg.append((unsigned char)(((img.size() + 14) & 0x0000ff00) >> 8));
         tmpImg.append((unsigned char)(((img.size() + 14) & 0x00ff0000) >> 16));
         tmpImg.append((unsigned char)(((img.size() + 14) & 0xff000000) >> 24));
 
-        tmpImg.append(0x00);
-        tmpImg.append(0x00);
-        tmpImg.append(0x00);
-        tmpImg.append(0x00);
+        tmpImg.append((unsigned char)0x00);
+        tmpImg.append((unsigned char)0x00);
+        tmpImg.append((unsigned char)0x00);
+        tmpImg.append((unsigned char)0x00);
 
-        tmpImg.append(0x36 + 4 * numPaletteColors);
-        tmpImg.append(0x00);
-        tmpImg.append(0x00);
-        tmpImg.append(0x00);
+        tmpImg.append((unsigned char)(0x36 + 4 * numPaletteColors));
+        tmpImg.append((unsigned char)0x00);
+        tmpImg.append((unsigned char)0x00);
+        tmpImg.append((unsigned char)0x00);
         tmpImg.append(img);
         img = tmpImg;
       }