[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - external/libmwaw

[David Tardon]

 external/libmwaw/0001-initialize-image-data.patch |   25 ++++++++++++++++++++++
 external/libmwaw/UnpackedTarball_libmwaw.mk       |    1 
 2 files changed, 26 insertions(+)

New commits:
commit 86863a85935516192b751bb07826fbc5487694f6
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Nov 20 12:13:56 2014 +0100

    make libmwaw unit tests valgrind-clean
    
    Change-Id: I4bb8a1810f484f7b991e1eb3791f69cb9b744363
    Reviewed-on: https://gerrit.libreoffice.org/12984
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/external/libmwaw/0001-initialize-image-data.patch b/external/libmwaw/0001-initialize-image-data.patch
new file mode 100644
index 0000000..ae188583
--- /dev/null
+++ b/external/libmwaw/0001-initialize-image-data.patch
@@ -0,0 +1,25 @@
+From 091ef2d999916d3578111af40f32bf5d92759883 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon at redhat.com>
+Date: Thu, 5 Jun 2014 10:17:17 -0400
+Subject: [PATCH] initialize image data
+
+valgrind complains on that on SuperPaint/1.0/paint1.sp.hqx test file.
+---
+ src/lib/MWAWPictBitmap.hxx | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/lib/MWAWPictBitmap.hxx b/src/lib/MWAWPictBitmap.hxx
+index fe366de..666ec34 100644
+--- a/src/lib/MWAWPictBitmap.hxx
++++ b/src/lib/MWAWPictBitmap.hxx
+@@ -58,6 +58,7 @@ public:
+   MWAWPictBitmapContainer(Vec2i const &sz) : m_size(sz), m_data(0L)
+   {
+     if (m_size[0]*m_size[1] != 0) m_data = new T[size_t(m_size[0]*m_size[1])];
++    std::uninitialized_fill_n(m_data, m_size[0] * m_size[1], T());
+   }
+   //! destructor
+   virtual ~MWAWPictBitmapContainer()
+-- 
+2.1.0
+
diff --git a/external/libmwaw/UnpackedTarball_libmwaw.mk b/external/libmwaw/UnpackedTarball_libmwaw.mk
index 6f63f28..ec1b248 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-librevenge-stream-is-optional-don-t-depend-on-it.patch \
 	external/libmwaw/0002-librevenge-stream-is-optional-don-t-depend-on-it.patch \
+	external/libmwaw/0001-initialize-image-data.patch \
 ))
 
 # vim: set noet sw=4 ts=4: