commit 88417e743052dfc49279a531f30a077266a247c4
author Mike Reed <reed@google.com> Tue Feb 11 09:24:29 2020 -0500
committer Mike Reed <reed@google.com> Tue Feb 11 14:35:24 2020 +0000
tree d325acc85bbbee1134163ddb55191dd0d3f5d51a
parent 50a490a1a4fba67427422a5e24b57d929c391efe

SkCreateCGImageRef needs to not rely on N32

Change-Id: I7d657e7a25293cc8a540dd1d4f8fd5fd937891f8
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/270060
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>

src/utils/mac/SkCreateCGImageRef.cpp

diff --git a/src/utils/mac/SkCreateCGImageRef.cpp b/src/utils/mac/SkCreateCGImageRef.cpp
index 123d382..4248b1b 100644
--- a/src/utils/mac/SkCreateCGImageRef.cpp
+++ b/src/utils/mac/SkCreateCGImageRef.cpp
@@ -92,8 +92,8 @@
     if (upscaleTo32) {
         std::unique_ptr<SkBitmap> copy(new SkBitmap);
         // here we make a deep copy of the pixels, since CG won't take our
-        // 565 directly
-        copy->allocPixels(bm.info().makeColorType(kN32_SkColorType));
+        // 565 directly, so we always go to RGBA
+        copy->allocPixels(bm.info().makeColorType(kRGBA_8888_SkColorType));
         bm.readPixels(copy->info(), copy->getPixels(), copy->rowBytes(), 0, 0);
         return copy;
     }