vcl/quartz/salbmp.cxx | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
New commits: commit 4f3b78e9e2e16ded92b7e3f28fc84a98b79de117 Author: Tor Lillqvist <t...@collabora.com> AuthorDate: Mon Jan 4 13:26:29 2021 +0200 Commit: Tor Lillqvist <t...@collabora.com> CommitDate: Mon Jan 4 21:52:19 2021 +0100 Don't use m prefix for a local variable Change-Id: I73e106923d463215078a465f9ff933ea3c89255f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108665 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <t...@collabora.com> diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx index 4603fe57bf45..ecd3c974b081 100644 --- a/vcl/quartz/salbmp.cxx +++ b/vcl/quartz/salbmp.cxx @@ -916,26 +916,26 @@ bool QuartzSalBitmap::GetSystemData( BitmapSystemData& rData ) CGImageRef xImage = CGBitmapContextCreateImage(maGraphicContext.get()); // re-create the context with single change: include kCGBitmapByteOrder32Host flag. - CGContextHolder maGraphicContextNew(CGBitmapContextCreate(CGBitmapContextGetData(maGraphicContext.get()), - CGBitmapContextGetWidth(maGraphicContext.get()), - CGBitmapContextGetHeight(maGraphicContext.get()), - CGBitmapContextGetBitsPerComponent(maGraphicContext.get()), - CGBitmapContextGetBytesPerRow(maGraphicContext.get()), - CGBitmapContextGetColorSpace(maGraphicContext.get()), - CGBitmapContextGetBitmapInfo(maGraphicContext.get()) | kCGBitmapByteOrder32Host)); + CGContextHolder aGraphicContextNew(CGBitmapContextCreate(CGBitmapContextGetData(maGraphicContext.get()), + CGBitmapContextGetWidth(maGraphicContext.get()), + CGBitmapContextGetHeight(maGraphicContext.get()), + CGBitmapContextGetBitsPerComponent(maGraphicContext.get()), + CGBitmapContextGetBytesPerRow(maGraphicContext.get()), + CGBitmapContextGetColorSpace(maGraphicContext.get()), + CGBitmapContextGetBitmapInfo(maGraphicContext.get()) | kCGBitmapByteOrder32Host)); CFRelease(maGraphicContext.get()); // Needs to be flipped - maGraphicContextNew.saveState(); - CGContextTranslateCTM (maGraphicContextNew.get(), 0, CGBitmapContextGetHeight(maGraphicContextNew.get())); - CGContextScaleCTM (maGraphicContextNew.get(), 1.0, -1.0); + aGraphicContextNew.saveState(); + CGContextTranslateCTM (aGraphicContextNew.get(), 0, CGBitmapContextGetHeight(aGraphicContextNew.get())); + CGContextScaleCTM (aGraphicContextNew.get(), 1.0, -1.0); - CGContextDrawImage(maGraphicContextNew.get(), CGRectMake( 0, 0, CGImageGetWidth(xImage), CGImageGetHeight(xImage)), xImage); + CGContextDrawImage(aGraphicContextNew.get(), CGRectMake( 0, 0, CGImageGetWidth(xImage), CGImageGetHeight(xImage)), xImage); // Flip back - CGContextRestoreGState( maGraphicContextNew.get() ); + CGContextRestoreGState( aGraphicContextNew.get() ); CGImageRelease( xImage ); - maGraphicContext = maGraphicContextNew; + maGraphicContext = aGraphicContextNew; } rData.mnWidth = mnWidth; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits