Expand pixelref to return SkImageInfo and rowbytes

src/images/SkImageRef.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 "SkImageRef.h"
 #include "SkBitmap.h"
 #include "SkFlattenableBuffers.h"
@@ skipping 125 matching lines @@
     } else {
         SkDebugf("--- ImageRef: <%s> failed in codec for %d mode\n",
                  this->getURI(), mode);
     }
 #endif
     fErrorInDecoding = true;
     fBitmap.reset();
     return false;
 }
 
-void* SkImageRef::onLockPixels(SkColorTable** ct) {
+bool SkImageRef::onGetInfo(SkImageInfo* info) {
+    return fBitmap.asImageInfo(info);
+}
+
+bool SkImageRef::onNewLockPixels(LockRec* rec) {
     if (NULL == fBitmap.getPixels()) {
         (void)this->prepareBitmap(SkImageDecoder::kDecodePixels_Mode);
     }
 
-    if (ct) {
-        *ct = fBitmap.getColorTable();
+    if (NULL == fBitmap.getPixels()) {
+        return false;
     }
-    return fBitmap.getPixels();
+    rec->fPixels = fBitmap.getPixels();
+    rec->fColorTable = NULL;
+    rec->fRowBytes = fBitmap.rowBytes();
+    return true;
 }
 
 size_t SkImageRef::ramUsed() const {
     size_t size = 0;
 
     if (fBitmap.getPixels()) {
         size = fBitmap.getSize();
         if (fBitmap.getColorTable()) {
             size += fBitmap.getColorTable()->count() * sizeof(SkPMColor);
         }
@@ skipping 28 matching lines @@
     // now.
     if (!fStream->rewind()) {
         SkDEBUGF(("Failed to rewind SkImageRef stream!"));
         buffer.write32(0);
     } else {
         // FIXME: Handle getLength properly here. Perhaps this class should
         // take an SkStreamAsset.
         buffer.writeStream(fStream, fStream->getLength());
     }
 }