aboutsummaryrefslogtreecommitdiffhomepage
path: root/cocoa/PlatCocoa.mm
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2017-01-24 08:29:17 +1100
committerNeil <nyamatongwe@gmail.com>2017-01-24 08:29:17 +1100
commitf313669cc99a25b0f2ba4f57d98ba9a3a395b3dd (patch)
tree5ae1d35e3d5ef112a1949506b6c068f3b80f95fe /cocoa/PlatCocoa.mm
parent3c428011dfc1fde79557264eabfb76bd48d62482 (diff)
downloadscintilla-mirror-f313669cc99a25b0f2ba4f57d98ba9a3a395b3dd.tar.gz
Use correct signatures for pattern draw and release functions and avoid
reinterpret_cast
Diffstat (limited to 'cocoa/PlatCocoa.mm')
-rw-r--r--cocoa/PlatCocoa.mm11
1 files changed, 5 insertions, 6 deletions
diff --git a/cocoa/PlatCocoa.mm b/cocoa/PlatCocoa.mm
index bef571809..0f9e07604 100644
--- a/cocoa/PlatCocoa.mm
+++ b/cocoa/PlatCocoa.mm
@@ -481,16 +481,17 @@ void SurfaceImpl::FillRectangle(PRectangle rc, ColourDesired back)
//--------------------------------------------------------------------------------------------------
-static void drawImageRefCallback(CGImageRef pattern, CGContextRef gc)
+static void drawImageRefCallback(void *info, CGContextRef gc)
{
+ CGImageRef pattern = static_cast<CGImageRef>(info);
CGContextDrawImage(gc, CGRectMake(0, 0, CGImageGetWidth(pattern), CGImageGetHeight(pattern)), pattern);
}
//--------------------------------------------------------------------------------------------------
-static void releaseImageRefCallback(CGImageRef pattern)
+static void releaseImageRefCallback(void *info)
{
- CGImageRelease(pattern);
+ CGImageRelease(static_cast<CGImageRef>(info));
}
//--------------------------------------------------------------------------------------------------
@@ -507,9 +508,7 @@ void SurfaceImpl::FillRectangle(PRectangle rc, Surface &surfacePattern)
return;
}
- const CGPatternCallbacks drawImageCallbacks = { 0,
- reinterpret_cast<CGPatternDrawPatternCallback>(drawImageRefCallback),
- reinterpret_cast<CGPatternReleaseInfoCallback>(releaseImageRefCallback) };
+ const CGPatternCallbacks drawImageCallbacks = { 0, drawImageRefCallback, releaseImageRefCallback };
CGPatternRef pattern = CGPatternCreate(image,
CGRectMake(0, 0, patternSurface.bitmapWidth, patternSurface.bitmapHeight),