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>
diff --git a/tests/CodecAnimTest.cpp b/tests/CodecAnimTest.cpp
index b274ee5..b09c925 100644
--- a/tests/CodecAnimTest.cpp
+++ b/tests/CodecAnimTest.cpp
@@ -33,7 +33,7 @@
}
DEF_TEST(Codec_trunc, r) {
- sk_sp<SkData> data(GetResourceAsData("box.gif"));
+ sk_sp<SkData> data(GetResourceAsData("images/box.gif"));
if (!data) {
return;
}
@@ -44,7 +44,7 @@
// animated image with a frame that has alpha but then blends onto an opaque
// frame making the result opaque. Test that we can decode such a frame.
DEF_TEST(Codec_565, r) {
- sk_sp<SkData> data(GetResourceAsData("blendBG.webp"));
+ sk_sp<SkData> data(GetResourceAsData("images/blendBG.webp"));
if (!data) {
return;
}
@@ -86,13 +86,13 @@
int fRepetitionCount;
std::vector<SkCodecAnimation::DisposalMethod> fDisposalMethods;
} gRecs[] = {
- { "required.gif", 7,
+ { "images/required.gif", 7,
{ 0, 1, 2, 3, 4, 5 },
{ kOpaque, kUnpremul, kUnpremul, kUnpremul, kUnpremul, kUnpremul },
{ 100, 100, 100, 100, 100, 100, 100 },
0,
{ kKeep, kRestoreBG, kKeep, kKeep, kKeep, kRestoreBG, kKeep } },
- { "alphabetAnim.gif", 13,
+ { "images/alphabetAnim.gif", 13,
{ SkCodec::kNone, 0, 0, 0, 0, 5, 6, SkCodec::kNone,
SkCodec::kNone, 9, 10, 11 },
{ kUnpremul, kUnpremul, kUnpremul, kUnpremul, kUnpremul, kUnpremul,
@@ -102,7 +102,7 @@
{ kKeep, kRestorePrev, kRestorePrev, kRestorePrev, kRestorePrev,
kRestoreBG, kKeep, kRestoreBG, kRestoreBG, kKeep, kKeep,
kRestoreBG, kKeep } },
- { "randPixelsAnim2.gif", 4,
+ { "images/randPixelsAnim2.gif", 4,
// required frames
{ 0, 0, 1 },
// alphas
@@ -112,7 +112,7 @@
// repetition count
0,
{ kKeep, kKeep, kRestorePrev, kKeep } },
- { "randPixelsAnim.gif", 13,
+ { "images/randPixelsAnim.gif", 13,
// required frames
{ 0, 1, 2, 3, 4, 3, 6, 7, 7, 7, 9, 9 },
{ kUnpremul, kUnpremul, kUnpremul, kUnpremul, kUnpremul, kUnpremul,
@@ -124,34 +124,34 @@
{ kKeep, kKeep, kKeep, kKeep, kRestoreBG, kRestoreBG, kRestoreBG,
kRestoreBG, kRestorePrev, kRestoreBG, kRestorePrev, kRestorePrev,
kRestorePrev, } },
- { "box.gif", 1, {}, {}, {}, 0, { kKeep } },
- { "color_wheel.gif", 1, {}, {}, {}, 0, { kKeep } },
- { "test640x479.gif", 4, { 0, 1, 2 },
+ { "images/box.gif", 1, {}, {}, {}, 0, { kKeep } },
+ { "images/color_wheel.gif", 1, {}, {}, {}, 0, { kKeep } },
+ { "images/test640x479.gif", 4, { 0, 1, 2 },
{ kOpaque, kOpaque, kOpaque },
{ 200, 200, 200, 200 },
SkCodec::kRepetitionCountInfinite,
{ kKeep, kKeep, kKeep, kKeep } },
- { "colorTables.gif", 2, { 0 }, { kOpaque }, { 1000, 1000 }, 5,
+ { "images/colorTables.gif", 2, { 0 }, { kOpaque }, { 1000, 1000 }, 5,
{ kKeep, kKeep } },
- { "arrow.png", 1, {}, {}, {}, 0, {} },
- { "google_chrome.ico", 1, {}, {}, {}, 0, {} },
- { "brickwork-texture.jpg", 1, {}, {}, {}, 0, {} },
+ { "images/arrow.png", 1, {}, {}, {}, 0, {} },
+ { "images/google_chrome.ico", 1, {}, {}, {}, 0, {} },
+ { "images/brickwork-texture.jpg", 1, {}, {}, {}, 0, {} },
#if defined(SK_CODEC_DECODES_RAW) && (!defined(_WIN32))
- { "dng_with_preview.dng", 1, {}, {}, {}, 0, {} },
+ { "images/dng_with_preview.dng", 1, {}, {}, {}, 0, {} },
#endif
- { "mandrill.wbmp", 1, {}, {}, {}, 0, {} },
- { "randPixels.bmp", 1, {}, {}, {}, 0, {} },
- { "yellow_rose.webp", 1, {}, {}, {}, 0, {} },
- { "webp-animated.webp", 3, { 0, 1 }, { kOpaque, kOpaque },
+ { "images/mandrill.wbmp", 1, {}, {}, {}, 0, {} },
+ { "images/randPixels.bmp", 1, {}, {}, {}, 0, {} },
+ { "images/yellow_rose.webp", 1, {}, {}, {}, 0, {} },
+ { "images/webp-animated.webp", 3, { 0, 1 }, { kOpaque, kOpaque },
{ 1000, 500, 1000 }, SkCodec::kRepetitionCountInfinite,
{ kKeep, kKeep, kKeep } },
- { "blendBG.webp", 7, { 0, SkCodec::kNone, SkCodec::kNone, SkCodec::kNone,
+ { "images/blendBG.webp", 7, { 0, SkCodec::kNone, SkCodec::kNone, SkCodec::kNone,
4, 4 },
{ kOpaque, kOpaque, kUnpremul, kOpaque, kUnpremul, kUnpremul },
{ 525, 500, 525, 437, 609, 729, 444 }, 7,
{ kKeep, kKeep, kKeep, kKeep, kKeep, kKeep, kKeep } },
- { "required.webp", 7,
+ { "images/required.webp", 7,
{ 0, 1, 1, SkCodec::kNone, 4, 4 },
{ kOpaque, kUnpremul, kUnpremul, kOpaque, kOpaque, kOpaque },
{ 100, 100, 100, 100, 100, 100, 100 },