diff options
author | 2014-05-09 17:24:31 +0000 | |
---|---|---|
committer | 2014-05-09 17:24:31 +0000 | |
commit | f9dc07c80a9ec65863b883ca9a2537c8fea1f8c5 (patch) | |
tree | 02a7ac7ad038886b0cded813f5ec3805f22cd527 /tests | |
parent | e5e96021a05f22ffbb72a201790bd67bff4f8a93 (diff) |
Revert "Flatten resources directory"
Review URL: https://codereview.chromium.org/278033002
git-svn-id: http://skia.googlecode.com/svn/trunk@14679 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'tests')
-rw-r--r-- | tests/ImageDecodingTest.cpp | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/tests/ImageDecodingTest.cpp b/tests/ImageDecodingTest.cpp index 86b96ae0f9..e9348fed99 100644 --- a/tests/ImageDecodingTest.cpp +++ b/tests/ImageDecodingTest.cpp @@ -512,8 +512,8 @@ static SkPixelRef* install_pixel_ref(SkBitmap* bitmap, */ DEF_TEST(ImprovedBitmapFactory, reporter) { SkString resourcePath = skiatest::Test::GetResourcePath(); - SkString path = SkOSPath::SkPathJoin( - resourcePath.c_str(), "randPixels.png"); + SkString directory = SkOSPath::SkPathJoin(resourcePath.c_str(), "encoding"); + SkString path = SkOSPath::SkPathJoin(directory.c_str(), "randPixels.png"); SkAutoTUnref<SkStreamRewindable> stream( SkStream::NewFromFile(path.c_str())); if (sk_exists(path.c_str())) { @@ -531,10 +531,9 @@ DEF_TEST(ImprovedBitmapFactory, reporter) { #if defined(SK_BUILD_FOR_ANDROID) || defined(SK_BUILD_FOR_UNIX) static inline bool check_rounding(int value, int dividend, int divisor) { - // returns true if the value is greater than floor(dividend/divisor) - // and less than SkNextPow2(ceil(dividend - divisor)) + // returns true if (dividend/divisor) rounds up OR down to value return (((divisor * value) > (dividend - divisor)) - && value <= SkNextPow2(((dividend - 1) / divisor) + 1)); + && ((divisor * value) < (dividend + divisor))); } #endif // SK_BUILD_FOR_ANDROID || SK_BUILD_FOR_UNIX @@ -622,11 +621,6 @@ static void test_options(skiatest::Reporter* reporter, opts.fSampleSize)); REPORTER_ASSERT(reporter, check_rounding(bm.width(), kExpectedWidth, opts.fSampleSize)); - // The ImageDecoder API doesn't guarantee that SampleSize does - // anything at all, but the decoders that this test excercises all - // produce an output size in the following range: - // (((sample_size * out_size) > (in_size - sample_size)) - // && out_size <= SkNextPow2(((in_size - 1) / sample_size) + 1)); #endif // SK_BUILD_FOR_ANDROID || SK_BUILD_FOR_UNIX SkAutoLockPixels alp(bm); if (bm.getPixels() == NULL) { @@ -688,7 +682,8 @@ DEF_TEST(ImageDecoderOptions, reporter) { }; SkString resourceDir = skiatest::Test::GetResourcePath(); - if (!sk_exists(resourceDir.c_str())) { + SkString directory = SkOSPath::SkPathJoin(resourceDir.c_str(), "encoding"); + if (!sk_exists(directory.c_str())) { return; } @@ -705,7 +700,7 @@ DEF_TEST(ImageDecoderOptions, reporter) { const bool useDataList[] = {true, false}; for (size_t fidx = 0; fidx < SK_ARRAY_COUNT(files); ++fidx) { - SkString path = SkOSPath::SkPathJoin(resourceDir.c_str(), files[fidx]); + SkString path = SkOSPath::SkPathJoin(directory.c_str(), files[fidx]); if (!sk_exists(path.c_str())) { continue; } |