src/lib/VSDContentCollector.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 49c0d44063c452f0927e8938951f065e1e488ecb
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Jan 5 17:33:26 2015 +0100
workaround error C2589: ´(´ : illegal token on right side of ´::´
Change-Id: I653ef7386ac4bd77bce40601bae5d2fd84764c83
diff --git a/src/lib/VSDContentCollector.cpp b/src/lib/VSDContentCollector.cpp
index d7365b0..1d98798 100644
--- a/src/lib/VSDContentCollector.cpp
+++ b/src/lib/VSDContentCollector.cpp
@@ -2256,14 +2256,14 @@ void
libvisio::VSDContentCollector::_lineProperties(const VSDLineStyle &style, l
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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
