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

[Fridrich Štrba]

 src/lib/CDRCollector.cpp        |    1 +
 src/lib/CDRContentCollector.cpp |    6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit a6cf808851bfcca527011ec45e3b3f6ba4960e49
Author: Fridrich Štrba <fridrich.strba at bluewin.ch>
Date:   Thu May 21 10:39:24 2015 +0200

    RVNGBinaryData is a valid type for RVNGPropertyList value
    
    Change-Id: Icbc4c13c589dc21eac16bee83041444a6916e8d7

diff --git a/src/lib/CDRCollector.cpp b/src/lib/CDRCollector.cpp
index ae5a744..a2f2edd 100644
--- a/src/lib/CDRCollector.cpp
+++ b/src/lib/CDRCollector.cpp
@@ -9,6 +9,7 @@
 
 #include <math.h>
 #include <string.h>
+#include <lcms2.h>
 #include "CDRCollector.h"
 #include "libcdr_utils.h"
 
diff --git a/src/lib/CDRContentCollector.cpp b/src/lib/CDRContentCollector.cpp
index af26ad7..06df33b 100644
--- a/src/lib/CDRContentCollector.cpp
+++ b/src/lib/CDRContentCollector.cpp
@@ -740,7 +740,7 @@ void libcdr::CDRContentCollector::_fillProperties(librevenge::RVNGPropertyList &
             fclose(f);
           }
 #endif
-          propList.insert("draw:fill-image", image.getBase64Data());
+          propList.insert("draw:fill-image", image);
           propList.insert("librevenge:mime-type", "image/bmp");
           propList.insert("style:repeat", "repeat");
           if (m_currentFillStyle.imageFill.isRelative)
@@ -807,7 +807,7 @@ void libcdr::CDRContentCollector::_fillProperties(librevenge::RVNGPropertyList &
         {
           propList.insert("librevenge:mime-type", "image/bmp");
           propList.insert("draw:fill", "bitmap");
-          propList.insert("draw:fill-image", iterBmp->second.getBase64Data());
+          propList.insert("draw:fill-image", iterBmp->second);
           propList.insert("style:repeat", "repeat");
           if (m_currentFillStyle.imageFill.isRelative)
           {
@@ -867,7 +867,7 @@ void libcdr::CDRContentCollector::_fillProperties(librevenge::RVNGPropertyList &
         {
           propList.insert("draw:fill", "bitmap");
           propList.insert("librevenge:mime-type", "image/svg+xml");
-          propList.insert("draw:fill-image", iterVect->second.getBase64Data());
+          propList.insert("draw:fill-image", iterVect->second);
           propList.insert("style:repeat", "repeat");
           if (m_currentFillStyle.imageFill.isRelative)
           {