diff options
| author | David Tardon <dtardon@redhat.com> | 2014-07-07 19:39:34 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2014-07-07 19:39:51 +0200 |
| commit | 56ccb184e0289734059d259a0ccb0fbb15d71aa7 (patch) | |
| tree | 5fdd68c3b23c84e07b6472707dc87ce784ae53a8 /external/libmwaw | |
| parent | 0f8cf397d4de28ab9e16d4d1c6ca408323d7e189 (diff) | |
fix build with msvc2013
Change-Id: Ic027cd02f590db06a75fdd2b23d6f67bd42f575a
Diffstat (limited to 'external/libmwaw')
| -rw-r--r-- | external/libmwaw/0001-msvc2013-does-not-like-this.patch | 25 | ||||
| -rw-r--r-- | external/libmwaw/UnpackedTarball_libmwaw.mk | 1 |
2 files changed, 26 insertions, 0 deletions
diff --git a/external/libmwaw/0001-msvc2013-does-not-like-this.patch b/external/libmwaw/0001-msvc2013-does-not-like-this.patch new file mode 100644 index 000000000000..691e79980803 --- /dev/null +++ b/external/libmwaw/0001-msvc2013-does-not-like-this.patch @@ -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 + diff --git a/external/libmwaw/UnpackedTarball_libmwaw.mk b/external/libmwaw/UnpackedTarball_libmwaw.mk index 6f63f2832be0..27bc24d5b028 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-msvc2013-does-not-like-this.patch \ )) # vim: set noet sw=4 ts=4: |