From e94255d456ad86e045e0c3aeab57395566cf49a5 Mon Sep 17 00:00:00 2001 From: Matt Sarett Date: Mon, 9 Jan 2017 12:38:59 -0500 Subject: Specify bit depth and color space in SkImage::MakeFromPicture() BUG=skia: Change-Id: I1d2a2b1f97557fc3e7ca6c2bdad6329f7760dbd2 Reviewed-on: https://skia-review.googlesource.com/6685 Commit-Queue: Matt Sarett Reviewed-by: Mike Reed --- gm/image_pict.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gm/image_pict.cpp') diff --git a/gm/image_pict.cpp b/gm/image_pict.cpp index 229f3c5054..1fdff21e3f 100644 --- a/gm/image_pict.cpp +++ b/gm/image_pict.cpp @@ -66,11 +66,13 @@ protected: SkMatrix matrix; matrix.setTranslate(-100, -100); - fImage0 = SkImage::MakeFromPicture(fPicture, size, &matrix, nullptr, srgbColorSpace); + fImage0 = SkImage::MakeFromPicture(fPicture, size, &matrix, nullptr, + SkImage::BitDepth::kU8, srgbColorSpace); matrix.postTranslate(-50, -50); matrix.postRotate(45); matrix.postTranslate(50, 50); - fImage1 = SkImage::MakeFromPicture(fPicture, size, &matrix, nullptr, srgbColorSpace); + fImage1 = SkImage::MakeFromPicture(fPicture, size, &matrix, nullptr, + SkImage::BitDepth::kU8, srgbColorSpace); } void drawSet(SkCanvas* canvas) const { @@ -109,6 +111,7 @@ static SkImageGenerator* make_pic_generator(GrContext*, SkPicture* pic) { SkMatrix matrix; matrix.setTranslate(-100, -100); return SkImageGenerator::NewFromPicture(SkISize::Make(100, 100), pic, &matrix, nullptr, + SkImage::BitDepth::kU8, SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named)); } -- cgit v1.2.3