summaryrefslogtreecommitdiff
path: root/libvisio/libvisio-wpx_seek_end.patch.1
diff options
context:
space:
mode:
authorFridrich Štrba <fridrich.strba@bluewin.ch>2013-07-25 16:25:00 +0200
committerDavid Tardon <dtardon@redhat.com>2013-07-25 14:38:12 +0000
commitce89313670c38328db49542a67cbda63ee20a7a6 (patch)
tree1de980815bed6f36f59cc6a100d9c32e6fdb7c3d /libvisio/libvisio-wpx_seek_end.patch.1
parent9a3d3ee99d5e751bd2cb6e64110d944f2dd6b427 (diff)
Use the WPX_SEEK_SET inconditionally
(cherry picked from commit e4906561219fe88345ace8aa4d6f48cbb01262d8) Conflicts: libcdr/UnpackedTarball_libcdr.mk libvisio/UnpackedTarball_libvisio.mk Change-Id: I8d202d843b8ecf5a32131058ae1a5cd465e6069c Reviewed-on: https://gerrit.libreoffice.org/5105 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'libvisio/libvisio-wpx_seek_end.patch.1')
-rw-r--r--libvisio/libvisio-wpx_seek_end.patch.114
1 files changed, 14 insertions, 0 deletions
diff --git a/libvisio/libvisio-wpx_seek_end.patch.1 b/libvisio/libvisio-wpx_seek_end.patch.1
new file mode 100644
index 000000000000..55bbf5719259
--- /dev/null
+++ b/libvisio/libvisio-wpx_seek_end.patch.1
@@ -0,0 +1,14 @@
+--- a/src/lib/VSDZipStream.cpp
++++ b/src/lib/VSDZipStream.cpp
+@@ -161,11 +161,7 @@ WPXInputStream *libvisio::VSDZipStream::getDocumentOLEStream(const char *name)
+
+ bool libvisio::VSDZipStreamImpl::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
+ {