summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFridrich Štrba <fridrich.strba@bluewin.ch>2013-07-25 15:42:18 +0200
committerFridrich Štrba <fridrich.strba@bluewin.ch>2013-07-25 15:42:18 +0200
commit6fdf57fb028536659727b681a335823189576c14 (patch)
tree50f1e7cab21cc2fd2e93c380837bf77f82d81eb8
parent746fdbc6e6a6f41238dd19f8e20ed48192e86aad (diff)
Hard depend on libwpd 0.9.5
-rw-r--r--configure.ac4
-rw-r--r--src/lib/VSDZipStream.cpp4
2 files changed, 2 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac
index 77bbe05..b310448 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,8 +58,8 @@ AC_SUBST(GPERF)
# Find additional apps
# ====================
PKG_CHECK_MODULES([WPD],[
- libwpd-0.9
- libwpd-stream-0.9
+ libwpd-0.9 >= 0.9.5
+ libwpd-stream-0.9 >= 0.9.5
])
PKG_CHECK_MODULES([WPG],[
diff --git a/src/lib/VSDZipStream.cpp b/src/lib/VSDZipStream.cpp
index f00f906..3b3e08a 100644
--- 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
{