commit 844beb5eef7f991d3010a8239cdd07fdb320f3ab
author Mike Reed <reed@google.com> Mon Jan 25 15:36:09 2021 -0500
committer Mike Reed <reed@google.com> Mon Jan 25 21:50:16 2021 +0000
tree 9291aaee2b184fad2069504a0d48e7007bd41216
parent f9652245b4fad0585ad226e2e3d427a835465bb0

get image from skcodec

Part of the larger work to remove drawImage from canvas (and in general
simplify our apis w.r.t. older patterns like skbitmap).

Change-Id: If208927e1d46256519036c42e68aec3d3c809a82
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/358836
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Mike Reed <reed@google.com>

gm/bitmapimage.cpp

diff --git a/gm/bitmapimage.cpp b/gm/bitmapimage.cpp
index 9695084..409f13d2 100644
--- a/gm/bitmapimage.cpp
+++ b/gm/bitmapimage.cpp
@@ -48,9 +48,7 @@
 
         // Create matching bitmap.
         std::unique_ptr<SkCodec> codec(SkCodec::MakeFromStream(GetResourceAsStream(path)));
-        SkBitmap bitmap;
-        bitmap.allocPixels(codec->getInfo());
-        codec->getPixels(codec->getInfo(), bitmap.getPixels(), bitmap.rowBytes());
+        auto [codecImage, _] = codec->getImage();
 
         // The GM will be displayed in a 2x2 grid.
         // The top two squares show an sRGB image, then bitmap, drawn to a legacy canvas.
@@ -60,7 +58,7 @@
         SkCanvas legacyCanvas(legacyBMCanvas);
         legacyCanvas.drawImage(image, 0.0f, 0.0f);
         legacyCanvas.translate(SkScalar(kSize), 0.0f);
-        legacyCanvas.drawImage(bitmap.asImage(), 0.0f, 0.0f);
+        legacyCanvas.drawImage(codecImage, 0.0f, 0.0f);
         canvas->drawImage(legacyBMCanvas.asImage(), 0.0f, 0.0f);
         canvas->translate(0.0f, SkScalar(kSize));
 
@@ -71,7 +69,7 @@
         SkCanvas srgbCanvas(srgbBMCanvas);
         srgbCanvas.drawImage(image, 0.0f, 0.0f);
         srgbCanvas.translate(SkScalar(kSize), 0.0f);
-        srgbCanvas.drawImage(bitmap.asImage(), 0.0f, 0.0f);
+        srgbCanvas.drawImage(codecImage, 0.0f, 0.0f);
         canvas->drawImage(srgbBMCanvas.asImage(), 0.0f, 0.0f);
         return DrawResult::kOk;
     }