diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/utils/mac/SkCreateCGImageRef.cpp | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/utils/mac/SkCreateCGImageRef.cpp b/src/utils/mac/SkCreateCGImageRef.cpp index d9cdb86e49..1b7e12bde5 100644 --- a/src/utils/mac/SkCreateCGImageRef.cpp +++ b/src/utils/mac/SkCreateCGImageRef.cpp @@ -212,9 +212,9 @@ SK_API bool SkCopyPixelsFromCGImage(const SkImageInfo& info, size_t rowBytes, vo return true; } -bool SkCreateBitmapFromCGImage(SkBitmap* dst, CGImageRef image, SkISize* scaleToFit) { - const int width = scaleToFit ? scaleToFit->width() : SkToInt(CGImageGetWidth(image)); - const int height = scaleToFit ? scaleToFit->height() : SkToInt(CGImageGetHeight(image)); +bool SkCreateBitmapFromCGImage(SkBitmap* dst, CGImageRef image) { + const int width = SkToInt(CGImageGetWidth(image)); + const int height = SkToInt(CGImageGetHeight(image)); SkImageInfo info = SkImageInfo::MakeN32Premul(width, height); SkBitmap tmp; @@ -245,4 +245,14 @@ bool SkCreateBitmapFromCGImage(SkBitmap* dst, CGImageRef image, SkISize* scaleTo return true; } +sk_sp<SkImage> SkMakeImageFromCGImage(CGImageRef src) { + SkBitmap bm; + if (!SkCreateBitmapFromCGImage(&bm, src)) { + return nullptr; + } + + bm.setImmutable(); + return SkImage::MakeFromBitmap(bm); +} + #endif//defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS) |