diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2015-12-23 15:31:14 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2016-01-04 12:16:48 +0100 |
| commit | 3998ab1b6a055c7d6c2ff6c3869d07295b8017a3 (patch) | |
| tree | 945c0d830f8c59f3e31b64deee62a720330ed834 /external | |
| parent | 3826558f967bd873871154439f108923a26b4b26 (diff) | |
Upload libvisio 0.1.4
(cherry picked from commit ce014ac76678f186da27faadc973af3eb253c817)
Conflicts:
download.lst
external/libvisio/UnpackedTarball_libvisio.mk
Change-Id: Ia4cb506a95a150b8106187719e9104760409dea6
Diffstat (limited to 'external')
| -rw-r--r-- | external/libvisio/UnpackedTarball_libvisio.mk | 7 | ||||
| -rw-r--r-- | external/libvisio/ubsan.patch | 15 |
2 files changed, 0 insertions, 22 deletions
diff --git a/external/libvisio/UnpackedTarball_libvisio.mk b/external/libvisio/UnpackedTarball_libvisio.mk index db83360da3c1..47421b45a698 100644 --- a/external/libvisio/UnpackedTarball_libvisio.mk +++ b/external/libvisio/UnpackedTarball_libvisio.mk @@ -13,13 +13,6 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libvisio,$(VISIO_TARBALL))) $(eval $(call gb_UnpackedTarball_set_patchlevel,libvisio,0)) -$(eval $(call gb_UnpackedTarball_add_patches,libvisio,\ - external/libvisio/vsd-msvc-max.patch.1 \ - external/libvisio/ubsan.patch \ - external/libvisio/tdf-92270-VSDX-theme-color-import-fix.patch \ - external/libvisio/tdf-92271-fix-VSDX-char-background-handling.patch \ -)) - ifeq ($(COM_GCC_IS_CLANG),TRUE) ifneq ($(filter -fsanitize=%,$(CC)),) $(eval $(call gb_UnpackedTarball_add_patches,libvisio, \ diff --git a/external/libvisio/ubsan.patch b/external/libvisio/ubsan.patch deleted file mode 100644 index 16b0ec4bf71a..000000000000 --- a/external/libvisio/ubsan.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- src/lib/VSDParser.cpp -+++ src/lib/VSDParser.cpp -@@ -1104,7 +1104,11 @@ - input->seek(1, librevenge::RVNG_SEEK_CUR); - double scale = readDouble(input); - input->seek(1, librevenge::RVNG_SEEK_CUR); -- scale /= readDouble(input); -+ double scaleDenom = readDouble(input); -+ if (scaleDenom != 0) -+ { -+ scale /= scaleDenom; -+ } - - if (m_isStencilStarted && m_currentStencil) - { |