vcl/skia/gdiimpl.cxx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
New commits: commit e18570e5e0ff0b656bfad2b4c1a7da54a4f0649f Author: Luboš Luňák <l.lu...@collabora.com> AuthorDate: Thu Apr 23 17:15:30 2020 +0200 Commit: Luboš Luňák <l.lu...@collabora.com> CommitDate: Thu Apr 23 21:25:58 2020 +0200 use rectangle rather than point+size for debug output And use SkIRect rather than tools::Rectangle because the latter messes up the size. Change-Id: Iaba609635b63bd65092a9a66f2df5426e40e9d2c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92794 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lu...@collabora.com> diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx index 2ed26e7d348e..9dd9b6eb2418 100644 --- a/vcl/skia/gdiimpl.cxx +++ b/vcl/skia/gdiimpl.cxx @@ -626,9 +626,9 @@ void SkiaSalGraphicsImpl::privateDrawAlphaRect(long nX, long nY, long nWidth, lo double fTransparency, bool blockAA) { preDraw(); - SAL_INFO("vcl.skia.trace", "privatedrawrect(" << this << "): " << Point(nX, nY) << "/" - << Size(nWidth, nHeight) << ":" << mLineColor - << ":" << mFillColor << ":" << fTransparency); + SAL_INFO("vcl.skia.trace", + "privatedrawrect(" << this << "): " << SkIRect::MakeXYWH(nX, nY, nWidth, nHeight) + << ":" << mLineColor << ":" << mFillColor << ":" << fTransparency); SkCanvas* canvas = getDrawCanvas(); SkPaint paint; paint.setAntiAlias(!blockAA && mParent.getAntiAliasB2DDraw()); @@ -922,9 +922,9 @@ void SkiaSalGraphicsImpl::copyArea(long nDestX, long nDestY, long nSrcX, long nS if (nDestX == nSrcX && nDestY == nSrcY) return; preDraw(); - SAL_INFO("vcl.skia.trace", "copyarea(" << this << "): " << Point(nSrcX, nSrcY) << "->" - << Point(nDestX, nDestY) << "/" - << Size(nSrcWidth, nSrcHeight)); + SAL_INFO("vcl.skia.trace", "copyarea(" + << this << "): " << Point(nSrcX, nSrcY) << "->" + << SkIRect::MakeXYWH(nDestX, nDestY, nSrcWidth, nSrcHeight)); assert(!mXorMode); ::copyArea(getDrawCanvas(), mSurface, nDestX, nDestY, nSrcX, nSrcY, nSrcWidth, nSrcHeight); addXorRegion(SkRect::MakeXYWH(nDestX, nDestY, nSrcWidth, nSrcHeight)); @@ -1095,7 +1095,7 @@ std::shared_ptr<SalBitmap> SkiaSalGraphicsImpl::getBitmap(long nX, long nY, long SkiaZone zone; checkSurface(); SAL_INFO("vcl.skia.trace", - "getbitmap(" << this << "): " << Point(nX, nY) << "/" << Size(nWidth, nHeight)); + "getbitmap(" << this << "): " << SkIRect::MakeXYWH(nX, nY, nWidth, nHeight)); flushDrawing(); // TODO makeImageSnapshot(rect) may copy the data, which may be a waste if this is used // e.g. for VirtualDevice's lame alpha blending, in which case the image will eventually end up _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits