commit e94255d456ad86e045e0c3aeab57395566cf49a5
author Matt Sarett <msarett@google.com> Mon Jan 09 12:38:59 2017 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Jan 09 18:14:06 2017 +0000
tree 27b9b6c790015aeb696a96d96cfb46ab7bd7554f
parent a16339297859f37df69230e64f05624cef511ad3

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 <msarett@google.com>
Reviewed-by: Mike Reed <reed@google.com>

tests/ImageIsOpaqueTest.cpp

diff --git a/tests/ImageIsOpaqueTest.cpp b/tests/ImageIsOpaqueTest.cpp
index 21ddb5d..cbbe331 100644
--- a/tests/ImageIsOpaqueTest.cpp
+++ b/tests/ImageIsOpaqueTest.cpp
@@ -125,6 +125,7 @@
         GetResourceAsImage("mandrill_128.png"),
         GetResourceAsImage("color_wheel.jpg"),
         SkImage::MakeFromPicture(make_picture(), { 10, 10 }, nullptr, nullptr,
+                                 SkImage::BitDepth::kU8,
                                  SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named)),
     })
     {

tests/ImageTest.cpp

diff --git a/tests/ImageTest.cpp b/tests/ImageTest.cpp
index 161dff8..4f9d944 100644
--- a/tests/ImageTest.cpp
+++ b/tests/ImageTest.cpp
@@ -130,7 +130,7 @@
     SkCanvas* canvas = recorder.beginRecording(10, 10);
     canvas->clear(SK_ColorCYAN);
     return SkImage::MakeFromPicture(recorder.finishRecordingAsPicture(), SkISize::Make(10, 10),
-                                    nullptr, nullptr,
+                                    nullptr, nullptr, SkImage::BitDepth::kU8,
                                     SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named));
 };
 #endif

tests/SkResourceCacheTest.cpp

diff --git a/tests/SkResourceCacheTest.cpp b/tests/SkResourceCacheTest.cpp
index ed2ff74..922acef 100644
--- a/tests/SkResourceCacheTest.cpp
+++ b/tests/SkResourceCacheTest.cpp
@@ -330,6 +330,7 @@
             canvas->clear(SK_ColorCYAN);
             return SkImage::MakeFromPicture(recorder.finishRecordingAsPicture(),
                                             SkISize::Make(10, 10), nullptr, nullptr,
+                                            SkImage::BitDepth::kU8,
                                             SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named));
         });
     }