remove deprecated use of bitmap config from tests

tests/BitmapCopyTest.cpp

 /*
  * Copyright 2011 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 "SkRect.h"
 #include "Test.h"
 
 static const char* boolStr(bool value) {
     return value ? "true" : "false";
 }
 
-// these are in the same order as the SkBitmap::Config enum
+// these are in the same order as the SkColorType enum
 static const char* gColorTypeName[] = {
     "None", "A8", "565", "4444", "RGBA", "BGRA", "Index8"
 };
 
 static void report_opaqueness(skiatest::Reporter* reporter, const SkBitmap& src,
                               const SkBitmap& dst) {
     ERRORF(reporter, "src %s opaque:%d, dst %s opaque:%d",
            gColorTypeName[src.colorType()], src.isOpaque(),
            gColorTypeName[dst.colorType()], dst.isOpaque());
 }
@@ skipping 56 matching lines @@
 
 // Utility function to read the value of a given pixel in bm. All
 // values converted to uint32_t for simplification of comparisons.
 static uint32_t getPixel(int x, int y, const SkBitmap& bm) {
     uint32_t val = 0;
     uint16_t val16;
     uint8_t val8;
     SkAutoLockPixels lock(bm);
     const void* rawAddr = bm.getAddr(x,y);
 
-    switch (bm.config()) {
-        case SkBitmap::kARGB_8888_Config:
+    switch (bm.bytesPerPixel()) {
+        case 4:
             memcpy(&val, rawAddr, sizeof(uint32_t));
             break;
-        case SkBitmap::kARGB_4444_Config:
-        case SkBitmap::kRGB_565_Config:
+        case 2:
             memcpy(&val16, rawAddr, sizeof(uint16_t));
             val = val16;
             break;
-        case SkBitmap::kA8_Config:
-        case SkBitmap::kIndex8_Config:
+        case 1:
             memcpy(&val8, rawAddr, sizeof(uint8_t));
             val = val8;
             break;
         default:
             break;
     }
     return val;
 }
 
 // Utility function to set value of any pixel in bm.
 // bm.getConfig() specifies what format 'val' must be
 // converted to, but at present uint32_t can handle all formats.
 static void setPixel(int x, int y, uint32_t val, SkBitmap& bm) {
     uint16_t val16;
     uint8_t val8;
     SkAutoLockPixels lock(bm);
     void* rawAddr = bm.getAddr(x,y);
 
-    switch (bm.config()) {
-        case SkBitmap::kARGB_8888_Config:
+    switch (bm.bytesPerPixel()) {
+        case 4:
             memcpy(rawAddr, &val, sizeof(uint32_t));
             break;
-        case SkBitmap::kARGB_4444_Config:
-        case SkBitmap::kRGB_565_Config:
+        case 2:
             val16 = val & 0xFFFF;
             memcpy(rawAddr, &val16, sizeof(uint16_t));
             break;
-        case SkBitmap::kA8_Config:
-        case SkBitmap::kIndex8_Config:
+        case 1:
             val8 = val & 0xFF;
             memcpy(rawAddr, &val8, sizeof(uint8_t));
             break;
         default:
             // Ignore.
             break;
     }
 }
 
-// Utility to return string containing name of each format, to
-// simplify diagnostic output.
-static const char* getSkConfigName(const SkBitmap& bm) {
-    switch (bm.config()) {
-        case SkBitmap::kNo_Config: return "SkBitmap::kNo_Config";
-        case SkBitmap::kA8_Config: return "SkBitmap::kA8_Config";
-        case SkBitmap::kIndex8_Config: return "SkBitmap::kIndex8_Config";
-        case SkBitmap::kRGB_565_Config: return "SkBitmap::kRGB_565_Config";
-        case SkBitmap::kARGB_4444_Config: return "SkBitmap::kARGB_4444_Config";
-        case SkBitmap::kARGB_8888_Config: return "SkBitmap::kARGB_8888_Config";
-        default: return "Unknown SkBitmap configuration.";
-    }
-}
-
 // Helper struct to contain pixel locations, while avoiding need for STL.
 struct Coordinates {
 
     const int length;
     SkIPoint* const data;
 
     explicit Coordinates(int _length): length(_length)
                                      , data(new SkIPoint[length]) { }
 
     ~Coordinates(){
@@ skipping 16 matching lines @@
     bool success = true;
 
     // Confirm all pixels in the list match.
     for (int i = 0; i < coords.length; ++i) {
         success = success &&
                   (getPixel(coords[i]->fX, coords[i]->fY, bm1) ==
                    getPixel(coords[i]->fX, coords[i]->fY, bm2));
     }
 
     if (!success) {
-        ERRORF(reporter, "%s [config = %s]", msg, getSkConfigName(bm1));
+        ERRORF(reporter, "%s [colortype = %s]", msg,
+               gColorTypeName[bm1.colorType()]);
     }
 }
 
 // Writes unique pixel values at locations specified by coords.
 static void writeCoordPixels(SkBitmap& bm, const Coordinates& coords) {
     for (int i = 0; i < coords.length; ++i)
         setPixel(coords[i]->fX, coords[i]->fY, i, bm);
 }
 
 static const Pair gPairs[] = {
@@ skipping 108 matching lines @@
                 ERRORF(reporter, "SkBitmap::copyTo from %s to %s. returned %s "
                        "canCopyTo %s", gColorTypeName[i], gColorTypeName[j],
                        boolStr(success), boolStr(canSucceed));
             }
 
             if (success) {
                 REPORTER_ASSERT(reporter, srcPremul.width() == dst.width());
                 REPORTER_ASSERT(reporter, srcPremul.height() == dst.height());
                 REPORTER_ASSERT(reporter, dst.colorType() == gPairs[j].fColorType);
                 test_isOpaque(reporter, srcOpaque, srcPremul, dst.colorType());
-                if (srcPremul.config() == dst.config()) {
+                if (srcPremul.colorType() == dst.colorType()) {
                     SkAutoLockPixels srcLock(srcPremul);
                     SkAutoLockPixels dstLock(dst);
                     REPORTER_ASSERT(reporter, srcPremul.readyToDraw());
                     REPORTER_ASSERT(reporter, dst.readyToDraw());
                     const char* srcP = (const char*)srcPremul.getAddr(0, 0);
                     const char* dstP = (const char*)dst.getAddr(0, 0);
                     REPORTER_ASSERT(reporter, srcP != dstP);
                     REPORTER_ASSERT(reporter, !memcmp(srcP, dstP,
                                                       srcPremul.getSize()));
                     REPORTER_ASSERT(reporter, srcPremul.getGenerationID() == dst.getGenerationID());
                 } else {
                     REPORTER_ASSERT(reporter, srcPremul.getGenerationID() != dst.getGenerationID());
                 }
             } else {
                 // dst should be unchanged from its initial state
-                REPORTER_ASSERT(reporter, dst.config() == SkBitmap::kNo_Config);
+                REPORTER_ASSERT(reporter, dst.colorType() == kUnknown_SkColorType);
                 REPORTER_ASSERT(reporter, dst.width() == 0);
                 REPORTER_ASSERT(reporter, dst.height() == 0);
             }
         } // for (size_t j = ...
 
         // Tests for getSafeSize(), getSafeSize64(), copyPixelsTo(),
         // copyPixelsFrom().
         //
         for (size_t copyCase = 0; copyCase < SK_ARRAY_COUNT(isExtracted);
              ++copyCase) {
             // Test copying to/from external buffer.
             // Note: the tests below have hard-coded values ---
             //       Please take care if modifying.
 
             // Tests for getSafeSize64().
             // Test with a very large configuration without pixel buffer
             // attached.
             SkBitmap tstSafeSize;
             tstSafeSize.setConfig(SkImageInfo::Make(100000000U, 100000000U,
                                                     gPairs[i].fColorType,
                                                     kPremul_SkAlphaType));
             int64_t safeSize = tstSafeSize.computeSafeSize64();
             if (safeSize < 0) {
                 ERRORF(reporter, "getSafeSize64() negative: %s",
-                       getSkConfigName(tstSafeSize));
+                       gColorTypeName[tstSafeSize.colorType()]);
             }
             bool sizeFail = false;
             // Compare against hand-computed values.
             switch (gPairs[i].fColorType) {
                 case kUnknown_SkColorType:
                     break;
 
                 case kAlpha_8_SkColorType:
                 case kIndex_8_SkColorType:
                     if (safeSize != 0x2386F26FC10000LL) {
@@ skipping 12 matching lines @@
                     if (safeSize != 0x8E1BC9BF040000LL) {
                         sizeFail = true;
                     }
                     break;
 
                 default:
                     break;
             }
             if (sizeFail) {
                 ERRORF(reporter, "computeSafeSize64() wrong size: %s",
-                       getSkConfigName(tstSafeSize));
+                       gColorTypeName[tstSafeSize.colorType()]);
             }
 
             int subW = 2;
             int subH = 2;
 
             // Create bitmap to act as source for copies and subsets.
             SkBitmap src, subset;
             SkColorTable* ct = NULL;
-            if (SkBitmap::kIndex8_Config == src.config()) {
+            if (kIndex_8_SkColorType == src.colorType()) {
                 ct = init_ctable(kPremul_SkAlphaType);
             }
 
             if (isExtracted[copyCase]) { // A larger image to extract from.
                 src.allocPixels(SkImageInfo::Make(2 * subW + 1, subH,
                                                   gPairs[i].fColorType,
                                                   kPremul_SkAlphaType));
             } else { // Tests expect a 2x2 bitmap, so make smaller.
                 src.allocPixels(SkImageInfo::Make(subW, subH,
                                                   gPairs[i].fColorType,
                                                   kPremul_SkAlphaType));
             }
             SkSafeUnref(ct);
 
             // Either copy src or extract into 'subset', which is used
             // for subsequent calls to copyPixelsTo/From.
             bool srcReady = false;
             // Test relies on older behavior that extractSubset will fail on
-            // no_config
+            // kUnknown_SkColorType
             if (kUnknown_SkColorType != src.colorType() &&
                 isExtracted[copyCase]) {
                 // The extractedSubset() test case allows us to test copy-
                 // ing when src and dst mave possibly different strides.
                 SkIRect r;
                 r.set(1, 0, 1 + subW, subH); // 2x2 extracted bitmap
 
                 srcReady = src.extractSubset(&subset, r);
             } else {
                 srcReady = src.copyTo(&subset);
             }
 
             // Not all configurations will generate a valid 'subset'.
             if (srcReady) {
 
                 // Allocate our target buffer 'buf' for all copies.
                 // To simplify verifying correctness of copies attach
                 // buf to a SkBitmap, but copies are done using the
                 // raw buffer pointer.
                 const size_t bufSize = subH *
-                    SkBitmap::ComputeRowBytes(src.config(), subW) * 2;
+                    SkColorTypeMinRowBytes(src.colorType(), subW) * 2;
                 SkAutoMalloc autoBuf (bufSize);
                 uint8_t* buf = static_cast<uint8_t*>(autoBuf.get());
 
                 SkBitmap bufBm; // Attach buf to this bitmap.
                 bool successExpected;
 
                 // Set up values for each pixel being copied.
                 Coordinates coords(subW * subH);
                 for (int x = 0; x < subW; ++x)
                     for (int y = 0; y < subH; ++y)
@@ skipping 98 matching lines @@
                 // for the transfer.
                 REPORTER_ASSERT(reporter,
                     subset.copyPixelsFrom(buf, 1, subset.rowBytes()) ==
                         false);
 
 #endif
             }
         } // for (size_t copyCase ...
     }
 }