Change SkDecodingImageGenerator API

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 204 matching lines @@
     Sk64 size;
     size.setMul(SkToS32(SkBitmap::ComputeRowBytes(c, width)), height);
     return size;
 }
 
 size_t SkBitmap::ComputeSize(Config c, int width, int height) {
     Sk64 size = SkBitmap::ComputeSize64(c, width, height);
     return isPos32Bits(size) ? size.get32() : 0;
 }
 
+Sk64 SkBitmap::ComputeSize64(const SkImageInfo& info) {

[reed1, 2013/12/17 17:38:52]

Why are these in bitmap, rather than SkImageInfo?

[hal.canary, 2013/12/17 21:00:22]

Good question.  Now that I look in SkImageInfo, I see I can replace

	SkBitmap::ComputeSize(info)

with

	info.getSafeSize(info.minRowBytes())

+    return SkBitmap::ComputeSize64(SkImageInfoToBitmapConfig(info),
+                                   info.fWidth, info.fHeight);
+}
+
+size_t SkBitmap::ComputeSize(const SkImageInfo& info) {
+    return SkBitmap::ComputeSize(SkImageInfoToBitmapConfig(info),
+                                 info.fWidth, info.fHeight);
+}
+
 Sk64 SkBitmap::ComputeSafeSize64(Config config,
                                  uint32_t width,
                                  uint32_t height,
                                  size_t rowBytes) {
     Sk64 safeSize;
     safeSize.setZero();
     if (height > 0) {
         // TODO: Handle the case where the return value from
         // ComputeRowBytes is more than 31 bits.
         safeSize.set(SkToS32(ComputeRowBytes(config, width)));
@@ skipping 1476 matching lines @@
         if (NULL != uri) {
             str->appendf(" uri:\"%s\"", uri);
         } else {
             str->appendf(" pixelref:%p", pr);
         }
     }
 
     str->append(")");
 }
 #endif