fix MakeFromImage examples

deprecated flavor, erroneously used, have been removed

Docs-Preview: https://skia.org/?cl=115581
Bug: skia:6898
Change-Id: Idc47411831985d4504ce1b230cb02731ec8a2edb
Reviewed-on: https://skia-review.googlesource.com/115581
Commit-Queue: Cary Clark <caryclark@skia.org>
Reviewed-by: Cary Clark <caryclark@skia.org>

1 files changed, 21 insertions, 11 deletions

diff --git a/docs/SkImage_Reference.bmh b/docs/SkImage_Reference.bmh
index 41bd2d6aa1..ded4c91dd8 100644
--- a/docs/SkImage_Reference.bmh
+++ b/docs/SkImage_Reference.bmh
@@ -1262,7 +1262,8 @@ auto drawImage = [=](sk_sp<SkImage> image, const char* label) -> void {
 };
 sk_sp<SkImage> bitmapImage(SkImage::MakeFromBitmap(source));
 sk_sp<SkImage> textureImage(SkImage::MakeFromTexture(canvas->getGrContext(), backEndTexture,
-                            kTopLeft_GrSurfaceOrigin, kOpaque_SkAlphaType, nullptr));
+                            kTopLeft_GrSurfaceOrigin, kN32_SkColorType, kOpaque_SkAlphaType,
+                            nullptr));
 drawImage(image, "image");
 canvas->translate(image->width(), 0);
 drawImage(bitmapImage, "source");
@@ -1312,7 +1313,8 @@ auto drawImage = [=](sk_sp<SkImage> image, const char* label) -> void {
 };
 sk_sp<SkImage> bitmapImage(SkImage::MakeFromBitmap(source));
 sk_sp<SkImage> textureImage(SkImage::MakeFromTexture(canvas->getGrContext(), backEndTexture,
-                            kTopLeft_GrSurfaceOrigin, kOpaque_SkAlphaType, nullptr));
+                            kTopLeft_GrSurfaceOrigin, kN32_SkColorType, kOpaque_SkAlphaType,
+                            nullptr));
 drawImage(image, "image");
 canvas->translate(image->width(), 0);
 drawImage(bitmapImage, "source");
@@ -1356,7 +1358,7 @@ SkString str;
 int y = -10;
 for (auto origin : { kTopLeft_GrSurfaceOrigin, kBottomLeft_GrSurfaceOrigin } ) {
     sk_sp<SkImage> srcImage(SkImage::MakeFromTexture(context,
-            backEndTexture, origin, kPremul_SkAlphaType, nullptr));
+            backEndTexture, origin, kN32_SkColorType, kPremul_SkAlphaType, nullptr));
     GrSurfaceOrigin readBackOrigin;
     GrBackendObject readBackHandle = srcImage->getTextureHandle(false, &readBackOrigin);
     str.printf("readBackHandle: 0x%lx", readBackHandle);
@@ -1387,7 +1389,8 @@ for (auto origin : { kTopLeft_GrSurfaceOrigin, kBottomLeft_GrSurfaceOrigin } ) {
     drawImage(image, "image");
     canvas->translate(image->width(), 0);
     sk_sp<SkImage> textureImage(SkImage::MakeFromTexture(canvas->getGrContext(), backEndTexture,
-                                kTopLeft_GrSurfaceOrigin, kOpaque_SkAlphaType, nullptr));
+                                kTopLeft_GrSurfaceOrigin, kN32_SkColorType, kOpaque_SkAlphaType,
+                                nullptr));
     drawImage(textureImage, "backEndTexture");
 ##
 
@@ -1732,7 +1735,8 @@ Returns nullptr if Image contents are not encoded.
         sk_sp<SkImage> image;
     } tests[] = { { "image", image }, { "bitmap", SkImage::MakeFromBitmap(source) },
           { "texture", SkImage::MakeFromTexture(canvas->getGrContext(), backEndTexture,
-                            kTopLeft_GrSurfaceOrigin, kOpaque_SkAlphaType, nullptr) } };
+                            kTopLeft_GrSurfaceOrigin, kN32_SkColorType, kOpaque_SkAlphaType,
+                            nullptr) } };
     SkString string;
     SkPaint paint;
     for (const auto& test : tests ) {
@@ -1773,7 +1777,8 @@ whether the image is opaque.
         sk_sp<SkImage> image;
     } tests[] = { { "image", image }, { "bitmap", SkImage::MakeFromBitmap(source) },
           { "texture", SkImage::MakeFromTexture(canvas->getGrContext(), backEndTexture,
-                            kTopLeft_GrSurfaceOrigin, kOpaque_SkAlphaType, nullptr) } };
+                            kTopLeft_GrSurfaceOrigin, kN32_SkColorType, kOpaque_SkAlphaType,
+                            nullptr) } };
     SkString string;
     SkPaint paint;
     for (const auto& test : tests ) {
@@ -1854,7 +1859,8 @@ GrContext.
     sk_sp<SkImage> bitmapImage(SkImage::MakeFromBitmap(source));
     GrContext* context = canvas->getGrContext();
     sk_sp<SkImage> textureImage(SkImage::MakeFromTexture(context, backEndTexture,
-                                kTopLeft_GrSurfaceOrigin, kOpaque_SkAlphaType, nullptr));
+                                kTopLeft_GrSurfaceOrigin, kN32_SkColorType, kOpaque_SkAlphaType,
+                                nullptr));
     drawImage(image, context, "image");
     canvas->translate(image->width(), 0);
     drawImage(bitmapImage, context, "source");
@@ -1895,7 +1901,8 @@ Returns nullptr if backed by GPU_Texture and copy fails.
     };
     sk_sp<SkImage> bitmapImage(SkImage::MakeFromBitmap(source));
     sk_sp<SkImage> textureImage(SkImage::MakeFromTexture(canvas->getGrContext(), backEndTexture,
-                                kTopLeft_GrSurfaceOrigin, kOpaque_SkAlphaType, nullptr));
+                                kTopLeft_GrSurfaceOrigin, kN32_SkColorType, kOpaque_SkAlphaType,
+                                nullptr));
     drawImage(image, "image");
     canvas->translate(image->width(), 0);
     drawImage(bitmapImage, "source");
@@ -1937,7 +1944,8 @@ Returns nullptr if copy, decode, or pixel read fails.
     };
     sk_sp<SkImage> bitmapImage(SkImage::MakeFromBitmap(source));
     sk_sp<SkImage> textureImage(SkImage::MakeFromTexture(canvas->getGrContext(), backEndTexture,
-                                kTopLeft_GrSurfaceOrigin, kOpaque_SkAlphaType, nullptr));
+                                kTopLeft_GrSurfaceOrigin, kN32_SkColorType, kOpaque_SkAlphaType,
+                                nullptr));
     drawImage(image, "image");
     canvas->translate(image->width(), 0);
     drawImage(bitmapImage, "source");
@@ -2132,7 +2140,8 @@ Bitmap write did not succeed.
         return;
     }
     sk_sp<SkImage> textureImage(SkImage::MakeFromTexture(grContext, backEndTexture,
-                                kTopLeft_GrSurfaceOrigin, kOpaque_SkAlphaType, nullptr));
+                                kTopLeft_GrSurfaceOrigin, kN32_SkColorType, kOpaque_SkAlphaType,
+                                nullptr));
     canvas->drawImage(textureImage, 45, 45);
     if (textureImage->asLegacyBitmap(&bitImage, SkImage::kRO_LegacyBitmapMode)) {
         canvas->drawBitmap(bitImage, 90, 90);
@@ -2204,7 +2213,8 @@ void draw(SkCanvas* canvas) {
     };
     sk_sp<SkImage> bitmapImage(SkImage::MakeFromBitmap(source));
     sk_sp<SkImage> textureImage(SkImage::MakeFromTexture(canvas->getGrContext(), backEndTexture,
-                                kTopLeft_GrSurfaceOrigin, kOpaque_SkAlphaType, nullptr));
+                                kTopLeft_GrSurfaceOrigin, kN32_SkColorType, kOpaque_SkAlphaType,
+                                nullptr));
     drawImage(image, "image");
     canvas->translate(image->width(), 0);
     drawImage(bitmapImage, "source");