Upstream Android modifications to the image encoders/decoders.

src/images/SkImageDecoder_libbmp.cpp

 
 /*
  * Copyright 2007 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 "bmpdecoderhelper.h"
@@ skipping 97 matching lines @@
     SkBitmap::Config config = this->getPrefConfig(k32Bit_SrcDepth, false);
 
     // only accept prefConfig if it makes sense for us
     if (SkBitmap::kARGB_4444_Config != config &&
             SkBitmap::kRGB_565_Config != config) {
         config = SkBitmap::kARGB_8888_Config;
     }
 
     SkScaledBitmapSampler sampler(width, height, getSampleSize());
 
+    if (justBounds) {
+        bm->setConfig(config, sampler.scaledWidth(), sampler.scaledHeight());
+        bm->setIsOpaque(true);
+        return true;
+    }
+    // No Bitmap reuse supported for this format
+    if (!bm->isNull()) {
+        return false;
+    }
+
     bm->setConfig(config, sampler.scaledWidth(), sampler.scaledHeight());
     bm->setIsOpaque(true);
-    if (justBounds) {
-        return true;
-    }
 
     if (!this->allocPixelRef(bm, NULL)) {
         return false;
     }
 
     SkAutoLockPixels alp(*bm);
 
     if (!sampler.begin(bm, SkScaledBitmapSampler::kRGB, getDitherImage())) {
         return false;
     }
 
     const int srcRowBytes = width * 3;
     const int dstHeight = sampler.scaledHeight();
     const uint8_t* srcRow = callback.rgb();
 
     srcRow += sampler.srcY0() * srcRowBytes;
     for (int y = 0; y < dstHeight; y++) {
         sampler.next(srcRow);
         srcRow += sampler.srcDY() * srcRowBytes;
     }
     return true;
 }