Expand pixelref to return SkImageInfo and rowbytes

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 350 matching lines @@
             SkASSERT(0 == fPixelLockCount);
             fPixels = NULL;
             if (fColorTable) {
                 fColorTable->unref();
                 fColorTable = NULL;
             }
         }
     }
 }
 
+bool SkBitmap::asImageInfo(SkImageInfo* info) const {
+    SkColorType ct;
+    switch (this->config()) {
+        case kNo_Config:
+        case kA1_Config:
+            return false;
+        case kA8_Config:
+            ct = kAlpha_8_SkColorType;
+            break;
+        case kIndex8_Config:
+            ct = kIndex8_SkColorType;
+            break;
+        case kRGB_565_Config:
+            ct = kRGB_565_SkColorType;
+            break;
+        case kARGB_4444_Config:
+            ct = kARGB_4444_SkColorType;
+            break;
+        case kARGB_8888_Config:
+            ct = kPMColor_SkColorType;
+            break;
+    }
+    if (info) {
+        info->fWidth = fWidth;
+        info->fHeight = fHeight;
+        info->fAlphaType = this->alphaType();
+        info->fColorType = ct;
+    }
+    return true;
+}
+
 SkPixelRef* SkBitmap::setPixelRef(SkPixelRef* pr, size_t offset) {
     // do this first, we that we never have a non-zero offset with a null ref
     if (NULL == pr) {
         offset = 0;
     }
 
     if (fPixelRef != pr || fPixelRefOffset != offset) {
         if (fPixelRef != pr) {
             this->freePixels();
             SkASSERT(NULL == fPixelRef);
@@ skipping 33 matching lines @@
 
 void SkBitmap::setPixels(void* p, SkColorTable* ctable) {
     if (NULL == p) {
         this->setPixelRef(NULL, 0);
         return;
     }
 
     Sk64 size = this->getSize64();
     SkASSERT(!size.isNeg() && size.is32());
 
-    this->setPixelRef(new SkMallocPixelRef(p, size.get32(), ctable, false))->unref();
+    SkImageInfo info;
+    if (!this->asImageInfo(&info)) {
+        this->setPixelRef(NULL, 0);
+        return;
+    }
+    this->setPixelRef(new SkMallocPixelRef(info, p, fRowBytes, ctable, false))->unref();

[scroggo, 2013/11/19 18:17:09]

SkNEW_ARGS

[reed1, 2013/11/20 20:56:56]

Done.

     // since we're already allocated, we lockPixels right away
     this->lockPixels();
     SkDEBUGCODE(this->validate();)
 }
 
 bool SkBitmap::allocPixels(Allocator* allocator, SkColorTable* ctable) {
     HeapAllocator stdalloc;
 
     if (NULL == allocator) {
         allocator = &stdalloc;
@@ skipping 49 matching lines @@
 /** We explicitly use the same allocator for our pixels that SkMask does,
  so that we can freely assign memory allocated by one class to the other.
  */
 bool SkBitmap::HeapAllocator::allocPixelRef(SkBitmap* dst,
                                             SkColorTable* ctable) {
     Sk64 size = dst->getSize64();
     if (size.isNeg() || !size.is32()) {
         return false;
     }
 
+    SkImageInfo info;
+    if (!dst->asImageInfo(&info)) {
+        SkDebugf("unsupported config for info %d\n", dst->config());
+        return false;
+    }
+    
     void* addr = sk_malloc_flags(size.get32(), 0);  // returns NULL on failure
     if (NULL == addr) {
         return false;
     }
 
-    dst->setPixelRef(new SkMallocPixelRef(addr, size.get32(), ctable))->unref();
+    SkPixelRef* pr = SkNEW_ARGS(SkMallocPixelRef,
+                                (info, addr, dst->rowBytes(), ctable, true));
+    dst->setPixelRef(pr, 0)->unref();
     // since we're already allocated, we lockPixels right away
     dst->lockPixels();
     return true;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 size_t SkBitmap::getSafeSize() const {
     // This is intended to be a size_t version of ComputeSafeSize64(), just
     // faster. The computation is meant to be identical.
@@ skipping 1199 matching lines @@
         if (NULL != uri) {
             str->appendf(" uri:\"%s\"", uri);
         } else {
             str->appendf(" pixelref:%p", pr);
         }
     }
 
     str->append(")");
 }
 #endif