Use bitmap.asImage()
Change-Id: Ie16194937530d7cd75f84d9af66c31b77875ef83
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/347043
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
diff --git a/docs/examples/Canvas_SrcRectConstraint.cpp b/docs/examples/Canvas_SrcRectConstraint.cpp
index e42eabf..69b07ce 100644
--- a/docs/examples/Canvas_SrcRectConstraint.cpp
+++ b/docs/examples/Canvas_SrcRectConstraint.cpp
@@ -15,7 +15,7 @@
canvas->scale(16, 16);
canvas->drawBitmap(redBorder, 0, 0, nullptr);
canvas->resetMatrix();
- sk_sp<SkImage> image = SkImage::MakeFromBitmap(redBorder);
+ sk_sp<SkImage> image = redBorder.asImage();
SkPaint lowPaint;
lowPaint.setFilterQuality(kLow_SkFilterQuality);
for (auto constraint : { SkCanvas::kStrict_SrcRectConstraint,
diff --git a/docs/examples/Canvas_drawImageNine.cpp b/docs/examples/Canvas_drawImageNine.cpp
index 0cad667..b75c2ab 100644
--- a/docs/examples/Canvas_drawImageNine.cpp
+++ b/docs/examples/Canvas_drawImageNine.cpp
@@ -21,7 +21,7 @@
}
left = right;
}
- sk_sp<SkImage> image = SkImage::MakeFromBitmap(bitmap);
+ sk_sp<SkImage> image = bitmap.asImage();
SkImage* imagePtr = image.get();
for (auto dest: { 20, 30, 40, 60, 90 } ) {
canvas->drawImageNine(imagePtr, center, SkRect::MakeWH(dest, dest), nullptr);
diff --git a/docs/examples/Canvas_drawImageNine_2.cpp b/docs/examples/Canvas_drawImageNine_2.cpp
index 826e18a..661dccf 100644
--- a/docs/examples/Canvas_drawImageNine_2.cpp
+++ b/docs/examples/Canvas_drawImageNine_2.cpp
@@ -21,7 +21,7 @@
}
left = right;
}
- sk_sp<SkImage> image = SkImage::MakeFromBitmap(bitmap);
+ sk_sp<SkImage> image = bitmap.asImage();
for (auto dest: { 20, 30, 40, 60, 90 } ) {
canvas->drawImageNine(image, center, SkRect::MakeWH(dest, 110 - dest), nullptr);
canvas->translate(dest + 4, 0);
diff --git a/docs/examples/Canvas_drawImageRect.cpp b/docs/examples/Canvas_drawImageRect.cpp
index 3548d4d..fc01726 100644
--- a/docs/examples/Canvas_drawImageRect.cpp
+++ b/docs/examples/Canvas_drawImageRect.cpp
@@ -12,7 +12,7 @@
SkBitmap redBorder;
redBorder.installPixels(SkImageInfo::MakeN32Premul(4, 4),
(void*) pixels, sizeof(pixels[0]));
- sk_sp<SkImage> image = SkImage::MakeFromBitmap(redBorder);
+ sk_sp<SkImage> image = redBorder.asImage();
SkPaint lowPaint;
for (auto constraint : {
SkCanvas::kFast_SrcRectConstraint,
diff --git a/docs/examples/Canvas_drawImageRect_4.cpp b/docs/examples/Canvas_drawImageRect_4.cpp
index 2c49dc0..b80a270 100644
--- a/docs/examples/Canvas_drawImageRect_4.cpp
+++ b/docs/examples/Canvas_drawImageRect_4.cpp
@@ -9,7 +9,7 @@
SkBitmap bitmap;
bitmap.installPixels(SkImageInfo::MakeN32Premul(2, 2),
(void*) pixels, sizeof(pixels[0]));
- sk_sp<SkImage> image = SkImage::MakeFromBitmap(bitmap);
+ sk_sp<SkImage> image = bitmap.asImage();
SkPaint paint;
canvas->scale(4, 4);
for (auto alpha : { 50, 100, 150, 255 } ) {
diff --git a/docs/examples/Canvas_drawImageRect_5.cpp b/docs/examples/Canvas_drawImageRect_5.cpp
index b494683..22111e1 100644
--- a/docs/examples/Canvas_drawImageRect_5.cpp
+++ b/docs/examples/Canvas_drawImageRect_5.cpp
@@ -9,7 +9,7 @@
SkBitmap bitmap;
bitmap.installPixels(SkImageInfo::MakeN32Premul(2, 2),
(void*) pixels, sizeof(pixels[0]));
- sk_sp<SkImage> image = SkImage::MakeFromBitmap(bitmap);
+ sk_sp<SkImage> image = bitmap.asImage();
SkPaint paint;
canvas->scale(4, 4);
for (auto color : { SK_ColorRED, SK_ColorBLUE, SK_ColorGREEN } ) {
diff --git a/docs/examples/Canvas_drawImageRect_6.cpp b/docs/examples/Canvas_drawImageRect_6.cpp
index 7aeabe4..8940fa2 100644
--- a/docs/examples/Canvas_drawImageRect_6.cpp
+++ b/docs/examples/Canvas_drawImageRect_6.cpp
@@ -9,7 +9,7 @@
SkBitmap bitmap;
bitmap.installPixels(SkImageInfo::MakeN32Premul(2, 2),
(void*) pixels, sizeof(pixels[0]));
- sk_sp<SkImage> image = SkImage::MakeFromBitmap(bitmap);
+ sk_sp<SkImage> image = bitmap.asImage();
SkPaint paint;
canvas->scale(4, 4);
for (auto color : { SK_ColorRED, SK_ColorBLUE, SK_ColorGREEN } ) {
diff --git a/docs/examples/Image_MakeFromBitmap.cpp b/docs/examples/Image_MakeFromBitmap.cpp
index d8d6046..b93a30b 100644
--- a/docs/examples/Image_MakeFromBitmap.cpp
+++ b/docs/examples/Image_MakeFromBitmap.cpp
@@ -13,9 +13,9 @@
SkPixmap pixmap(imageInfo, storage[0], sizeof(storage) / 5);
SkBitmap bitmap;
bitmap.installPixels(pixmap);
- sk_sp<SkImage> image1 = SkImage::MakeFromBitmap(bitmap);
+ sk_sp<SkImage> image1 = bitmap.asImage();
bitmap.setImmutable();
- sk_sp<SkImage> image2 = SkImage::MakeFromBitmap(bitmap);
+ sk_sp<SkImage> image2 = bitmap.asImage();
*pixmap.writable_addr8(2, 2) = 0x00;
canvas->scale(10, 10);
canvas->drawImage(image1, 0, 0);
diff --git a/docs/examples/Image_isLazyGenerated_b.cpp b/docs/examples/Image_isLazyGenerated_b.cpp
index 9ee0b0e..e480ce6 100644
--- a/docs/examples/Image_isLazyGenerated_b.cpp
+++ b/docs/examples/Image_isLazyGenerated_b.cpp
@@ -22,7 +22,7 @@
image->isLazyGenerated() ? "is lazily generated" : "not lazily generated",
20, image->height() * 3 / 4, font, paint);
};
- sk_sp<SkImage> bitmapImage(SkImage::MakeFromBitmap(source));
+ sk_sp<SkImage> bitmapImage(source.asImage());
sk_sp<SkImage> textureImage(SkImage::MakeFromTexture(dContext, backEndTexture,
kTopLeft_GrSurfaceOrigin,
kRGBA_8888_SkColorType,
diff --git a/docs/examples/Image_isTextureBacked.cpp b/docs/examples/Image_isTextureBacked.cpp
index 9e5de90..9749168 100644
--- a/docs/examples/Image_isTextureBacked.cpp
+++ b/docs/examples/Image_isTextureBacked.cpp
@@ -21,7 +21,7 @@
canvas->drawString(image->isTextureBacked() ? "is GPU texture" : "not GPU texture",
20, image->height() * 3 / 4, font, paint);
};
- sk_sp<SkImage> bitmapImage(SkImage::MakeFromBitmap(source));
+ sk_sp<SkImage> bitmapImage(source.asImage());
sk_sp<SkImage> textureImage(SkImage::MakeFromTexture(dContext, backEndTexture,
kTopLeft_GrSurfaceOrigin,
kRGBA_8888_SkColorType,
diff --git a/docs/examples/Image_isValid.cpp b/docs/examples/Image_isValid.cpp
index 6333069..128a184 100644
--- a/docs/examples/Image_isValid.cpp
+++ b/docs/examples/Image_isValid.cpp
@@ -28,7 +28,7 @@
canvas->drawString(msg, 20, image->height() * 7 / 8, font, paint);
};
- sk_sp<SkImage> bitmapImage(SkImage::MakeFromBitmap(source));
+ sk_sp<SkImage> bitmapImage(source.asImage());
sk_sp<SkImage> textureImage(SkImage::MakeFromTexture(dContext, backEndTexture,
kTopLeft_GrSurfaceOrigin,
kRGBA_8888_SkColorType,
diff --git a/docs/examples/Image_makeNonTextureImage.cpp b/docs/examples/Image_makeNonTextureImage.cpp
index 13c8a03..c25814a 100644
--- a/docs/examples/Image_makeNonTextureImage.cpp
+++ b/docs/examples/Image_makeNonTextureImage.cpp
@@ -20,7 +20,7 @@
canvas->drawImage(nonTexture, 0, 0);
canvas->drawString(label, 20, nonTexture->height() / 4, font, paint);
};
- sk_sp<SkImage> bitmapImage(SkImage::MakeFromBitmap(source));
+ sk_sp<SkImage> bitmapImage(source.asImage());
sk_sp<SkImage> textureImage(SkImage::MakeFromTexture(dContext, backEndTexture,
kTopLeft_GrSurfaceOrigin,
kRGBA_8888_SkColorType,
diff --git a/docs/examples/Image_makeRasterImage.cpp b/docs/examples/Image_makeRasterImage.cpp
index 238b69a..7c46310 100644
--- a/docs/examples/Image_makeRasterImage.cpp
+++ b/docs/examples/Image_makeRasterImage.cpp
@@ -20,7 +20,7 @@
canvas->drawImage(raster, 0, 0);
canvas->drawString(label, 20, raster->height() / 4, font, paint);
};
- sk_sp<SkImage> bitmapImage(SkImage::MakeFromBitmap(source));
+ sk_sp<SkImage> bitmapImage(source.asImage());
sk_sp<SkImage> textureImage(SkImage::MakeFromTexture(dContext, backEndTexture,
kTopLeft_GrSurfaceOrigin,
kRGBA_8888_SkColorType,
diff --git a/docs/examples/Image_makeTextureImage.cpp b/docs/examples/Image_makeTextureImage.cpp
index a6cd806..0c24b87 100644
--- a/docs/examples/Image_makeTextureImage.cpp
+++ b/docs/examples/Image_makeTextureImage.cpp
@@ -25,7 +25,7 @@
canvas->drawImage(texture, 0, 0);
canvas->drawString(label, 20, texture->height() / 4, font, paint);
};
- sk_sp<SkImage> bitmapImage(SkImage::MakeFromBitmap(source));
+ sk_sp<SkImage> bitmapImage(source.asImage());
sk_sp<SkImage> textureImage(SkImage::MakeFromTexture(dContext, backEndTexture,
diff --git a/docs/examples/Image_refEncodedData.cpp b/docs/examples/Image_refEncodedData.cpp
index 39b1d07..21c0135 100644
--- a/docs/examples/Image_refEncodedData.cpp
+++ b/docs/examples/Image_refEncodedData.cpp
@@ -14,7 +14,7 @@
sk_sp<SkImage> image;
} tests[] = {
{ "image", image },
- { "bitmap", SkImage::MakeFromBitmap(source) },
+ { "bitmap", source.asImage() },
{ "texture", SkImage::MakeFromTexture(dContext, backEndTexture, kTopLeft_GrSurfaceOrigin,
kRGBA_8888_SkColorType, kOpaque_SkAlphaType,
nullptr) }
diff --git a/docs/examples/UnpremulBugs.cpp b/docs/examples/UnpremulBugs.cpp
index 69a249e..845b25b 100644
--- a/docs/examples/UnpremulBugs.cpp
+++ b/docs/examples/UnpremulBugs.cpp
@@ -15,7 +15,7 @@
SkBitmap bmp;
bmp.allocPixels(info);
fill(bmp, c, n);
- sk_sp<SkImage> img = SkImage::MakeFromBitmap(bmp);
+ sk_sp<SkImage> img = bmp.asImage();
SkPaint paint;
const SkTileMode tile = SkTileMode::kRepeat;
diff --git a/docs/examples/UnpremulGPU.cpp b/docs/examples/UnpremulGPU.cpp
index 6908211..0e48a8b 100644
--- a/docs/examples/UnpremulGPU.cpp
+++ b/docs/examples/UnpremulGPU.cpp
@@ -12,7 +12,7 @@
*(premulBitmap.getAddr32(x, y)) = 0x80808080;
}
}
- sk_sp<SkImage> premulImage = SkImage::MakeFromBitmap(premulBitmap);
+ sk_sp<SkImage> premulImage = premulBitmap.asImage();
SkImageInfo unpremulInfo = premulInfo.makeAlphaType(kUnpremul_SkAlphaType);
SkBitmap unpremulBitmap;
@@ -22,7 +22,7 @@
*(unpremulBitmap.getAddr32(x, y)) = 0x80FFFFFF;
}
}
- sk_sp<SkImage> unpremulImage = SkImage::MakeFromBitmap(unpremulBitmap);
+ sk_sp<SkImage> unpremulImage = unpremulBitmap.asImage();
SkPaint paint;
const SkTileMode tile = SkTileMode::kRepeat;
diff --git a/docs/examples/alpha_bitmap_color_filter_mask_filter.cpp b/docs/examples/alpha_bitmap_color_filter_mask_filter.cpp
index 4af0645..45ccd76 100644
--- a/docs/examples/alpha_bitmap_color_filter_mask_filter.cpp
+++ b/docs/examples/alpha_bitmap_color_filter_mask_filter.cpp
@@ -25,7 +25,7 @@
}
void draw(SkCanvas* canvas) {
- auto image = SkImage::MakeFromBitmap(make_alpha_image(96, 96));
+ auto image = make_alpha_image(96, 96).asImage();
SkPaint paint;
paint.setColorFilter(make_color_filter());
diff --git a/docs/examples/blur_alpha_img.cpp b/docs/examples/blur_alpha_img.cpp
index 2d00ace..d60de63 100644
--- a/docs/examples/blur_alpha_img.cpp
+++ b/docs/examples/blur_alpha_img.cpp
@@ -23,7 +23,7 @@
SkCanvas c(bm);
c.clear(0);
c.drawRect(bounds, paint);
- return SkImage::MakeFromBitmap(bm);
+ return bm.asImage();
}
void draw(SkCanvas* canvas) {
diff --git a/docs/examples/skbug_5648.cpp b/docs/examples/skbug_5648.cpp
index d298469..c577467 100644
--- a/docs/examples/skbug_5648.cpp
+++ b/docs/examples/skbug_5648.cpp
@@ -6,8 +6,8 @@
void draw(SkCanvas*) {
SkBitmap bitmap;
source.extractSubset(&bitmap, {0, 0, source.width() - 1, source.height() - 1});
- auto img0 = SkImage::MakeFromBitmap(bitmap);
- auto img1 = SkImage::MakeFromBitmap(bitmap);
+ auto img0 = bitmap.asImage();
+ auto img1 = bitmap.asImage();
SkDebugf("%u\n%u\n", img0->uniqueID(), img1->uniqueID());
}
} // END FIDDLE