Remove bitmap reuse from SkImageDecoder.

src/images/SkImageDecoder_libgif.cpp

 
 /*
  * Copyright 2006 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 "SkImageDecoder.h"
@@ skipping 184 matching lines @@
             }
 
             width = gif->SWidth;
             height = gif->SHeight;
             if (width <= 0 || height <= 0 ||
                 !this->chooseFromOneChoice(SkBitmap::kIndex8_Config,
                                            width, height)) {
                 return error_return(gif, *bm, "chooseFromOneChoice");
             }
 
+            bm->setConfig(SkBitmap::kIndex8_Config, width, height);
             if (SkImageDecoder::kDecodeBounds_Mode == mode) {
-                bm->setConfig(SkBitmap::kIndex8_Config, width, height);
                 return true;
             }
 
-            // No Bitmap reuse supported for this format
-            if (!bm->isNull()) {
-                return false;
-            }
-
-            bm->setConfig(SkBitmap::kIndex8_Config, width, height);
             SavedImage* image = &gif->SavedImages[gif->ImageCount-1];
             const GifImageDesc& desc = image->ImageDesc;
 
             // check for valid descriptor
             if (   (desc.Top | desc.Left) < 0 ||
                     desc.Left + desc.Width > width ||
                     desc.Top + desc.Height > height) {
                 return error_return(gif, *bm, "TopLeft");
             }
 
@@ skipping 160 matching lines @@
 static SkTRegistry<SkImageDecoder*, SkStream*> gReg(sk_libgif_dfactory);
 
 static SkImageDecoder::Format get_format_gif(SkStream* stream) {
     if (is_gif(stream)) {
         return SkImageDecoder::kGIF_Format;
     }
     return SkImageDecoder::kUnknown_Format;
 }
 
 static SkTRegistry<SkImageDecoder::Format, SkStream*> gFormatReg(get_format_gif);