summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@collabora.com>2022-02-01 11:19:11 +0100
committerAron Budea <aron.budea@collabora.com>2022-02-01 19:00:59 +0100
commit0a78fde221a4119a338ca663bc7f2ac24c1fdb32 (patch)
tree1ad13a6fdd26b2ddfb13cd74f3331d42acf5f118
parent922a331d4f0cbd8103b01beb856f30173b350b77 (diff)
fix std::min() used instead of std::max()
In 534fc16a9f8cd01bb88485e2cf6b9cd33aed3745 I got this backwards, if the value is not supposed to be 0, then it should be at least the small value, not at most. Change-Id: Ic55d2b2402985d26e77be0d1605b9ba5985b5ac7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129299 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Aron Budea <aron.budea@collabora.com>
-rw-r--r--vcl/headless/svpgdi.cxx2
-rw-r--r--vcl/quartz/salgdicommon.cxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 747f47f6c659..e2472c566f50 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -1588,7 +1588,7 @@ bool SvpSalGraphics::drawPolyLine(
}
// convert miter minimum angle to miter limit
- double fMiterLimit = 1.0 / sin(std::min(fMiterMinimumAngle, 0.01 * M_PI) / 2.0);
+ double fMiterLimit = 1.0 / sin(std::max(fMiterMinimumAngle, 0.01 * M_PI) / 2.0);
// setup cap attribute
cairo_line_cap_t eCairoLineCap(CAIRO_LINE_CAP_BUTT);
diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx
index 2d600c09b4b5..296375ef2946 100644
--- a/vcl/quartz/salgdicommon.cxx
+++ b/vcl/quartz/salgdicommon.cxx
@@ -597,7 +597,7 @@ bool AquaSalGraphics::drawPolyLine(
case basegfx::B2DLineJoin::Round: aCGLineJoin = kCGLineJoinRound; break;
}
// convert miter minimum angle to miter limit
- CGFloat fCGMiterLimit = 1.0 / sin(std::min(fMiterMinimumAngle, 0.01 * M_PI) / 2.0);
+ CGFloat fCGMiterLimit = 1.0 / sin(std::max(fMiterMinimumAngle, 0.01 * M_PI) / 2.0);
// setup cap attribute
CGLineCap aCGLineCap(kCGLineCapButt);