New API for encoding bitmaps during serialization.

src/core/SkBitmap.cpp

 
 /*
  * Copyright 2008 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkBitmap.h"
@@ skipping 848 matching lines @@
             return SUB_OFFSET_FAILURE;
     }
     return y * bm.rowBytes() + x;
 }
 
 /**
  *  Using the pixelRefOffset(), rowBytes(), and Config of bm, determine the (x, y) coordinate of the
  *  upper left corner of bm relative to its SkPixelRef.
  *  x and y must be non-NULL.
  */
-static bool getUpperLeftFromOffset(const SkBitmap& bm, int32_t* x, int32_t* y) {
+bool getUpperLeftFromOffset(SkBitmap::Config config, size_t offset, size_t rowBytes,
+                                   int32_t* x, int32_t* y) {
     SkASSERT(x != NULL && y != NULL);
-    const size_t offset = bm.pixelRefOffset();
     if (0 == offset) {
         *x = *y = 0;
         return true;
     }
     // Use integer division to find the correct y position.
-    *y = SkToS32(offset / bm.rowBytes());
+    *y = SkToS32(offset / rowBytes);
     // The remainder will be the x position, after we reverse getSubOffset.
-    *x = SkToS32(offset % bm.rowBytes());
-    switch (bm.getConfig()) {
+    *x = SkToS32(offset % rowBytes);
+    switch (config) {
         case SkBitmap::kA8_Config:
             // Fall through.
         case SkBitmap::kIndex8_Config:
             // x is unmodified
             break;
 
         case SkBitmap::kRGB_565_Config:
             // Fall through.
         case SkBitmap::kARGB_4444_Config:
             *x >>= 1;
             break;
 
         case SkBitmap::kARGB_8888_Config:
             *x >>= 2;
             break;
 
         case SkBitmap::kNo_Config:
             // Fall through.
         case SkBitmap::kA1_Config:
             // Fall through.
         default:
             return false;
     }
     return true;
 }
 
+static bool getUpperLeftFromOffset(const SkBitmap& bm, int32_t* x, int32_t* y) {

[djsollen, 2013/05/21 14:10:44]

according to our style guide static methods should be lower case with
underscores separating words.

[scroggo, 2013/05/21 16:14:15]

Done.

+    return getUpperLeftFromOffset(bm.config(), bm.pixelRefOffset(), bm.rowBytes(), x, y);
+}
+
 bool SkBitmap::extractSubset(SkBitmap* result, const SkIRect& subset) const {
     SkDEBUGCODE(this->validate();)
 
     if (NULL == result || NULL == fPixelRef) {
         return false;   // no src pixels
     }
 
     SkIRect srcRect, r;
     srcRect.set(0, 0, this->width(), this->height());
     if (!r.intersect(srcRect, subset)) {
@@ skipping 752 matching lines @@
         if (NULL != uri) {
             str->appendf(" uri:\"%s\"", uri);
         } else {
             str->appendf(" pixelref:%p", pr);
         }
     }
 
     str->append(")");
 }
 #endif