diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-07-25 16:25:00 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-07-25 16:25:22 +0200 |
| commit | e4906561219fe88345ace8aa4d6f48cbb01262d8 (patch) | |
| tree | 982c1a411f61d0884c0e0c42e27ec58f15662da2 /libcdr | |
| parent | 1ecdc7aaf661e97a33cf521f553481d79cd26de2 (diff) | |
Use the WPX_SEEK_SET inconditionally
Change-Id: I8d202d843b8ecf5a32131058ae1a5cd465e6069c
Diffstat (limited to 'libcdr')
| -rw-r--r-- | libcdr/UnpackedTarball_libcdr.mk | 4 | ||||
| -rw-r--r-- | libcdr/libcdr-wpx_seek_end.patch.1 | 14 |
2 files changed, 18 insertions, 0 deletions
diff --git a/libcdr/UnpackedTarball_libcdr.mk b/libcdr/UnpackedTarball_libcdr.mk index a91bc8e907ca..d25d241b22e6 100644 --- a/libcdr/UnpackedTarball_libcdr.mk +++ b/libcdr/UnpackedTarball_libcdr.mk @@ -11,4 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libcdr)) $(eval $(call gb_UnpackedTarball_set_tarball,libcdr,$(CDR_TARBALL))) +$(eval $(call gb_UnpackedTarball_add_patches,libcdr,\ + libcdr/libcdr-wpx_seek_end.patch.1 \ +)) + # vim: set noet sw=4 ts=4: diff --git a/libcdr/libcdr-wpx_seek_end.patch.1 b/libcdr/libcdr-wpx_seek_end.patch.1 new file mode 100644 index 000000000000..67b8587996f8 --- /dev/null +++ b/libcdr/libcdr-wpx_seek_end.patch.1 @@ -0,0 +1,14 @@ +--- a/src/lib/CDRZipStream.cpp ++++ b/src/lib/CDRZipStream.cpp +@@ -160,11 +160,7 @@ WPXInputStream *libcdr::CDRZipStream::getDocumentOLEStream(const char *name) + + bool libcdr::CDRZipStreamImpl::findCentralDirectoryEnd() + { +-#if defined(LIBWPD_STREAM_VERSION_MAJOR) && defined(LIBWPD_STREAM_VERSION_MINOR) && defined(LIBWPD_STREAM_VERSION_REVISION) \ +- && (LIBWPD_STREAM_VERSION_MAJOR > 0 || (LIBWPD_STREAM_VERSION_MAJOR == 0 && (LIBWPD_STREAM_VERSION_MINOR > 9 \ +- || (LIBWPD_STREAM_VERSION_MINOR == 9 && LIBWPD_STREAM_VERSION_REVISION >= 5)))) + if (m_cdir_offset || m_input->seek(-1024, WPX_SEEK_END)) +-#endif + m_input->seek(m_cdir_offset, WPX_SEEK_SET); + try + { |