mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix build with msvc2013

Browse Source 
Change-Id: Ic027cd02f590db06a75fdd2b23d6f67bd42f575a
This commit is contained in:
David Tardon
2014-07-07 19:39:34 +02:00
parent 0f8cf397d4
commit 56ccb184e0
2 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
external/libmwaw/0001-msvc2013-does-not-like-this.patch vendored Normal file
View File

@@ -0,0 +1,25 @@
From f61d5c4ba6812aac5539084f6b23816fbb51b132 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Mon, 7 Jul 2014 19:37:25 +0200
Subject: [PATCH] msvc2013 does not like this
---
src/lib/RagTimeParser.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/RagTimeParser.cxx b/src/lib/RagTimeParser.cxx
index 2fb8e41..0f7d9e8 100644
--- a/src/lib/RagTimeParser.cxx
+++ b/src/lib/RagTimeParser.cxx
@@ -2404,7 +2404,7 @@ bool RagTimeParser::sendPicture(int zId, MWAWPosition const &position)
}
input->seek(pict.m_pos.begin(), librevenge::RVNG_SEEK_SET);
shared_ptr<MWAWPict> thePict(MWAWPictData::get(input, pictSize));
- bool ok=thePict;
+ bool ok=bool(thePict);
if (ok) {
librevenge::RVNGBinaryData data;
std::string type;
--
1.9.3

1
external/libmwaw/UnpackedTarball_libmwaw.mk vendored
View File

@@ -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-librevenge-stream-is-optional-don-t-depend-on-it.patch \ 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/0002-librevenge-stream-is-optional-don-t-depend-on-it.patch \
external/libmwaw/0001-msvc2013-does-not-like-this.patch \
)) ))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4: