[Libreoffice-commits] libvisio.git: 2 commits - configure.ac src/lib
configure.ac|4 ++-- src/lib/VSDContentCollector.cpp |6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) New commits: commit b467040741d865b97035205ac0f77986be4a0fe7 Author: David Tardon Date: Fri Jun 2 10:01:53 2017 +0200 disable -Werror by default Change-Id: Iffc50c0ef2d3d2fd193875ded0326610eab85537 diff --git a/configure.ac b/configure.ac index 8b7167b..b635e1c 100644 --- a/configure.ac +++ b/configure.ac @@ -233,9 +233,9 @@ AS_IF([test $platform_win32 = yes], # Check for cflags # AC_ARG_ENABLE([werror], - [AS_HELP_STRING([--disable-werror], [Treat all warnings as errors, useful for development])], + [AS_HELP_STRING([--enable-werror], [Treat all warnings as errors, useful for development])], [enable_werror="$enableval"], - [enable_werror=yes] + [enable_werror=no] ) AS_IF([test x"$enable_werror" != "xno"], [ CFLAGS="$CFLAGS -Werror" commit 7789cba30b3f3a2554d8d047aad6d953a50aea3b Author: David Tardon Date: Fri Jun 2 10:00:51 2017 +0200 WaE: fix name collision with Boost.Spirit Change-Id: I2293dce01e402ea0798213df215989662ee44aaf diff --git a/src/lib/VSDContentCollector.cpp b/src/lib/VSDContentCollector.cpp index 51484a3..26c1322 100644 --- a/src/lib/VSDContentCollector.cpp +++ b/src/lib/VSDContentCollector.cpp @@ -3555,13 +3555,13 @@ bool libvisio::VSDContentCollector::parseFormatId(const char *formatString, unsi result = 0x; - uint_parser ushort_; + uint_parser ushort5; auto first = formatString; const auto last = first + strlen(formatString); if (phrase_parse(first, last, ( - "{<" >> ushort_ >> ">}" - | "esc(" >> ushort_ >> ')' + "{<" >> ushort5 >> ">}" + | "esc(" >> ushort5 >> ')' ), space, result)) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libvisio.git: 2 commits - configure.ac src/lib
configure.ac |1 + src/lib/libvisio_utils.cpp |9 ++--- src/lib/libvisio_utils.h |2 +- 3 files changed, 8 insertions(+), 4 deletions(-) New commits: commit 688aa1eb357b41e26d0a12f0d34dca426a50feb7 Author: Fridrich Å trba Date: Sat Jul 6 15:05:45 2013 +0200 Proper fix for older boost and remove_whitespace diff --git a/src/lib/libvisio_utils.cpp b/src/lib/libvisio_utils.cpp index 42e2adc..88bd2b8 100644 --- a/src/lib/libvisio_utils.cpp +++ b/src/lib/libvisio_utils.cpp @@ -123,14 +123,15 @@ double libvisio::readDouble(WPXInputStream *input) return tmpUnion.d; } -void libvisio::appendFromBase64(WPXBinaryData &data, const unsigned char *base64String, size_t base64StringLength) +void libvisio::appendFromBase64(WPXBinaryData &data, const unsigned char *base64Data, size_t base64DataLength) { + std::string base64String((const char*)base64Data, base64DataLength); typedef boost::archive::iterators::transform_width< boost::archive::iterators::binary_from_base64< - boost::archive::iterators::remove_whitespace< const char * > >, 8, 6 > base64_decoder; + boost::archive::iterators::remove_whitespace< std::string::const_iterator > >, 8, 6 > base64_decoder; std::vector buffer; - std::copy(base64_decoder(base64String), base64_decoder(base64String + base64StringLength), std::back_inserter(buffer)); + std::copy(base64_decoder(base64String.begin()), base64_decoder(base64String.end()), std::back_inserter(buffer)); if (!buffer.empty()) data.append(&buffer[0], buffer.size()); diff --git a/src/lib/libvisio_utils.h b/src/lib/libvisio_utils.h index 2298907..3cd6afa 100644 --- a/src/lib/libvisio_utils.h +++ b/src/lib/libvisio_utils.h @@ -98,7 +98,7 @@ uint64_t readU64(WPXInputStream *input); double readDouble(WPXInputStream *input); -void appendFromBase64(WPXBinaryData &data, const unsigned char *base64String, size_t base64StringLength); +void appendFromBase64(WPXBinaryData &data, const unsigned char *base64Data, size_t base64DataLength); const ::WPXString getColourString(const Colour &c); commit 0cde479e62ce80a8a619f2e11b77f7f64b970802 Author: Fridrich Å trba Date: Sat Jul 6 14:29:41 2013 +0200 Revert "Some older versions of boost have a buggy remove_whitespace and original code was not removing either" This reverts commit 6fe924aae90c7aed8a3ad6e172a90a341f7a82ca. diff --git a/configure.ac b/configure.ac index c560c1d..dd12566 100644 --- a/configure.ac +++ b/configure.ac @@ -112,6 +112,7 @@ AC_CHECK_HEADERS( boost/optional.hpp \ boost/spirit/include/classic.hpp \ boost/archive/iterators/binary_from_base64.hpp \ + boost/archive/iterators/remove_whitespace.hpp \ boost/archive/iterators/transform_width.hpp, [], [AC_MSG_ERROR(Required boost headers not found. install boost >= 1.36)], diff --git a/src/lib/libvisio_utils.cpp b/src/lib/libvisio_utils.cpp index 8978385..42e2adc 100644 --- a/src/lib/libvisio_utils.cpp +++ b/src/lib/libvisio_utils.cpp @@ -33,6 +33,7 @@ #include "libvisio_utils.h" #include +#include #include uint8_t libvisio::readU8(WPXInputStream *input) @@ -125,7 +126,8 @@ double libvisio::readDouble(WPXInputStream *input) void libvisio::appendFromBase64(WPXBinaryData &data, const unsigned char *base64String, size_t base64StringLength) { typedef boost::archive::iterators::transform_width< - boost::archive::iterators::binary_from_base64< const char * >, 8, 6 > base64_decoder; + boost::archive::iterators::binary_from_base64< + boost::archive::iterators::remove_whitespace< const char * > >, 8, 6 > base64_decoder; std::vector buffer; std::copy(base64_decoder(base64String), base64_decoder(base64String + base64StringLength), std::back_inserter(buffer)); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libvisio.git: 2 commits - configure.ac src/lib
configure.ac |2 +- src/lib/VSDParser.cpp |6 +- 2 files changed, 2 insertions(+), 6 deletions(-) New commits: commit 77c46cef14432470474286bb78c59293920371a7 Author: Fridrich Å trba Date: Wed Jun 5 09:55:43 2013 +0200 Bump version to 0.0.28 diff --git a/configure.ac b/configure.ac index e099c31..4cf1ac2 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,7 @@ AC_PREREQ([2.65]) # m4_define([libvisio_version_major],[0]) m4_define([libvisio_version_minor],[0]) -m4_define([libvisio_version_micro],[27]) +m4_define([libvisio_version_micro],[28]) m4_define([libvisio_version],[libvisio_version_major.libvisio_version_minor.libvisio_version_micro]) # = commit f1a708859df39367d296a81495e0d4c6f64c1ddb Author: Fridrich Å trba Date: Wed Jun 5 09:54:27 2013 +0200 Revert "avoid access to uninit. memory" This caused no geometry to be ever inserted to a shape. This reverts commit 62a1abdadcba61f9a0d0daf38c442f0cd86c8718. diff --git a/src/lib/VSDParser.cpp b/src/lib/VSDParser.cpp index 1b65ac8..9fdb8be 100644 --- a/src/lib/VSDParser.cpp +++ b/src/lib/VSDParser.cpp @@ -845,12 +845,8 @@ void libvisio::VSDParser::readTextBlock(WPXInputStream *input) void libvisio::VSDParser::readGeomList(WPXInputStream *input) { if (!m_shape.m_geometries.empty() && m_currentGeometryList->empty()) - { m_shape.m_geometries.erase(--m_currentGeomListCount); -m_currentGeometryList = 0; - } - if (!m_shape.m_geometries.empty()) // broken file? -m_currentGeometryList = &m_shape.m_geometries[m_currentGeomListCount++]; + m_currentGeometryList = &m_shape.m_geometries[m_currentGeomListCount++]; if (m_header.trailer) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits