diff options
author | Andrew Kitchen <akitchen@gmail.com> | 2017-11-27 16:47:58 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-27 16:47:58 -0800 |
commit | a2817ff5ed301f0da5817279ca7184b0c22bdf21 (patch) | |
tree | c532d212c8e020ac2215a26239aa51264946f9c1 /platform/darwin | |
parent | 5da5ba7706eb28b359b5d781bd2c769e336ca5ca (diff) | |
download | qtlocation-mapboxgl-a2817ff5ed301f0da5817279ca7184b0c22bdf21.tar.gz |
[darwin, macos, ios] Renames CGImage creation function to imply +1 retain count (#10570)
Diffstat (limited to 'platform/darwin')
-rw-r--r-- | platform/darwin/mbgl/util/image+MGLAdditions.hpp | 2 | ||||
-rw-r--r-- | platform/darwin/src/image.mm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/platform/darwin/mbgl/util/image+MGLAdditions.hpp b/platform/darwin/mbgl/util/image+MGLAdditions.hpp index c738b4523d..c5343af4de 100644 --- a/platform/darwin/mbgl/util/image+MGLAdditions.hpp +++ b/platform/darwin/mbgl/util/image+MGLAdditions.hpp @@ -5,7 +5,7 @@ #include <CoreGraphics/CGImage.h> // Creates a CGImage from a PremultipliedImage, taking over the memory ownership. -CGImageRef CGImageFromMGLPremultipliedImage(mbgl::PremultipliedImage&&); +CGImageRef CGImageCreateWithMGLPremultipliedImage(mbgl::PremultipliedImage&&); // Creates a PremultipliedImage by copying the pixels of the CGImage. // Does not alter the retain count of the supplied CGImage. diff --git a/platform/darwin/src/image.mm b/platform/darwin/src/image.mm index 57b680fbdb..122682883e 100644 --- a/platform/darwin/src/image.mm +++ b/platform/darwin/src/image.mm @@ -23,7 +23,7 @@ using CGDataProviderHandle = CFHandle<CGDataProviderRef, CGDataProviderRef, CGDa using CGColorSpaceHandle = CFHandle<CGColorSpaceRef, CGColorSpaceRef, CGColorSpaceRelease>; using CGContextHandle = CFHandle<CGContextRef, CGContextRef, CGContextRelease>; -CGImageRef CGImageFromMGLPremultipliedImage(mbgl::PremultipliedImage&& src) { +CGImageRef CGImageCreateWithMGLPremultipliedImage(mbgl::PremultipliedImage&& src) { // We're converting the PremultipliedImage's backing store to a CGDataProvider, and are taking // over ownership of the memory. CGDataProviderHandle provider(CGDataProviderCreateWithData( |