Kaydet (Commit) 710eb05b authored tarafından Fridrich Štrba's avatar Fridrich Štrba

Uploading libvisio 0.0.31, fixing fdo#68477

Base64 decoding in some boost versions throws on padding characters

Change-Id: I9a9a43c2a7e55b6a6fca085302eae223bc8c1b13
üst 4a8f7ddc
...@@ -4,8 +4,8 @@ MSPUB_MD5SUM := 1120705cd0f0d9bd5506360bf57b6c2e ...@@ -4,8 +4,8 @@ MSPUB_MD5SUM := 1120705cd0f0d9bd5506360bf57b6c2e
export MSPUB_TARBALL := libmspub-0.0.6.tar.bz2 export MSPUB_TARBALL := libmspub-0.0.6.tar.bz2
MWAW_MD5SUM := 2289bb137bbba9b473ce60168895c036 MWAW_MD5SUM := 2289bb137bbba9b473ce60168895c036
export MWAW_TARBALL := libmwaw-0.1.10.tar.bz2 export MWAW_TARBALL := libmwaw-0.1.10.tar.bz2
VISIO_MD5SUM := 9d9eb3ae6bee763c161228b2b12e25f8 VISIO_MD5SUM := 82628333418f101a20cd21f980cf9f40
export VISIO_TARBALL := libvisio-0.0.30.tar.bz2 export VISIO_TARBALL := libvisio-0.0.31.tar.bz2
FIREBIRD_MD5SUM := 21154d2004e025c8a3666625b0357bb5 FIREBIRD_MD5SUM := 21154d2004e025c8a3666625b0357bb5
export FIREBIRD_TARBALL := Firebird-2.5.2.26540-0.tar.bz2 export FIREBIRD_TARBALL := Firebird-2.5.2.26540-0.tar.bz2
# FIREBIRD_MD5SUM := b259c2d1c60a03bd104108405ae990a7 # FIREBIRD_MD5SUM := b259c2d1c60a03bd104108405ae990a7
......
...@@ -11,9 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libvisio)) ...@@ -11,9 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libvisio))
$(eval $(call gb_UnpackedTarball_set_tarball,libvisio,$(VISIO_TARBALL))) $(eval $(call gb_UnpackedTarball_set_tarball,libvisio,$(VISIO_TARBALL)))
$(eval $(call gb_UnpackedTarball_add_patches,libvisio,\
libvisio/libvisio-0.0.30-msvc.patch.1 \
libvisio/libvisio-wpx_seek_end.patch.1 \
))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
--- a/src/lib/VSDContentCollector.cpp
+++ b/src/lib/VSDContentCollector.cpp
@@ -655,7 +655,8 @@ void libvisio::VSDContentCollector::_flushText()
{
// Insert duplicate
std::vector<VSDCharStyle>::iterator charIt = m_charFormats.begin() + charIndex;
- m_charFormats.insert(charIt, m_charFormats[charIndex]);
+ VSDCharStyle tmpCharFormat = m_charFormats[charIndex];
+ m_charFormats.insert(charIt, tmpCharFormat);
m_charFormats[charIndex].charCount = paraCharCount;
m_charFormats[charIndex+1].charCount -= paraCharCount;
}
--- 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
{
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment