Kaydet (Commit) e783cc71 authored tarafından David Tardon's avatar David Tardon

upload libvisio 0.1.3

Change-Id: I022e036c4a27f3c3931c19b0df0e64c6c0dd25a0
üst 3458a252
......@@ -145,8 +145,8 @@ export SERF_TARBALL := serf-1.2.1.tar.bz2
export SWING_TARBALL := 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
export UCPP_TARBALL := 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
export VIGRA_TARBALL := d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz
export VISIO_MD5SUM := 726c1f5be65eb7d649e0d48b63d920e7
export VISIO_TARBALL := libvisio-0.1.1.tar.bz2
export VISIO_MD5SUM := 617f800ab7639fd76c062ab74896318e
export VISIO_TARBALL := libvisio-0.1.3.tar.bz2
export WPD_MD5SUM := 0773d79a1f240ef9f4f20242b13c5bb7
export WPD_TARBALL := libwpd-0.10.0.tar.bz2
export WPG_MD5SUM := 17da9770cb8b317b7633f9807b32b71a
......
......@@ -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 \
))
......
--- 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;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment