diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-07-02 16:55:55 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-07-02 16:55:55 +0200 |
| commit | 6fe924aae90c7aed8a3ad6e172a90a341f7a82ca (patch) | |
| tree | ba829c64fb1176cb87137cad15d154c5294b748f | |
| parent | a55e97f84fdd51632f1fb29fbc438d1baa0c8e64 (diff) | |
Some older versions of boost have a buggy remove_whitespace and original code was not removing either
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/lib/libvisio_utils.cpp | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index dd12566..c560c1d 100644 --- a/configure.ac +++ b/configure.ac @@ -112,7 +112,6 @@ 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 42e2adc..8978385 100644 --- a/src/lib/libvisio_utils.cpp +++ b/src/lib/libvisio_utils.cpp @@ -33,7 +33,6 @@ #include "libvisio_utils.h" #include <boost/archive/iterators/binary_from_base64.hpp> -#include <boost/archive/iterators/remove_whitespace.hpp> #include <boost/archive/iterators/transform_width.hpp> uint8_t libvisio::readU8(WPXInputStream *input) @@ -126,8 +125,7 @@ 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< - boost::archive::iterators::remove_whitespace< const char * > >, 8, 6 > base64_decoder; + boost::archive::iterators::binary_from_base64< const char * >, 8, 6 > base64_decoder; std::vector<unsigned char> buffer; std::copy(base64_decoder(base64String), base64_decoder(base64String + base64StringLength), std::back_inserter(buffer)); |