add SK_ATTR_DEPRECATED -- will need to disable for chrome, since it triggers a warning

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 "Test.h"
 #include "SkBitmap.h"
 #include "SkRect.h"
@@ skipping 78 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, shift;
     SkAutoLockPixels lock(bm);
     const void* rawAddr = bm.getAddr(x,y);
 
-    switch (bm.getConfig()) {
+    switch (bm.config()) {
         case SkBitmap::kARGB_8888_Config:
             memcpy(&val, rawAddr, sizeof(uint32_t));
             break;
         case SkBitmap::kARGB_4444_Config:
         case SkBitmap::kRGB_565_Config:
             memcpy(&val16, rawAddr, sizeof(uint16_t));
             val = val16;
             break;
         case SkBitmap::kA8_Config:
         case SkBitmap::kIndex8_Config:
@@ skipping 13 matching lines @@
 
 // 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, shift;
     SkAutoLockPixels lock(bm);
     void* rawAddr = bm.getAddr(x,y);
 
-    switch (bm.getConfig()) {
+    switch (bm.config()) {
         case SkBitmap::kARGB_8888_Config:
             memcpy(rawAddr, &val, sizeof(uint32_t));
             break;
         case SkBitmap::kARGB_4444_Config:
         case SkBitmap::kRGB_565_Config:
             val16 = val & 0xFFFF;
             memcpy(rawAddr, &val16, sizeof(uint16_t));
             break;
         case SkBitmap::kA8_Config:
         case SkBitmap::kIndex8_Config:
@@ skipping 11 matching lines @@
             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.getConfig()) {
+    switch (bm.config()) {
         case SkBitmap::kNo_Config: return "SkBitmap::kNo_Config";
         case SkBitmap::kA1_Config: return "SkBitmap::kA1_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.";
     }
 }
@@ skipping 275 matching lines @@
                 SkIRect r;
                 if (gPairs[i].fConfig == SkBitmap::kA1_Config)
                     // This config seems to need byte-alignment of
                     // extracted subset bits.
                     r.set(0, 0, subW, subH);
                 else
                     r.set(1, 0, 1 + subW, subH); // 2x2 extracted bitmap
 
                 srcReady = src.extractSubset(&subset, r);
             } else {
-                srcReady = src.copyTo(&subset, src.getConfig());
+                srcReady = src.copyTo(&subset, src.config());
             }
 
             // 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.getConfig(), subW) * 2;
+                    SkBitmap::ComputeRowBytes(src.config(), 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)
                     {
                         int index = y * subW + x;
                         SkASSERT(index < coords.length);
                         coords[index]->fX = x;
                         coords[index]->fY = y;
                     }
 
                 writeCoordPixels(subset, coords);
 
                 // Test #1 ////////////////////////////////////////////
 
                 // Before/after comparisons easier if we attach buf
                 // to an appropriately configured SkBitmap.
                 memset(buf, 0xFF, bufSize);
                 // Config with stride greater than src but that fits in buf.
                 bufBm.setConfig(gPairs[i].fConfig, subW, subH,
-                    SkBitmap::ComputeRowBytes(subset.getConfig(), subW)
-                                              * 2);
+                    SkBitmap::ComputeRowBytes(subset.config(), subW) * 2);
                 bufBm.setPixels(buf);
                 successExpected = false;
                 // Then attempt to copy with a stride that is too large
                 // to fit in the buffer.
                 REPORTER_ASSERT(reporter,
                     subset.copyPixelsTo(buf, bufSize, bufBm.rowBytes() * 3)
                     == successExpected);
 
                 if (successExpected)
                     reportCopyVerification(subset, bufBm, coords,
@@ skipping 80 matching lines @@
                         false);
 
 #endif
             }
         } // for (size_t copyCase ...
     }
 }
 
 #include "TestClassDef.h"
 DEFINE_TESTCLASS("BitmapCopy", TestBitmapCopyClass, TestBitmapCopy)