Revert "Flatten resources directory"

tests/ImageDecodingTest.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkColor.h"
@@ skipping 494 matching lines @@
         return bitmap->pixelRef();
     }
     return NULL;
 }
 /**
  *  A test for the SkDecodingImageGenerator::Create and
  *  SkInstallDiscardablePixelRef functions.
  */
 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())) {
         SkBitmap bm;
         SkAssertResult(bm.setConfig(SkImageInfo::MakeN32Premul(1, 1)));
         REPORTER_ASSERT(reporter,
             NULL != install_pixel_ref(&bm, stream.detach(), 1, true));
         SkAutoLockPixels alp(bm);
         REPORTER_ASSERT(reporter, NULL != bm.getPixels());
     }
 }
 
 
 ////////////////////////////////////////////////////////////////////////////////
 
 #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
 
 
 #if SK_PMCOLOR_BYTE_ORDER(B,G,R,A)
     #define kBackwards_SkColorType kRGBA_8888_SkColorType
 #elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A)
     #define kBackwards_SkColorType kBGRA_8888_SkColorType
 #else
     #error "SK_*32_SHFIT values must correspond to BGRA or RGBA byte order"
@@ skipping 67 matching lines @@
         return;
     }
     #if defined(SK_BUILD_FOR_ANDROID) || defined(SK_BUILD_FOR_UNIX)
     // Android is the only system that use Skia's image decoders in
     // production.  For now, we'll only verify that samplesize works
     // on systems where it already is known to work.
     REPORTER_ASSERT(reporter, check_rounding(bm.height(), kExpectedHeight,
                                              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) {
         ERRORF(reporter, "Pixel decode failed [sampleSize=%d dither=%s "
                "colorType=%s %s]", opts.fSampleSize, yn(opts.fDitherImage),
                options_colorType(opts), path.c_str());
         return;
     }
 
     SkBitmap::Config requestedConfig
@@ skipping 41 matching lines @@
         "randPixels.jpg",
         "randPixels.png",
         "randPixels.webp",
         #if !defined(SK_BUILD_FOR_WIN)
         // TODO(halcanary): Find out why this fails sometimes.
         "randPixels.gif",
         #endif
     };
 
     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;
     }
 
     int scaleList[] = {1, 2, 3, 4};
     bool ditherList[] = {true, false};
     SkColorType colorList[] = {
         kAlpha_8_SkColorType,
         kRGB_565_SkColorType,
         kARGB_4444_SkColorType,  // Most decoders will fail on 4444.
         kN32_SkColorType
         // Note that indexed color is left out of the list.  Lazy
         // decoding doesn't do indexed color.
     };
     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;
         }
 
         SkAutoDataUnref encodedData(SkData::NewFromFileName(path.c_str()));
         REPORTER_ASSERT(reporter, encodedData.get() != NULL);
         SkAutoTUnref<SkStreamRewindable> encodedStream(
             SkStream::NewFromFile(path.c_str()));
         REPORTER_ASSERT(reporter, encodedStream.get() != NULL);
 
@@ skipping 10 matching lines @@
                     }
                     SkDecodingImageGenerator::Options options(scaleList[i],
                                                               ditherList[j]);
                     test_options(reporter, options, encodedStream, encodedData,
                                  useDataList[m], path);
                 }
             }
         }
     }
 }