summaryrefslogtreecommitdiff
path: root/libvisio
diff options
context:
space:
mode:
authorFridrich Štrba <fridrich.strba@bluewin.ch>2013-07-10 15:41:17 +0200
committerPetr Mladek <pmladek@suse.cz>2013-07-10 14:48:56 +0000
commit55be2ef39353de434600fac0611747177ab9da30 (patch)
treed916fbdc6480377d8aa9c81a3649a2e2b2425315 /libvisio
parentb41378eae135982acdc910af3ff9987348f00fba (diff)
Uploading new libvisio 0.0.30
with huge performance/memory consumption improvements with NURBS and B-Splines Change-Id: I5f338d6c70f948dd2192ec7147efdc1bdeef1e05 (cherry picked from commit 0f978a88c618af59e77aeba920093c5e67559c88) Reviewed-on: https://gerrit.libreoffice.org/4811 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
Diffstat (limited to 'libvisio')
-rw-r--r--libvisio/UnpackedTarball_libvisio.mk4
-rw-r--r--libvisio/libvisio-0.0.29-remove_whitespace.patch.132
2 files changed, 0 insertions, 36 deletions
diff --git a/libvisio/UnpackedTarball_libvisio.mk b/libvisio/UnpackedTarball_libvisio.mk
index 7e9ce6155226..e4c0561f72f8 100644
--- a/libvisio/UnpackedTarball_libvisio.mk
+++ b/libvisio/UnpackedTarball_libvisio.mk
@@ -11,8 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libvisio))
$(eval $(call gb_UnpackedTarball_set_tarball,libvisio,$(VISIO_TARBALL)))
-$(eval $(call gb_UnpackedTarball_add_patches,libvisio,\
- libvisio/libvisio-0.0.29-remove_whitespace.patch.1 \
-))
-
# vim: set noet sw=4 ts=4:
diff --git a/libvisio/libvisio-0.0.29-remove_whitespace.patch.1 b/libvisio/libvisio-0.0.29-remove_whitespace.patch.1
deleted file mode 100644
index 61dc118134e4..000000000000
--- a/libvisio/libvisio-0.0.29-remove_whitespace.patch.1
+++ /dev/null
@@ -1,32 +0,0 @@
---- 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<unsigned char> 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());
---- 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);
-