diff options
author | David Tardon <dtardon@redhat.com> | 2015-07-25 09:19:54 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2015-07-25 09:45:28 +0200 |
commit | e783cc71eec1f581835a84560904b948f464b435 (patch) | |
tree | bc0d5e28a2861634b23070ec13b5786c8f428e85 /external | |
parent | 3458a252022af241f364a9d49c458180442ebd07 (diff) |
upload libvisio 0.1.3
Change-Id: I022e036c4a27f3c3931c19b0df0e64c6c0dd25a0
Diffstat (limited to 'external')
-rw-r--r-- | external/libvisio/UnpackedTarball_libvisio.mk | 1 | ||||
-rw-r--r-- | external/libvisio/vsd-msvc-max.patch.1 | 19 |
2 files changed, 0 insertions, 20 deletions
diff --git a/external/libvisio/UnpackedTarball_libvisio.mk b/external/libvisio/UnpackedTarball_libvisio.mk index 4c55ecec1baf..9b555d4706ef 100644 --- a/external/libvisio/UnpackedTarball_libvisio.mk +++ b/external/libvisio/UnpackedTarball_libvisio.mk @@ -14,7 +14,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 \ )) diff --git a/external/libvisio/vsd-msvc-max.patch.1 b/external/libvisio/vsd-msvc-max.patch.1 deleted file mode 100644 index 7d22ea1999ad..000000000000 --- a/external/libvisio/vsd-msvc-max.patch.1 +++ /dev/null @@ -1,19 +0,0 @@ ---- a/src/lib/VSDContentCollector.cpp -+++ b/src/lib/VSDContentCollector.cpp -@@ -2256,14 +2256,14 @@ - styleProps.insert("draw:marker-start-viewbox", _linePropertiesMarkerViewbox(style.startMarker)); - styleProps.insert("draw:marker-start-path", _linePropertiesMarkerPath(style.startMarker)); - double w = m_scale*_linePropertiesMarkerScale(style.startMarker)*(0.1/(style.width*style.width+1)+2.54*style.width); -- styleProps.insert("draw:marker-start-width", std::max(w, 0.05)); -+ styleProps.insert("draw:marker-start-width", (std::max)(w, 0.05)); - } - if (style.endMarker > 0) - { - styleProps.insert("draw:marker-end-viewbox", _linePropertiesMarkerViewbox(style.endMarker)); - styleProps.insert("draw:marker-end-path", _linePropertiesMarkerPath(style.endMarker)); - double w = m_scale*_linePropertiesMarkerScale(style.endMarker)*(0.1/(style.width*style.width+1)+2.54*style.width); -- styleProps.insert("draw:marker-end-width", std::max(w, 0.05)); -+ styleProps.insert("draw:marker-end-width", (std::max)(w, 0.05)); - } - - int dots1 = 0; |