diff options
| author | Xisco Fauli <xiscofauli@libreoffice.org> | 2019-05-31 12:24:25 +0200 |
|---|---|---|
| committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2019-05-31 14:31:00 +0200 |
| commit | 16091ff88aaab9ba9103c4e369bf79b97f431f40 (patch) | |
| tree | 9c0abcd4872832f9574cdd9e3d498b60add344a5 | |
| parent | 3fc9ae8b47d56783e8ff71b1d5b7cd9aae553cc1 (diff) | |
tdf#125506 tdf#121241: No need to transform to DeviceCoordinates
Regression from b9fa01a8d1137a95af9865a3e47995734c40da6e
Change-Id: Ie4ab65966e274bff4d699b7cd4dc0fd47d26c558
Reviewed-on: https://gerrit.libreoffice.org/73249
Tested-by: Jenkins
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
| -rw-r--r-- | vcl/quartz/salgdicommon.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx index 05e84b98b810..913d2ac43f19 100644 --- a/vcl/quartz/salgdicommon.cxx +++ b/vcl/quartz/salgdicommon.cxx @@ -874,19 +874,17 @@ bool AquaSalGraphics::drawPolyLine( return false; #endif - // Transform to DeviceCoordinates, get DeviceLineWidth, execute PixelSnapHairline - const basegfx::B2DVector aLineWidths(rObjectToDevice * rLineWidths); - // #i101491# Aqua does not support B2DLineJoin::NONE; return false to use // the fallback (own geometry preparation) // #i104886# linejoin-mode and thus the above only applies to "fat" lines - if( (basegfx::B2DLineJoin::NONE == eLineJoin) && (aLineWidths.getX() > 1.3) ) + if( (basegfx::B2DLineJoin::NONE == eLineJoin) && (rLineWidths.getX() > 1.3) ) return false; // Transform to DeviceCoordinates, get DeviceLineWidth, execute PixelSnapHairline basegfx::B2DPolygon aPolyLine(rPolyLine); aPolyLine.transform(rObjectToDevice); - if(bPixelSnapHairline) { aPolyLine = basegfx::utils::snapPointsOfHorizontalOrVerticalEdges(aPolyLine); } + if(bPixelSnapHairline) + aPolyLine = basegfx::utils::snapPointsOfHorizontalOrVerticalEdges(aPolyLine); // setup line attributes CGLineJoin aCGLineJoin = kCGLineJoinMiter; @@ -948,7 +946,7 @@ bool AquaSalGraphics::drawPolyLine( CGContextSetAlpha( maContextHolder.get(), 1.0 - fTransparency ); CGContextSetLineJoin( maContextHolder.get(), aCGLineJoin ); CGContextSetLineCap( maContextHolder.get(), aCGLineCap ); - CGContextSetLineWidth( maContextHolder.get(), aLineWidths.getX() ); + CGContextSetLineWidth( maContextHolder.get(), rLineWidths.getX() ); CGContextSetMiterLimit(maContextHolder.get(), fCGMiterLimit); SAL_INFO( "vcl.cg", "CGContextDrawPath(" << maContextHolder.get() << ",kCGPathStroke)" ); CGContextDrawPath( maContextHolder.get(), kCGPathStroke ); |