diff options
| author |  Matt Sarett <msarett@google.com> | 2017-02-14 13:50:43 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-02-14 21:32:10 +0000 |
| commit | 9df70bb74db8294283e8d2d8e20c95d290d2a34d (patch) | |
| tree | 47f70a2a36d254599db76e77cb6c93a31b895b7d /src/image/SkImage.cpp | |
| parent | 6f449692c148c6b36d65c4bfa2941e3b09e25c38 (diff) | |
Picture backed images must have a bit depth and color space
Enforce that picture backed images created by the public API
must have a non-null SkColorSpace.
SkPictureShader uses a private call to get around this restriction.
BUG=skia:
Change-Id: I2fc11a8ffe583035d09e83abf40b827fbf575321
Reviewed-on: https://skia-review.googlesource.com/8415
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Matt Sarett <msarett@google.com>
Diffstat (limited to 'src/image/SkImage.cpp')
| -rw-r--r-- | src/image/SkImage.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/image/SkImage.cpp b/src/image/SkImage.cpp index 67c96d7ed2..7619acd78c 100644 --- a/src/image/SkImage.cpp +++ b/src/image/SkImage.cpp @@ -261,12 +261,6 @@ bool SkImage_Base::onAsLegacyBitmap(SkBitmap* bitmap, LegacyBitmapMode mode) con } sk_sp<SkImage> SkImage::MakeFromPicture(sk_sp<SkPicture> picture, const SkISize& dimensions, - const SkMatrix* matrix, const SkPaint* paint) { - return SkImage::MakeFromPicture(std::move(picture), dimensions, matrix, paint, BitDepth::kU8, - nullptr); -} - -sk_sp<SkImage> SkImage::MakeFromPicture(sk_sp<SkPicture> picture, const SkISize& dimensions, const SkMatrix* matrix, const SkPaint* paint, BitDepth bitDepth, sk_sp<SkColorSpace> colorSpace) { return MakeFromGenerator(SkImageGenerator::NewFromPicture(dimensions, picture.get(), matrix, |