diff options
| author |  Hal Canary <halcanary@google.com> | 2017-12-08 10:21:31 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-12-08 17:16:00 +0000 |
| commit | c465d13e6fca5e171bde45d35b2dd43117f4702e (patch) | |
| tree | 588b2b31ffba95ed8eecb5327cb4335f35c8c1bd /tests/ImageTest.cpp | |
| parent | 4bcef3c40ad8d3a16bbca4ab74fa15256fb4b125 (diff) | |
resources: orgainize directory.
Should make it easier to ask just for images.
Change-Id: If821743dc924c4bfbc6b2b2d29b14affde7b3afd
Reviewed-on: https://skia-review.googlesource.com/82684
Commit-Queue: Hal Canary <halcanary@google.com>
Reviewed-by: Leon Scroggins <scroggo@google.com>
Diffstat (limited to 'tests/ImageTest.cpp')
| -rw-r--r-- | tests/ImageTest.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/ImageTest.cpp b/tests/ImageTest.cpp index d9140cf0f9..1ba3f1d0b4 100644 --- a/tests/ImageTest.cpp +++ b/tests/ImageTest.cpp @@ -957,7 +957,7 @@ static void test_cross_context_image(skiatest::Reporter* reporter, const GrConte } DEF_GPUTEST(SkImage_MakeCrossContextFromEncodedRelease, reporter, options) { - sk_sp<SkData> data = GetResourceAsData("mandrill_128.png"); + sk_sp<SkData> data = GetResourceAsData("images/mandrill_128.png"); SkASSERT(data.get()); test_cross_context_image(reporter, options, [&data](GrContext* ctx) { @@ -968,7 +968,7 @@ DEF_GPUTEST(SkImage_MakeCrossContextFromEncodedRelease, reporter, options) { DEF_GPUTEST(SkImage_MakeCrossContextFromPixmapRelease, reporter, options) { SkBitmap bitmap; SkPixmap pixmap; - SkAssertResult(GetResourceAsBitmap("mandrill_128.png", &bitmap) && bitmap.peekPixels(&pixmap)); + SkAssertResult(GetResourceAsBitmap("images/mandrill_128.png", &bitmap) && bitmap.peekPixels(&pixmap)); test_cross_context_image(reporter, options, [&pixmap](GrContext* ctx) { return SkImage::MakeCrossContextFromPixmap(ctx, pixmap, false, nullptr); @@ -1079,10 +1079,10 @@ static inline bool almost_equal(int a, int b) { DEF_TEST(Image_ColorSpace, r) { sk_sp<SkColorSpace> srgb = SkColorSpace::MakeSRGB(); - sk_sp<SkImage> image = GetResourceAsImage("mandrill_512_q075.jpg"); + sk_sp<SkImage> image = GetResourceAsImage("images/mandrill_512_q075.jpg"); REPORTER_ASSERT(r, srgb.get() == image->colorSpace()); - image = GetResourceAsImage("webp-color-profile-lossy.webp"); + image = GetResourceAsImage("images/webp-color-profile-lossy.webp"); SkColorSpaceTransferFn fn; bool success = image->colorSpace()->isNumericalTransferFn(&fn); REPORTER_ASSERT(r, success); @@ -1138,7 +1138,7 @@ DEF_TEST(Image_makeColorSpace, r) { REPORTER_ASSERT(r, almost_equal(0x31, SkGetPackedG32(*adobeBitmap.getAddr32(0, 0)))); REPORTER_ASSERT(r, almost_equal(0x4C, SkGetPackedB32(*adobeBitmap.getAddr32(0, 0)))); - srgbImage = GetResourceAsImage("1x1.png"); + srgbImage = GetResourceAsImage("images/1x1.png"); p3Image = srgbImage->makeColorSpace(p3, SkTransferFunctionBehavior::kIgnore); success = p3Image->asLegacyBitmap(&p3Bitmap, SkImage::kRO_LegacyBitmapMode); REPORTER_ASSERT(r, success); |