diff options
author | Tor Lillqvist <tml@collabora.com> | 2019-06-07 08:41:26 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2019-06-07 08:44:05 +0200 |
commit | 8d16f406e62854df093a7c44c82dff19b0dda130 (patch) | |
tree | f44d83e00bb6f10089936ad9b560a660e8677890 /vcl/quartz | |
parent | 548f30f21b161e01607f523f65861f47fc78867a (diff) |
Bin the much too verbose SAL_INFO() calls for the "vcl.cg" tag
Quikee agreed that they aren't really useful. Doing even the simplest
things causes such a huge amount of logging that it is questionable
whether anybody could have any use of it.
Parts of it might be useful to restore later, if need arises. Like the
mnContextStackDepth logging in vcl/inc/quartz/CGHelpers.hxx.
Change-Id: If635e6492a50e5955c56c54fa310e7c0ab2986ae
Reviewed-on: https://gerrit.libreoffice.org/73639
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'vcl/quartz')
-rw-r--r-- | vcl/quartz/salbmp.cxx | 35 | ||||
-rw-r--r-- | vcl/quartz/salgdi.cxx | 7 | ||||
-rw-r--r-- | vcl/quartz/salgdicommon.cxx | 123 | ||||
-rw-r--r-- | vcl/quartz/salgdiutils.cxx | 8 | ||||
-rw-r--r-- | vcl/quartz/salvd.cxx | 10 |
5 files changed, 3 insertions, 180 deletions
diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx index dce5b06ff1f8..7f5c87eb8c8e 100644 --- a/vcl/quartz/salbmp.cxx +++ b/vcl/quartz/salbmp.cxx @@ -84,7 +84,7 @@ bool QuartzSalBitmap::Create(CGLayerHolder const & rLayerHolder, int nBitmapBits } const CGSize aLayerSize = CGLayerGetSize(rLayerHolder.get()); - SAL_INFO("vcl.cg", "CGLayerGetSize(" << rLayerHolder.get() << ") = " << aLayerSize ); + if( nWidth >= static_cast<int>(aLayerSize.width) - nX ) nWidth = static_cast<int>(aLayerSize.width) - nX; @@ -106,12 +106,10 @@ bool QuartzSalBitmap::Create(CGLayerHolder const & rLayerHolder, int nBitmapBits const CGPoint aSrcPoint = { static_cast<CGFloat>(-nX), static_cast<CGFloat>(-nY) }; if (maGraphicContext.isSet()) // remove warning { - SAL_INFO("vcl.cg", "CGContextDrawLayerAtPoint(" << maGraphicContext.get() << "," << aSrcPoint << "," << rLayerHolder.get() << ")"); if( bFlipped ) { - SAL_INFO( "vcl.cg", "CGContextTranslateCTM(" << maGraphicContext.get() << ",0," << mnHeight << ")" ); CGContextTranslateCTM( maGraphicContext.get(), 0, +mnHeight ); - SAL_INFO( "vcl.cg", "CGContextScaleCTM(" << maGraphicContext.get() << ",+1,-1)" ); + CGContextScaleCTM( maGraphicContext.get(), +1, -1 ); } @@ -181,14 +179,12 @@ void QuartzSalBitmap::DestroyContext() { if( mxCachedImage ) { - SAL_INFO("vcl.cg", "CGImageRelease(" << mxCachedImage << ")" ); CGImageRelease( mxCachedImage ); mxCachedImage = nullptr; } if (maGraphicContext.isSet()) { - SAL_INFO("vcl.cg", "CGContextRelease(" << maGraphicContext.get() << ")" ); CGContextRelease(maGraphicContext.get()); maGraphicContext.set(nullptr); m_pContextBuffer.reset(); @@ -252,7 +248,6 @@ bool QuartzSalBitmap::CreateContext() maGraphicContext.set(CGBitmapContextCreate(m_pContextBuffer.get(), mnWidth, mnHeight, bitsPerComponent, nContextBytesPerRow, aCGColorSpace, aCGBmpInfo)); - SAL_INFO("vcl.cg", "CGBitmapContextCreate(" << mnWidth << "x" << mnHeight << "x" << bitsPerComponent << ") = " << maGraphicContext.get()); } if (!maGraphicContext.isSet()) @@ -804,7 +799,6 @@ CGImageRef QuartzSalBitmap::CreateCroppedImage( int nX, int nY, int nNewWidth, i } } mxCachedImage = CGBitmapContextCreateImage(maGraphicContext.get()); - SAL_INFO("vcl.cg", "CGBitmapContextCreateImage(" << maGraphicContext.get() << ") = " << mxCachedImage ); } CGImageRef xCroppedImage = nullptr; @@ -812,7 +806,6 @@ CGImageRef QuartzSalBitmap::CreateCroppedImage( int nX, int nY, int nNewWidth, i if( !nX && !nY && (mnWidth == nNewWidth) && (mnHeight == nNewHeight) ) { xCroppedImage = mxCachedImage; - SAL_INFO("vcl.cg", "CFRetain(" << xCroppedImage << ")" ); CFRetain( xCroppedImage ); } else @@ -820,7 +813,6 @@ CGImageRef QuartzSalBitmap::CreateCroppedImage( int nX, int nY, int nNewWidth, i nY = mnHeight - (nY + nNewHeight); // adjust for y-mirrored context const CGRect aCropRect = { { static_cast<CGFloat>(nX), static_cast<CGFloat>(nY) }, { static_cast<CGFloat>(nNewWidth), static_cast<CGFloat>(nNewHeight) } }; xCroppedImage = CGImageCreateWithImageInRect( mxCachedImage, aCropRect ); - SAL_INFO("vcl.cg", "CGImageCreateWithImageInRect(" << mxCachedImage << "," << aCropRect << ") = " << xCroppedImage ); } return xCroppedImage; @@ -854,19 +846,14 @@ CGImageRef QuartzSalBitmap::CreateWithMask( const QuartzSalBitmap& rMask, void* pMaskMem = std::malloc( nMaskBytesPerRow * nHeight ); CGContextRef xMaskContext = CGBitmapContextCreate( pMaskMem, nWidth, nHeight, 8, nMaskBytesPerRow, GetSalData()->mxGraySpace, kCGImageAlphaNone ); - SAL_INFO("vcl.cg", "CGBitmapContextCreate(" << nWidth << "x" << nHeight << "x8," << nMaskBytesPerRow << ") = " << xMaskContext ); - SAL_INFO("vcl.cg", "CGContextDrawImage(" << xMaskContext << "," << xImageRect << "," << xMask << ")" ); CGContextDrawImage( xMaskContext, xImageRect, xMask ); - SAL_INFO("vcl.cg", "CFRelease(" << xMask << ")" ); CFRelease( xMask ); CGDataProviderRef xDataProvider( CGDataProviderCreateWithData( nullptr, pMaskMem, nHeight * nMaskBytesPerRow, &CFRTLFree ) ); static const CGFloat* pDecode = nullptr; xMask = CGImageMaskCreate( nWidth, nHeight, 8, 8, nMaskBytesPerRow, xDataProvider, pDecode, false ); - SAL_INFO("vcl.cg", "CGImageMaskCreate(" << nWidth << "," << nHeight << ",8,8) = " << xMask ); CFRelease( xDataProvider ); - SAL_INFO("vcl.cg", "CFRelease(" << xMaskContext << ")" ); CFRelease( xMaskContext ); } @@ -875,10 +862,7 @@ CGImageRef QuartzSalBitmap::CreateWithMask( const QuartzSalBitmap& rMask, // combine image and alpha mask CGImageRef xMaskedImage = CGImageCreateWithMask( xImage, xMask ); - SAL_INFO("vcl.cg", "CGImageCreateWithMask(" << xImage << "," << xMask << ") = " << xMaskedImage ); - SAL_INFO("vcl.cg", "CFRelease(" << xMask << ")" ); CFRelease( xMask ); - SAL_INFO("vcl.cg", "CFRelease(" << xImage << ")" ); CFRelease( xImage ); return xMaskedImage; } @@ -925,7 +909,6 @@ CGImageRef QuartzSalBitmap::CreateColorMask( int nX, int nY, int nWidth, CGDataProviderRef xDataProvider( CGDataProviderCreateWithData(nullptr, pMaskBuffer.release(), nHeight * nDestBytesPerRow, &CFRTLFree) ); xMask = CGImageCreate(nWidth, nHeight, 8, 32, nDestBytesPerRow, GetSalData()->mxRGBSpace, kCGImageAlphaPremultipliedFirst, xDataProvider, nullptr, true, kCGRenderingIntentDefault); - SAL_INFO("vcl.cg", "CGImageCreate(" << nWidth << "x" << nHeight << "x8) = " << xMask ); CFRelease(xDataProvider); } } @@ -959,10 +942,8 @@ bool QuartzSalBitmap::GetSystemData( BitmapSystemData& rData ) * This whole if statement was originally (before 2011) inside #ifdef CAIRO. Did we use Cairo on Mac back then? * Anyway, nowadays (since many years, I think) we don't, so should this if statement be dropped? Fun. */ - SAL_INFO("vcl.cg", "QuartzSalBitmap::" << __func__ << "(): kCGBitmapByteOrder32Host not found => inserting it."); CGImageRef xImage = CGBitmapContextCreateImage(maGraphicContext.get()); - SAL_INFO("vcl.cg", "CGBitmapContextCreateImage(" << maGraphicContext.get() << ") = " << xImage ); // re-create the context with single change: include kCGBitmapByteOrder32Host flag. CGContextHolder maGraphicContextNew(CGBitmapContextCreate(CGBitmapContextGetData(maGraphicContext.get()), @@ -972,29 +953,17 @@ bool QuartzSalBitmap::GetSystemData( BitmapSystemData& rData ) CGBitmapContextGetBytesPerRow(maGraphicContext.get()), CGBitmapContextGetColorSpace(maGraphicContext.get()), CGBitmapContextGetBitmapInfo(maGraphicContext.get()) | kCGBitmapByteOrder32Host)); - SAL_INFO("vcl.cg", "CGBitmapContextCreate(" << CGBitmapContextGetWidth(maGraphicContext.get()) << "x" - << CGBitmapContextGetHeight(maGraphicContext.get()) << "x" - << CGBitmapContextGetBitsPerComponent(maGraphicContext.get()) << ") = " - << maGraphicContextNew.get()); - - SAL_INFO("vcl.cg", "CFRelease(" << maGraphicContext.get() << ")"); CFRelease(maGraphicContext.get()); // Needs to be flipped maGraphicContextNew.saveState(); - SAL_INFO("vcl.cg", "CGContextTranslateCTM(" << maGraphicContextNew.get() << ",0," << CGBitmapContextGetHeight(maGraphicContextNew.get()) << ")" ); CGContextTranslateCTM (maGraphicContextNew.get(), 0, CGBitmapContextGetHeight(maGraphicContextNew.get())); - SAL_INFO("vcl.cg", "CGContextScaleCTM(" << maGraphicContextNew.get() << ",1,-1)" ); CGContextScaleCTM (maGraphicContextNew.get(), 1.0, -1.0); - SAL_INFO("vcl.cg", "CGContextDrawImage(" << maGraphicContextNew.get() << "," << CGRectMake(0, 0, CGImageGetWidth(xImage), CGImageGetHeight(xImage)) << "," << xImage << ")" ); CGContextDrawImage(maGraphicContextNew.get(), CGRectMake( 0, 0, CGImageGetWidth(xImage), CGImageGetHeight(xImage)), xImage); // Flip back - SAL_INFO("vcl.cg", "CGContextRestoreGState(" << maGraphicContextNew.get() << ")" ); CGContextRestoreGState( maGraphicContextNew.get() ); - - SAL_INFO("vcl.cg", "CGImageRelease(" << xImage << ")" ); CGImageRelease( xImage ); maGraphicContext = maGraphicContextNew; } diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx index 9637966f9c63..f27047a116f4 100644 --- a/vcl/quartz/salgdi.cxx +++ b/vcl/quartz/salgdi.cxx @@ -219,7 +219,6 @@ AquaSalGraphics::~AquaSalGraphics() if( mxClipPath ) { - SAL_INFO("vcl.cg", "CGPathRelease(" << mxClipPath << ")" ); CGPathRelease( mxClipPath ); } @@ -239,7 +238,6 @@ AquaSalGraphics::~AquaSalGraphics() #endif if (maLayer.isSet()) { - SAL_INFO("vcl.cg", "CGLayerRelease(" << maLayer.get() << ")" ); CGLayerRelease(maLayer.get()); } else if (maContextHolder.isSet() @@ -249,7 +247,6 @@ AquaSalGraphics::~AquaSalGraphics() ) { // destroy backbuffer bitmap context that we created ourself - SAL_INFO("vcl.cg", "CGContextRelease(" << maContextHolder.get() << ")" ); CGContextRelease(maContextHolder.get()); maContextHolder.set(nullptr); } @@ -448,10 +445,8 @@ void AquaSalGraphics::DrawTextLayout(const GenericSalLayout& rLayout) maContextHolder.saveState(); // The view is vertically flipped (no idea why), flip it back. - SAL_INFO("vcl.cg", "CGContextScaleCTM(" << maContextHolder.get() << ",1,-1)"); CGContextScaleCTM(maContextHolder.get(), 1.0, -1.0); CGContextSetShouldAntialias(maContextHolder.get(), !mbNonAntialiasedText); - SAL_INFO("vcl.cg", "CGContextSetFillColor(" << maContextHolder.get() << "," << maTextColor << ")"); CGContextSetFillColor(maContextHolder.get(), maTextColor.AsArray()); if (rStyle.mbFauxBold) @@ -476,10 +471,8 @@ void AquaSalGraphics::DrawTextLayout(const GenericSalLayout& rLayout) maContextHolder.saveState(); if (rStyle.mfFontRotation && !bUprightGlyph) { - SAL_INFO("vcl.cg", "CGContextRotateCTM(" << maContextHolder.get() << "," << rStyle.mfFontRotation << ")"); CGContextRotateCTM(maContextHolder.get(), rStyle.mfFontRotation); } - SAL_INFO("vcl.cg", "CTFontDrawGlyphs() @" << nStartIndex << ":" << nLen << "," << maContextHolder.get()); CTFontDrawGlyphs(pFont, &aGlyphIds[nStartIndex], &aGlyphPos[nStartIndex], nLen, maContextHolder.get()); maContextHolder.restoreState(); diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx index 4e98d231f96e..d4d9ef7c2231 100644 --- a/vcl/quartz/salgdicommon.cxx +++ b/vcl/quartz/salgdicommon.cxx @@ -90,7 +90,6 @@ static void AddPolygonToPath( CGMutablePathRef xPath, if( !nPointIdx ) { // first point => just move there - SAL_INFO( "vcl.cg", "CGPathMoveToPoint(" << xPath << ",NULL," << aPoint.getX() << "," << aPoint.getY() << ")"); CGPathMoveToPoint( xPath, nullptr, aPoint.getX(), aPoint.getY() ); continue; } @@ -104,7 +103,6 @@ static void AddPolygonToPath( CGMutablePathRef xPath, if( !bPendingCurve ) // line segment { - SAL_INFO( "vcl.cg", "CGPathAddLineToPoint(" << xPath << ",NULL," << aPoint.getX() << "," << aPoint.getY() << ")"); CGPathAddLineToPoint( xPath, nullptr, aPoint.getX(), aPoint.getY() ); } else // cubic bezier segment @@ -116,8 +114,6 @@ static void AddPolygonToPath( CGMutablePathRef xPath, aCP1 += aHalfPointOfs; aCP2 += aHalfPointOfs; } - SAL_INFO( "vcl.cg", "CGPathAddCurveToPoint(" << xPath << ",NULL," << aCP1.getX() << "," << aCP1.getY() << "," << - aCP2.getX() << "," << aCP2.getY() << "," << aPoint.getX() << "," << aPoint.getY() << ")" ); CGPathAddCurveToPoint( xPath, nullptr, aCP1.getX(), aCP1.getY(), aCP2.getX(), aCP2.getY(), aPoint.getX(), aPoint.getY() ); } @@ -125,7 +121,6 @@ static void AddPolygonToPath( CGMutablePathRef xPath, if( bClosePath ) { - SAL_INFO( "vcl.cg", "CGPathCloseSubpath(" << xPath << ")" ); CGPathCloseSubpath( xPath ); } } @@ -369,21 +364,17 @@ void AquaSalGraphics::copyBits( const SalTwoRect& rPosAry, SalGraphics *pSrcGrap aCopyContext.saveState(); const CGRect aDstRect = CGRectMake(rPosAry.mnDestX, rPosAry.mnDestY, rPosAry.mnDestWidth, rPosAry.mnDestHeight); - SAL_INFO( "vcl.cg", "CGContextClipToRect(" << aCopyContext.get() << "," << aDstRect << ")" ); CGContextClipToRect(aCopyContext.get(), aDstRect); // draw at new destination // NOTE: flipped drawing gets disabled for this, else the subimage would be drawn upside down if( pSrc->IsFlipped() ) { - SAL_INFO( "vcl.cg", "CGContextTranslateCTM(" << aCopyContext.get() << ",0," << mnHeight << ")" ); CGContextTranslateCTM( aCopyContext.get(), 0, +mnHeight ); - SAL_INFO( "vcl.cg", "CGContextScaleCTM(" << aCopyContext.get() << ",+1,-1)" ); CGContextScaleCTM( aCopyContext.get(), +1, -1 ); } // TODO: pSrc->size() != this->size() - SAL_INFO("vcl.cg", "CGContextDrawLayerAtPoint(" << aCopyContext.get() << "," << aDstPoint << "," << pSrc->maLayer.get() << ")"); CGContextDrawLayerAtPoint(aCopyContext.get(), aDstPoint, pSrc->maLayer.get()); aCopyContext.restoreState(); @@ -407,9 +398,7 @@ void AquaSalGraphics::copyBits( const SalTwoRect& rPosAry, SalGraphics *pSrcGrap static void DrawPattern50( void*, CGContextRef rContext ) { static const CGRect aRects[2] = { { {0,0}, { 2, 2 } }, { { 2, 2 }, { 2, 2 } } }; - SAL_INFO( "vcl.cg", "CGContextAddRects(" << rContext << ",aRects,2 )" ); CGContextAddRects( rContext, aRects, 2 ); - SAL_INFO( "vcl.cg", "CGContextFillPath(" << rContext << ")" ); CGContextFillPath( rContext ); } @@ -520,27 +509,21 @@ void AquaSalGraphics::copyArea( long nDstX, long nDstY,long nSrcX, long nSrcY, { const CGSize aSrcSize = CGSizeMake(nScaledSourceWidth, nScaledSourceHeight); sSourceLayerHolder.set(CGLayerCreateWithContext(xCopyContext, aSrcSize, nullptr)); - SAL_INFO( "vcl.cg", "CGLayerCreateWithContext(" << xCopyContext << "," << aSrcSize << ",NULL) = " << sSourceLayerHolder.get()); const CGContextRef xSrcContext = CGLayerGetContext(sSourceLayerHolder.get()); - SAL_INFO( "vcl.cg", "CGLayerGetContext(" << sSourceLayerHolder.get() << ") = " << xSrcContext); CGPoint aSrcPoint = CGPointMake(-nScaledSourceX, -nScaledSourceY); if( IsFlipped() ) { - SAL_INFO( "vcl.cg", "CGContextTranslateCTM(" << xSrcContext << ",0," << nSrcHeight << ")" ); CGContextTranslateCTM( xSrcContext, 0, +nScaledSourceHeight ); - SAL_INFO( "vcl.cg", "CGContextScaleCTM(" << xSrcContext << ",+1,-1)" ); CGContextScaleCTM( xSrcContext, +1, -1 ); aSrcPoint.y = (nScaledSourceY + nScaledSourceHeight) - (mnHeight * fScale); } - SAL_INFO( "vcl.cg", "CGContextDrawLayerAtPoint(" << xSrcContext << "," << aSrcPoint << "," << maLayer.get() << ")" ); CGContextDrawLayerAtPoint(xSrcContext, aSrcPoint, maLayer.get()); } // draw at new destination const CGRect aTargetRect = CGRectMake(nScaledTargetX, nScaledTargetY, nScaledSourceWidth, nScaledSourceHeight); - SAL_INFO( "vcl.cg", "CGContextDrawLayerInRect(" << xCopyContext << "," << aTargetRect << "," << sSourceLayerHolder.get() << ")" ); CGContextDrawLayerInRect(xCopyContext, aTargetRect, sSourceLayerHolder.get()); maContextHolder.restoreState(); @@ -548,7 +531,6 @@ void AquaSalGraphics::copyArea( long nDstX, long nDstY,long nSrcX, long nSrcY, // cleanup if (sSourceLayerHolder.get() != maLayer.get()) { - SAL_INFO( "vcl.cg", "CGLayerRelease(" << sSourceLayerHolder.get() << ")" ); CGLayerRelease(sSourceLayerHolder.get()); } // mark the destination rectangle as updated @@ -607,12 +589,10 @@ bool AquaSalGraphics::drawAlphaBitmap( const SalTwoRect& rTR, if ( CheckContext() ) { const CGRect aDstRect = CGRectMake( rTR.mnDestX, rTR.mnDestY, rTR.mnDestWidth, rTR.mnDestHeight); - SAL_INFO( "vcl.cg", "CGContextDrawImage(" << maContextHolder.get() << "," << aDstRect << "," << xMaskedImage << ")" ); CGContextDrawImage( maContextHolder.get(), aDstRect, xMaskedImage ); RefreshRect( aDstRect ); } - SAL_INFO( "vcl.cg", "CGImageRelease(" << xMaskedImage << ")"); CGImageRelease(xMaskedImage); return true; @@ -648,15 +628,12 @@ bool AquaSalGraphics::drawTransformedBitmap( aYRel.getX()/aSize.Height(), aYRel.getY()/aSize.Height(), rNull.getX(), rNull.getY()); - SAL_INFO( "vcl.cg", "CGContextConcatCTM(" << maContextHolder.get() << "," << aCGMat << ")" ); CGContextConcatCTM( maContextHolder.get(), aCGMat ); // draw the transformed image const CGRect aSrcRect = CGRectMake(0, 0, aSize.Width(), aSize.Height()); - SAL_INFO( "vcl.cg", "CGContextDrawImage(" << maContextHolder.get() << "," << aSrcRect << "," << xImage << ")" ); CGContextDrawImage( maContextHolder.get(), aSrcRect, xImage ); - SAL_INFO( "vcl.cg", "CGImageRelease(" << xImage << ")" ); CGImageRelease( xImage ); // restore the Quartz graphics state maContextHolder.restoreState(); @@ -676,7 +653,6 @@ bool AquaSalGraphics::drawAlphaRect( long nX, long nY, long nWidth, // save the current state maContextHolder.saveState(); - SAL_INFO( "vcl.cg", "CGContextSetAlpha(" << maContextHolder.get() << "," << (100-nTransparency) * (1.0/100) << ")" ); CGContextSetAlpha( maContextHolder.get(), (100-nTransparency) * (1.0/100) ); CGRect aRect = CGRectMake(nX, nY, nWidth-1, nHeight-1); @@ -686,11 +662,8 @@ bool AquaSalGraphics::drawAlphaRect( long nX, long nY, long nWidth, aRect.origin.y += 0.5; } - SAL_INFO( "vcl.cg", "CGContextBeginPath(" << maContextHolder.get() << ")" ); CGContextBeginPath( maContextHolder.get() ); - SAL_INFO( "vcl.cg", "CGContextAddRect(" << maContextHolder.get() << "," << aRect << ")" ); CGContextAddRect( maContextHolder.get(), aRect ); - SAL_INFO( "vcl.cg", "CGContextDrawPath(" << maContextHolder.get() << ",kCGPathFill)" ); CGContextDrawPath( maContextHolder.get(), kCGPathFill ); maContextHolder.restoreState(); @@ -711,10 +684,8 @@ void AquaSalGraphics::drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rS return; const CGRect aDstRect = CGRectMake(rPosAry.mnDestX, rPosAry.mnDestY, rPosAry.mnDestWidth, rPosAry.mnDestHeight); - SAL_INFO( "vcl.cg", "CGContextDrawImage(" << maContextHolder.get() << "," << aDstRect << "," << xImage << ")" ); CGContextDrawImage( maContextHolder.get(), aDstRect, xImage ); - SAL_INFO( "vcl.cg", "CGImageRelease(" << xImage << ")" ); CGImageRelease( xImage ); RefreshRect( aDstRect ); } @@ -733,9 +704,7 @@ void AquaSalGraphics::drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rS return; const CGRect aDstRect = CGRectMake(rPosAry.mnDestX, rPosAry.mnDestY, rPosAry.mnDestWidth, rPosAry.mnDestHeight); - SAL_INFO( "vcl.cg", "CGContextDrawImage(" << maContextHolder.get() << "," << aDstRect << "," << xMaskedImage << ")" ); CGContextDrawImage( maContextHolder.get(), aDstRect, xMaskedImage ); - SAL_INFO( "vcl.cg", "CGImageRelease(" << xMaskedImage << ")" ); CGImageRelease( xMaskedImage ); RefreshRect( aDstRect ); } @@ -760,7 +729,6 @@ bool AquaSalGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, // NOTE: flip drawing, else the nsimage would be drawn upside down maContextHolder.saveState(); // CGContextTranslateCTM( maContextHolder.get(), 0, +mnHeight ); - SAL_INFO( "vcl.cg", "CGContextScaleCTM(" << maContextHolder.get() << ",+1,-1)" ); CGContextScaleCTM( maContextHolder.get(), +1, -1 ); nY = /*mnHeight*/ - (nY + nHeight); @@ -803,13 +771,9 @@ void AquaSalGraphics::drawLine( long nX1, long nY1, long nX2, long nY2 ) if( !CheckContext() ) return; - SAL_INFO( "vcl.cg", "CGContextBeginPath(" << maContextHolder.get() << ")" ); CGContextBeginPath( maContextHolder.get() ); - SAL_INFO( "vcl.cg", "CGContextMoveToPoint(" << maContextHolder.get() << "," << static_cast<float>(nX1)+0.5 << "," << static_cast<float>(nY1)+0.5 << ")" ); CGContextMoveToPoint( maContextHolder.get(), static_cast<float>(nX1)+0.5, static_cast<float>(nY1)+0.5 ); - SAL_INFO( "vcl.cg", "CGContextAddLineToPoint(" << maContextHolder.get() << "," << static_cast<float>(nX2)+0.5 << "," << static_cast<float>(nY2)+0.5 << ")" ); CGContextAddLineToPoint( maContextHolder.get(), static_cast<float>(nX2)+0.5, static_cast<float>(nY2)+0.5 ); - SAL_INFO( "vcl.cg", "CGContextDrawPath(" << maContextHolder.get() << ",kCGPathStroke)" ); CGContextDrawPath( maContextHolder.get(), kCGPathStroke ); tools::Rectangle aRefreshRect( nX1, nY1, nX2, nY2 ); @@ -830,9 +794,7 @@ void AquaSalGraphics::drawMask( const SalTwoRect& rPosAry, const SalBitmap& rSal return; const CGRect aDstRect = CGRectMake(rPosAry.mnDestX, rPosAry.mnDestY, rPosAry.mnDestWidth, rPosAry.mnDestHeight); - SAL_INFO( "vcl.cg", "CGContextDrawImage(" << maContextHolder.get() << "," << aDstRect << "," << xImage << ")" ); CGContextDrawImage( maContextHolder.get(), aDstRect, xImage ); - SAL_INFO( "vcl.cg", "CGImageRelease(" << xImage << ")" ); CGImageRelease( xImage ); RefreshRect( aDstRect ); } @@ -920,7 +882,6 @@ bool AquaSalGraphics::drawPolyLine( // setup poly-polygon path CGMutablePathRef xPath = CGPathCreateMutable(); - SAL_INFO( "vcl.cg", "CGPathCreateMutable() = " << xPath ); AddPolygonToPath( xPath, aPolyLine, @@ -929,25 +890,20 @@ bool AquaSalGraphics::drawPolyLine( true); const CGRect aRefreshRect = CGPathGetBoundingBox( xPath ); - SAL_INFO( "vcl.cg", "CGPathGetBoundingBox(" << xPath << ") = " << aRefreshRect ); // #i97317# workaround for Quartz having problems with drawing small polygons if( ! ((aRefreshRect.size.width <= 0.125) && (aRefreshRect.size.height <= 0.125)) ) { // use the path to prepare the graphics context maContextHolder.saveState(); - SAL_INFO( "vcl.cg", "CGContextBeginPath(" << maContextHolder.get() << ")" ); CGContextBeginPath( maContextHolder.get() ); - SAL_INFO( "vcl.cg", "CGContextAddPath(" << maContextHolder.get() << "," << xPath << ")" ); CGContextAddPath( maContextHolder.get(), xPath ); // draw path with antialiased line CGContextSetShouldAntialias( maContextHolder.get(), true ); - SAL_INFO( "vcl.cg", "CGContextSetAlpha(" << maContextHolder.get() << "," << 1.0 - fTransparency << ")" ); CGContextSetAlpha( maContextHolder.get(), 1.0 - fTransparency ); CGContextSetLineJoin( maContextHolder.get(), aCGLineJoin ); CGContextSetLineCap( maContextHolder.get(), aCGLineCap ); CGContextSetLineWidth( maContextHolder.get(), aLineWidths.getX() ); CGContextSetMiterLimit(maContextHolder.get(), fCGMiterLimit); - SAL_INFO( "vcl.cg", "CGContextDrawPath(" << maContextHolder.get() << ",kCGPathStroke)" ); CGContextDrawPath( maContextHolder.get(), kCGPathStroke ); maContextHolder.restoreState(); @@ -955,7 +911,6 @@ bool AquaSalGraphics::drawPolyLine( RefreshRect( aRefreshRect ); } - SAL_INFO( "vcl.cg", "CGPathRelease(" << xPath << ")" ); CGPathRelease( xPath ); return true; @@ -990,7 +945,6 @@ bool AquaSalGraphics::drawPolyPolygon( // setup poly-polygon path CGMutablePathRef xPath = CGPathCreateMutable(); - SAL_INFO( "vcl.cg", "CGPathCreateMutable() = " << xPath ); // tdf#120252 Use the correct, already transformed PolyPolygon (as long as // the transformation is not used here...) for(auto const& rPolygon : aPolyPolygon) @@ -999,7 +953,6 @@ bool AquaSalGraphics::drawPolyPolygon( } const CGRect aRefreshRect = CGPathGetBoundingBox( xPath ); - SAL_INFO( "vcl.cg", "CGPathGetBoundingBox(" << xPath << ") = " << aRefreshRect ); // #i97317# workaround for Quartz having problems with drawing small polygons if( ! ((aRefreshRect.size.width <= 0.125) && (aRefreshRect.size.height <= 0.125)) ) { @@ -1020,23 +973,18 @@ bool AquaSalGraphics::drawPolyPolygon( else { SAL_WARN( "vcl.quartz", "Neither pen nor brush visible" ); - SAL_INFO( "vcl.cg", "CGPathRelease(" << xPath << ")" ); CGPathRelease( xPath ); return true; } // use the path to prepare the graphics context maContextHolder.saveState(); - SAL_INFO( "vcl.cg", "CGContextBeginPath(" << maContextHolder.get() << ")" ); CGContextBeginPath( maContextHolder.get() ); - SAL_INFO( "vcl.cg", "CGContextAddPath(" << maContextHolder.get() << "," << xPath << ")" ); CGContextAddPath( maContextHolder.get(), xPath ); // draw path with antialiased polygon CGContextSetShouldAntialias( maContextHolder.get(), true ); - SAL_INFO( "vcl.cg", "CGContextSetAlpha(" << maContextHolder.get() << "," << 1.0 - fTransparency << ")" ); CGContextSetAlpha( maContextHolder.get(), 1.0 - fTransparency ); - SAL_INFO( "vcl.cg", "CGContextDrawPath(" << maContextHolder.get() << "," << eMode << ")" ); CGContextDrawPath( maContextHolder.get(), eMode ); maContextHolder.restoreState(); @@ -1044,7 +992,6 @@ bool AquaSalGraphics::drawPolyPolygon( RefreshRect( aRefreshRect ); } - SAL_INFO( "vcl.cg", "CGPathRelease(" << xPath << ")" ); CGPathRelease( xPath ); return true; @@ -1107,7 +1054,6 @@ void AquaSalGraphics::drawPolyPolygon( sal_uInt32 nPolyCount, const sal_uInt32 * } // convert to CGPath - SAL_INFO( "vcl.cg", "CGContextBeginPath(" << maContextHolder.get() << ")" ); CGContextBeginPath( maContextHolder.get() ); if( IsPenVisible() ) { @@ -1120,17 +1066,14 @@ void AquaSalGraphics::drawPolyPolygon( sal_uInt32 nPolyCount, const sal_uInt32 * float fX, fY; alignLinePoint( pPtAry, fX, fY ); - SAL_INFO( "vcl.cg", "CGContextMoveToPoint(" << maContextHolder.get() << "," << fX << "," << fY << ")" ); CGContextMoveToPoint( maContextHolder.get(), fX, fY ); pPtAry++; for( sal_uInt32 nPoint = 1; nPoint < nPoints; nPoint++, pPtAry++ ) { alignLinePoint( pPtAry, fX, fY ); - SAL_INFO( "vcl.cg", "CGContextAddLineToPoint(" << maContextHolder.get() << "," << fX << "," << fY << ")" ); CGContextAddLineToPoint( maContextHolder.get(), fX, fY ); } - SAL_INFO( "vcl.cg", "CGContextClosePath(" << maContextHolder.get() << ")"); CGContextClosePath(maContextHolder.get()); } } @@ -1143,27 +1086,17 @@ void AquaSalGraphics::drawPolyPolygon( sal_uInt32 nPolyCount, const sal_uInt32 * if( nPoints > 1 ) { const SalPoint *pPtAry = ppPtAry[nPoly]; - SAL_INFO( "vcl.cg", "CGContextMoveToPoint(" << maContextHolder.get() << "," << pPtAry->mnX << "," << pPtAry->mnY << ")" ); CGContextMoveToPoint( maContextHolder.get(), pPtAry->mnX, pPtAry->mnY ); pPtAry++; for( sal_uInt32 nPoint = 1; nPoint < nPoints; nPoint++, pPtAry++ ) { - SAL_INFO( "vcl.cg", "CGContextAddLineToPoint(" << maContextHolder.get() << "," << pPtAry->mnX << "," << pPtAry->mnY << ")" ); CGContextAddLineToPoint( maContextHolder.get(), pPtAry->mnX, pPtAry->mnY ); } - SAL_INFO( "vcl.cg", "CGContextClosePath(" << maContextHolder.get() << ")"); CGContextClosePath(maContextHolder.get()); } } } - SAL_INFO( "vcl.cg", "CGContextDrawPath(" << maContextHolder.get() << "," << - (eMode == kCGPathFill ? "kCGPathFill" : - (eMode == kCGPathEOFill ? "kCGPathEOFill" : - (eMode == kCGPathFillStroke ? "kCGPathFillStroke" : - (eMode == kCGPathEOFillStroke ? "kCGPathEOFillStroke" : - "???")))) - << ")" ); CGContextDrawPath( maContextHolder.get(), eMode ); RefreshRect( leftX, topY, maxWidth, maxHeight ); @@ -1199,38 +1132,31 @@ void AquaSalGraphics::drawPolygon( sal_uInt32 nPoints, const SalPoint *pPtAry ) return; } - SAL_INFO( "vcl.cg", "CGContextBeginPath(" << maContextHolder.get() << ")" ); CGContextBeginPath( maContextHolder.get() ); if( IsPenVisible() ) { float fX, fY; alignLinePoint( pPtAry, fX, fY ); - SAL_INFO( "vcl.cg", "CGContextMoveToPoint(" << maContextHolder.get() << "," << fX << "," << fY << ")" ); CGContextMoveToPoint( maContextHolder.get(), fX, fY ); pPtAry++; for( sal_uInt32 nPoint = 1; nPoint < nPoints; nPoint++, pPtAry++ ) { alignLinePoint( pPtAry, fX, fY ); - SAL_INFO( "vcl.cg", "CGContextAddLineToPoint(" << maContextHolder.get() << "," << fX << "," << fY << ")" ); CGContextAddLineToPoint( maContextHolder.get(), fX, fY ); } } else { - SAL_INFO( "vcl.cg", "CGContextMoveToPoint(" << maContextHolder.get() << "," << pPtAry->mnX << "," << pPtAry->mnY << ")" ); CGContextMoveToPoint( maContextHolder.get(), pPtAry->mnX, pPtAry->mnY ); pPtAry++; for( sal_uInt32 nPoint = 1; nPoint < nPoints; nPoint++, pPtAry++ ) { - SAL_INFO( "vcl.cg", "CGContextAddLineToPoint(" << maContextHolder.get() << "," << pPtAry->mnX << "," << pPtAry->mnY << ")" ); CGContextAddLineToPoint( maContextHolder.get(), pPtAry->mnX, pPtAry->mnY ); } } - SAL_INFO( "vcl.cg", "CGContextClosePath(" << maContextHolder.get() << ")"); CGContextClosePath( maContextHolder.get() ); - SAL_INFO( "vcl.cg", "CGContextDrawPath(" << maContextHolder.get() << "," << eMode << ")" ); CGContextDrawPath( maContextHolder.get(), eMode ); RefreshRect( nX, nY, nWidth, nHeight ); } @@ -1262,12 +1188,10 @@ void AquaSalGraphics::drawRect( long nX, long nY, long nWidth, long nHeight ) if( IsBrushVisible() ) { - SAL_INFO( "vcl.cg", "CGContextFillRect(" << maContextHolder.get() << "," << aRect << ")" ); CGContextFillRect( maContextHolder.get(), aRect ); } if( IsPenVisible() ) { - SAL_INFO( "vcl.cg", "CGContextStrokeRect(" << maContextHolder.get() << "," << aRect << ")" ); CGContextStrokeRect( maContextHolder.get(), aRect ); } RefreshRect( nX, nY, nWidth, nHeight ); @@ -1285,20 +1209,16 @@ void AquaSalGraphics::drawPolyLine( sal_uInt32 nPoints, const SalPoint *pPtAry ) getBoundRect( nPoints, pPtAry, nX, nY, nWidth, nHeight ); float fX, fY; - SAL_INFO( "vcl.cg", "CGContextBeginPath(" << maContextHolder.get() << ")" ); CGContextBeginPath( maContextHolder.get() ); alignLinePoint( pPtAry, fX, fY ); - SAL_INFO( "vcl.cg", "CGContextMoveToPoint(" << maContextHolder.get() << "," << fX << "," << fY << ")" ); CGContextMoveToPoint( maContextHolder.get(), fX, fY ); pPtAry++; for( sal_uInt32 nPoint = 1; nPoint < nPoints; nPoint++, pPtAry++ ) { alignLinePoint( pPtAry, fX, fY ); - SAL_INFO( "vcl.cg", "CGContextAddLineToPoint(" << maContextHolder.get() << "," << fX << "," << fY << ")" ); CGContextAddLineToPoint( maContextHolder.get(), fX, fY ); } - SAL_INFO( "vcl.cg", "CGContextStrokePath(" << maContextHolder.get() << ")" ); CGContextStrokePath(maContextHolder.get()); RefreshRect( nX, nY, nWidth, nHeight ); @@ -1378,8 +1298,6 @@ Color AquaSalGraphics::getPixel( long nX, long nY ) GetSalData()->mxRGBSpace, kCGImageAlphaNoneSkipFirst | kCGBitmapByteOrder32Big ); - SAL_INFO( "vcl.cg", "CGBitmapContextCreate(1x1x8) = " << xOnePixelContext ); - // update this graphics layer ApplyXorContext(); @@ -1389,11 +1307,8 @@ Color AquaSalGraphics::getPixel( long nX, long nY ) nY = mnHeight - nY; } const CGPoint aCGPoint = CGPointMake(-nX, -nY); - SAL_INFO("vcl.cg", "CGContextDrawLayerAtPoint(" << - xOnePixelContext << "," << aCGPoint << "," << maLayer.get() << ")"); CGContextDrawLayerAtPoint(xOnePixelContext, aCGPoint, maLayer.get()); - SAL_INFO( "vcl.cg", "CGContextRelease(" << xOnePixelContext << ")" ); CGContextRelease( xOnePixelContext ); Color nColor( aPixel.r, aPixel.g, aPixel.b ); @@ -1431,15 +1346,12 @@ void AquaSalGraphics::ImplDrawPixel( long nX, long nY, const RGBAColor& rColor ) return; } // overwrite the fill color - SAL_INFO( "vcl.cg", "CGContextSetFillColor(" << maContextHolder.get() << "," << rColor << ")" ); CGContextSetFillColor( maContextHolder.get(), rColor.AsArray() ); // draw 1x1 rect, there is no pixel drawing in Quartz const CGRect aDstRect = CGRectMake(nX, nY, 1, 1); - SAL_INFO( "vcl.cg", "CGContextFillRect(" << maContextHolder.get() << "," << aDstRect << ")" ); CGContextFillRect( maContextHolder.get(), aDstRect ); RefreshRect( aDstRect ); // reset the fill color - SAL_INFO( "vcl.cg", "CGContextSetFillColor(" << maContextHolder.get() << "," << maFillColor << ")" ); CGContextSetFillColor( maContextHolder.get(), maFillColor.AsArray() ); } @@ -1563,11 +1475,9 @@ void AquaSalGraphics::invert( long nX, long nY, long nWidth, long nHeight, SalIn { const CGFloat dashLengths[2] = { 4.0, 4.0 }; // for drawing dashed line CGContextSetBlendMode( maContextHolder.get(), kCGBlendModeDifference ); - SAL_INFO( "vcl.cg", "CGContextSetRGBStrokeColor(" << maContextHolder.get() << ",{1,1,1,1})" ); CGContextSetRGBStrokeColor ( maContextHolder.get(), 1.0, 1.0, 1.0, 1.0 ); CGContextSetLineDash ( maContextHolder.get(), 0, dashLengths, 2 ); CGContextSetLineWidth( maContextHolder.get(), 2.0); - SAL_INFO( "vcl.cg", "CGContextStrokeRect(" << maContextHolder.get() << "," << aCGRect << ")" ); CGContextStrokeRect ( maContextHolder.get(), aCGRect ); } else if ( nFlags & SalInvert::N50 ) @@ -1580,9 +1490,7 @@ void AquaSalGraphics::invert( long nX, long nY, long nWidth, long nHeight, SalIn else // just invert { CGContextSetBlendMode(maContextHolder.get(), kCGBlendModeDifference); - SAL_INFO( "vcl.cg", "CGContextSetRGBFillColor(" << maContextHolder.get() << ",{1,1,1,1})" ); CGContextSetRGBFillColor ( maContextHolder.get(),1.0, 1.0, 1.0 , 1.0 ); - SAL_INFO( "vcl.cg", "CGContextFillRect(" << maContextHolder.get() << "," << aCGRect << ")" ); CGContextFillRect ( maContextHolder.get(), aCGRect ); } maContextHolder.restoreState(); @@ -1616,11 +1524,9 @@ void AquaSalGraphics::invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalIn { const CGFloat dashLengths[2] = { 4.0, 4.0 }; // for drawing dashed line CGContextSetBlendMode( maContextHolder.get(), kCGBlendModeDifference ); - SAL_INFO( "vcl.cg", "CGContextSetRGBStrokeColor(" << maContextHolder.get() << ",{1,1,1,1})" ); CGContextSetRGBStrokeColor ( maContextHolder.get(), 1.0, 1.0, 1.0, 1.0 ); CGContextSetLineDash ( maContextHolder.get(), 0, dashLengths, 2 ); CGContextSetLineWidth( maContextHolder.get(), 2.0); - SAL_INFO( "vcl.cg", "CGContextStrokePath(" << maContextHolder.get() << ")" ); CGContextStrokePath ( maContextHolder.get() ); } else if ( nSalFlags & SalInvert::N50 ) @@ -1631,9 +1537,7 @@ void AquaSalGraphics::invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalIn else // just invert { CGContextSetBlendMode( maContextHolder.get(), kCGBlendModeDifference ); - SAL_INFO( "vcl.cg", "CGContextSetRGBFillColor(" << maContextHolder.get() << ",{1,1,1,1})" ); CGContextSetRGBFillColor( maContextHolder.get(), 1.0, 1.0, 1.0, 1.0 ); - SAL_INFO( "vcl.cg", "CGContextFillPath(" << maContextHolder.get() << ")" ); CGContextFillPath( maContextHolder.get() ); } const CGRect aRefreshRect = CGContextGetClipBoundingBox(maContextHolder.get()); @@ -1653,11 +1557,8 @@ void AquaSalGraphics::Pattern50Fill() kCGPatternTilingConstantSpacing, false, &aCallback ); SAL_WARN_IF( !maContextHolder.get(), "vcl.quartz", "maContextHolder.get() is NULL" ); - SAL_INFO( "vcl.cg", "CGContextSetFillColorSpace(" << maContextHolder.get() << "," << mxP50Space << ")" ); CGContextSetFillColorSpace( maContextHolder.get(), mxP50Space ); - SAL_INFO( "vcl.cg", "CGContextSetFillPattern(" << maContextHolder.get() << "," << mxP50Pattern << ",{1,1,1,1})" ); CGContextSetFillPattern( maContextHolder.get(), mxP50Pattern, aFillCol ); - SAL_INFO( "vcl.cg", "CGContextFillPath(" << maContextHolder.get() << ")" ); CGContextFillPath( maContextHolder.get() ); } @@ -1666,7 +1567,6 @@ void AquaSalGraphics::ResetClipRegion() // release old path and indicate no clipping if( mxClipPath ) { - SAL_INFO( "vcl.cg", "CGPathRelease(" << mxClipPath << ")" ); CGPathRelease( mxClipPath ); mxClipPath = nullptr; } @@ -1684,19 +1584,14 @@ void AquaSalGraphics::SetState() // setup clipping if( mxClipPath ) { - SAL_INFO( "vcl.cg", "CGContextBeginPath(" << maContextHolder.get() << ")" ); CGContextBeginPath( maContextHolder.get() ); // discard any existing path - SAL_INFO( "vcl.cg", "CGContextAddPath(" << maContextHolder.get() << "," << mxClipPath << ")" ); CGContextAddPath( maContextHolder.get(), mxClipPath ); // set the current path to the clipping path - SAL_INFO( "vcl.cg", "CGContextClip(" << maContextHolder.get() << ")" ); CGContextClip( maContextHolder.get() ); // use it for clipping } // set RGB colorspace and line and fill colors - SAL_INFO( "vcl.cg", "CGContextSetFillColor(" << maContextHolder.get() << "," << maFillColor << ")" ); CGContextSetFillColor( maContextHolder.get(), maFillColor.AsArray() ); - SAL_INFO( "vcl.cg", "CGContextSetStrokeColor(" << maContextHolder.get() << "," << maLineColor << ")" ); CGContextSetStrokeColor( maContextHolder.get(), maLineColor.AsArray() ); CGContextSetShouldAntialias( maContextHolder.get(), false ); if( mnXorMode == 2 ) @@ -1710,7 +1605,6 @@ void AquaSalGraphics::SetLineColor() maLineColor.SetAlpha( 0.0 ); // transparent if( CheckContext() ) { - SAL_INFO( "vcl.cg", "CGContextSetRGBStrokeColor(" << maContextHolder.get() << "," << maLineColor << ")" ); CGContextSetRGBStrokeColor( maContextHolder.get(), maLineColor.GetRed(), maLineColor.GetGreen(), maLineColor.GetBlue(), maLineColor.GetAlpha() ); } @@ -1721,7 +1615,6 @@ void AquaSalGraphics::SetLineColor( Color nColor ) maLineColor = RGBAColor( nColor ); if( CheckContext() ) { - SAL_INFO( "vcl.cg", "CGContextSetRGBStrokeColor(" << maContextHolder.get() << "," << maLineColor << ")" ); CGContextSetRGBStrokeColor( maContextHolder.get(), maLineColor.GetRed(), maLineColor.GetGreen(), maLineColor.GetBlue(), maLineColor.GetAlpha() ); } @@ -1732,7 +1625,6 @@ void AquaSalGraphics::SetFillColor() maFillColor.SetAlpha( 0.0 ); // transparent if( CheckContext() ) { - SAL_INFO( "vcl.cg", "CGContextSetRGBFillColor(" << maContextHolder.get() << "," << maFillColor << ")" ); CGContextSetRGBFillColor( maContextHolder.get(), maFillColor.GetRed(), maFillColor.GetGreen(), maFillColor.GetBlue(), maFillColor.GetAlpha() ); } @@ -1743,7 +1635,6 @@ void AquaSalGraphics::SetFillColor( Color nColor ) maFillColor = RGBAColor( nColor ); if( CheckContext() ) { - SAL_INFO( "vcl.cg", "CGContextSetRGBFillColor(" << maContextHolder.get() << "," << maFillColor << ")" ); CGContextSetRGBFillColor( maContextHolder.get(), maFillColor.GetRed(), maFillColor.GetGreen(), maFillColor.GetBlue(), maFillColor.GetAlpha() ); } @@ -1769,12 +1660,10 @@ bool AquaSalGraphics::setClipRegion( const vcl::Region& i_rClip ) // release old clip path if( mxClipPath ) { - SAL_INFO( "vcl.cg", "CGPathRelease(" << mxClipPath << ")" ); CGPathRelease( mxClipPath ); mxClipPath = nullptr; } mxClipPath = CGPathCreateMutable(); - SAL_INFO( "vcl.cg", "CGPathCreateMutable() = " << mxClipPath ); // set current path, either as polypolgon or sequence of rectangles if(i_rClip.HasPolyPolygonOrB2DPolyPolygon()) @@ -1799,7 +1688,6 @@ bool AquaSalGraphics::setClipRegion( const vcl::Region& i_rClip ) if(nH) { const CGRect aRect = CGRectMake( rRect.Left(), rRect.Top(), nW, nH); - SAL_INFO( "vcl.cg", "CGPathAddRect(" << mxClipPath << ",NULL," << aRect << ")" ); CGPathAddRect( mxClipPath, nullptr, aRect ); } } @@ -1926,7 +1814,6 @@ void XorEmulation::SetTarget( int nWidth, int nHeight, int nTargetDepth, if( m_xMaskContext ) { // cleanup the mask context - SAL_INFO( "vcl.cg", "CGContextRelease(" << m_xMaskContext << ")" ); CGContextRelease( m_xMaskContext ); delete[] m_pMaskBuffer; m_xMaskContext = nullptr; @@ -1935,7 +1822,6 @@ void XorEmulation::SetTarget( int nWidth, int nHeight, int nTargetDepth, // cleanup the temp context if needed if( m_xTempContext ) { - SAL_INFO( "vcl.cg", "CGContextRelease(" << m_xTempContext << ")" ); CGContextRelease( m_xTempContext ); delete[] m_pTempBuffer; m_xTempContext = nullptr; @@ -1978,7 +1864,6 @@ void XorEmulation::SetTarget( int nWidth, int nHeight, int nTargetDepth, nBitsPerComponent, nBytesPerRow, aCGColorSpace, aCGBmpInfo ); SAL_WARN_IF( !m_xMaskContext, "vcl.quartz", "mask context creation failed" ); - SAL_INFO( "vcl.cg", "CGBitmapContextCreate(" << nWidth << "x" << nHeight << ") = " << m_xMaskContext ); // reset the XOR mask to black memset( m_pMaskBuffer, 0, m_nBufferLongs * sizeof(sal_uLong) ); @@ -1998,7 +1883,6 @@ void XorEmulation::SetTarget( int nWidth, int nHeight, int nTargetDepth, nBitsPerComponent, nBytesPerRow, aCGColorSpace, aCGBmpInfo ); SAL_WARN_IF( !m_xTempContext, "vcl.quartz", "temp context creation failed" ); - SAL_INFO( "vcl.cg", "CGBitmapContextCreate(" << nWidth << "x" << nHeight << ") = " << m_xTempContext ); } // initialize XOR mask context for drawing @@ -2035,7 +1919,6 @@ bool XorEmulation::UpdateTarget() if( m_xTempContext ) { SAL_WARN_IF( m_xTargetContext == nullptr, "vcl.quartz", "Target layer is NULL"); - SAL_INFO( "vcl.cg", "CGContextDrawLayerAtPoint(" << m_xTempContext << "," << CGPointZero << "," << m_xTargetLayer << ")" ); CGContextDrawLayerAtPoint( m_xTempContext, CGPointZero, m_xTargetLayer ); } // do a manual XOR with the XorMask @@ -2051,14 +1934,11 @@ bool XorEmulation::UpdateTarget() if( m_xTempContext ) { CGImageRef xXorImage = CGBitmapContextCreateImage( m_xTempContext ); - SAL_INFO( "vcl.cg", "CGBitmapContextCreateImage(" << m_xTempContext << ") = " << xXorImage ); const int nWidth = static_cast<int>(CGImageGetWidth( xXorImage )); const int nHeight = static_cast<int>(CGImageGetHeight( xXorImage )); // TODO: update minimal changerect const CGRect aFullRect = CGRectMake(0, 0, nWidth, nHeight); - SAL_INFO( "vcl.cg", "CGContextDrawImage(" << m_xTargetContext << "," << aFullRect << "," << xXorImage << ")" ); CGContextDrawImage( m_xTargetContext, aFullRect, xXorImage ); - SAL_INFO( "vcl.cg", "CGImageRelease(" << xXorImage << ")" ); CGImageRelease( xXorImage ); } @@ -2114,15 +1994,12 @@ void AquaSalGraphics::SetVirDevGraphics(CGLayerHolder const & rLayer, CGContextR { mnWidth = CGBitmapContextGetWidth( maContextHolder.get() ); mnHeight = CGBitmapContextGetHeight( maContextHolder.get() ); - SAL_INFO( "vcl.cg", "CGBitmapContextGetWidth&Height(" << maContextHolder.get() << - ") = " << mnWidth << "x" << mnHeight ); } else { const CGSize aSize = CGLayerGetSize(maLayer.get()); mnWidth = static_cast<int>(aSize.width); mnHeight = static_cast<int>(aSize.height); - SAL_INFO("vcl.cg", "CGLayerGetSize(" << maLayer.get() << ") = " << aSize); } // prepare graphics for drawing diff --git a/vcl/quartz/salgdiutils.cxx b/vcl/quartz/salgdiutils.cxx index 4b0db0c901e9..589bd2ae22e5 100644 --- a/vcl/quartz/salgdiutils.cxx +++ b/vcl/quartz/salgdiutils.cxx @@ -81,7 +81,6 @@ void AquaSalGraphics::UnsetState() } if( mxClipPath ) { - SAL_INFO( "vcl.cg", "CGPathRelease(" << mxClipPath << ")" ); CGPathRelease( mxClipPath ); mxClipPath = nullptr; } @@ -118,7 +117,6 @@ bool AquaSalGraphics::CheckContext() } else if (maContextHolder.isSet()) { - SAL_INFO("vcl.cg", "CGContextRelease(" << maContextHolder.get() << ")"); CGContextRelease(maContextHolder.get()); } maContextHolder.set(nullptr); @@ -155,10 +153,8 @@ bool AquaSalGraphics::CheckContext() // copy original layer to resized layer if (maContextHolder.isSet()) { - SAL_INFO("vcl.cg", "CGContextDrawLayerAtPoint(" << maContextHolder.get() << "," << CGPointZero << "," << rReleaseLayer << ")"); CGContextDrawLayerAtPoint(maContextHolder.get(), CGPointZero, rReleaseLayer); } - SAL_INFO("vcl.cg", "CGLayerRelease(" << rReleaseLayer << ")"); CGLayerRelease(rReleaseLayer); } @@ -210,7 +206,6 @@ void AquaSalGraphics::UpdateWindow( NSRect& ) if (maLayer.isSet() && pContext != nullptr) { CGContextHolder rCGContextHolder([pContext CGContext]); - SAL_INFO("vcl.cg", "[[NSGraphicsContext currentContext] CGContext] = " << rCGContextHolder.get()); rCGContextHolder.saveState(); @@ -218,9 +213,7 @@ void AquaSalGraphics::UpdateWindow( NSRect& ) if (rClip) { CGContextBeginPath(rCGContextHolder.get()); - SAL_INFO( "vcl.cg", "CGContextAddPath(" << rCGContextHolder.get() << "," << rClip << ")" ); CGContextAddPath(rCGContextHolder.get(), rClip ); - SAL_INFO( "vcl.cg", "CGContextClip(" << rCGContextHolder.get() << ")" ); CGContextClip(rCGContextHolder.get()); } @@ -229,7 +222,6 @@ void AquaSalGraphics::UpdateWindow( NSRect& ) const CGSize aSize = maLayer.getSizePoints(); const CGRect aRect = CGRectMake(0, 0, aSize.width, aSize.height); - SAL_INFO( "vcl.cg", "CGContextDrawLayerInRect(" << rCGContextHolder.get() << "," << aRect << "," << maLayer.get() << ")" ); CGContextDrawLayerInRect(rCGContextHolder.get(), aRect, maLayer.get()); rCGContextHolder.restoreState(); diff --git a/vcl/quartz/salvd.cxx b/vcl/quartz/salvd.cxx index c438f5245eba..c06ba33c5b6f 100644 --- a/vcl/quartz/salvd.cxx +++ b/vcl/quartz/salvd.cxx @@ -101,8 +101,7 @@ AquaSalVirtualDevice::AquaSalVirtualDevice( AquaSalGraphics* pGraphic, long &nDX nDX = 0; nDY = 0; } - SAL_INFO( "vcl.cg", "CGLayerCreateWithContext(" << pData->rCGContext << - "," << CGSizeMake( nDX, nDY) << ",NULL) = " << maLayer.get()); + mpGraphics->SetVirDevGraphics(maLayer, pData->rCGContext); } else @@ -174,7 +173,6 @@ void AquaSalVirtualDevice::Destroy() { mpGraphics->SetVirDevGraphics(nullptr, nullptr); } - SAL_INFO("vcl.cg", "CGLayerRelease(" << maLayer.get() << ")"); CGLayerRelease(maLayer.get()); maLayer.set(nullptr); } @@ -183,7 +181,6 @@ void AquaSalVirtualDevice::Destroy() { void* pRawData = CGBitmapContextGetData(maBitmapContext.get()); std::free(pRawData); - SAL_INFO( "vcl.cg", "CGContextRelease(" << maBitmapContext.get() << ")" ); CGContextRelease(maBitmapContext.get()); maBitmapContext.set(nullptr); } @@ -218,7 +215,6 @@ bool AquaSalVirtualDevice::SetSize( long nDX, long nDY ) if (maLayer.isSet()) { const CGSize aSize = CGLayerGetSize(maLayer.get()); - SAL_INFO( "vcl.cg", "CGlayerGetSize(" << maLayer.get() << ") = " << aSize ); if( (nDX == aSize.width) && (nDY == aSize.height) ) { // Yay, we do not have to do anything :) @@ -242,7 +238,6 @@ bool AquaSalVirtualDevice::SetSize( long nDX, long nDY ) maBitmapContext.set(CGBitmapContextCreate( pRawData, nDX, nDY, mnBitmapDepth, nBytesPerRow, GetSalData()->mxGraySpace, kCGImageAlphaNone)); - SAL_INFO("vcl.cg", "CGBitmapContextCreate(" << nDX << "x" << nDY << "x" << mnBitmapDepth << ") = " << maBitmapContext.get()); xCGContextHolder = maBitmapContext; } else @@ -286,7 +281,6 @@ bool AquaSalVirtualDevice::SetSize( long nDX, long nDY ) #endif maBitmapContext.set(CGBitmapContextCreate(pRawData, nDX, nDY, 8, nBytesPerRow, GetSalData()->mxRGBSpace, nFlags)); - SAL_INFO("vcl.cg", "CGBitmapContextCreate(" << nDX << "x" << nDY << "x32) = " << maBitmapContext.get()); xCGContextHolder = maBitmapContext; } } @@ -295,13 +289,11 @@ bool AquaSalVirtualDevice::SetSize( long nDX, long nDY ) const CGSize aNewSize = { static_cast<CGFloat>(nDX), static_cast<CGFloat>(nDY) }; maLayer.set(CGLayerCreateWithContext(xCGContextHolder.get(), aNewSize, nullptr)); - SAL_INFO("vcl.cg", "CGLayerCreateWithContext(" << xCGContextHolder.get() << "," << aNewSize << ",NULL) = " << maLayer.get()); if (maLayer.isSet() && mpGraphics) { // get the matching Quartz context CGContextRef xDrawContext = CGLayerGetContext( maLayer.get() ); - SAL_INFO( "vcl.cg", "CGLayerGetContext(" << maLayer.get() << ") = " << xDrawContext ); mpGraphics->SetVirDevGraphics(maLayer.get(), xDrawContext, mnBitmapDepth); } |