Fix issue in image decoders where the bitmap config was not properly set.

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 "SkReadBuffer.h"
@@ skipping 12 matching lines @@
         : INHERITED(info, mutex), fErrorInDecoding(false)
 {
     SkASSERT(stream);
     stream->ref();
     fStream = stream;
     fSampleSize = sampleSize;
     fDoDither = true;
     fPrev = fNext = NULL;
     fFactory = NULL;
 
+    // This sets the colortype/alphatype to exactly match our info, so that this
+    // can get communicated down to the codec.

[scroggo, 2014/02/19 20:05:43]

nit: I'd find this easier to follow if it stated that it is passed down as the
preferred config (it's not intuitive to me that the codec would need to know the
wrapping bitmap's colortype/alphatype).

[djsollen, 2014/02/19 20:25:33]

We actually need it to be the actual config and not just the preferred one. If
the codec gives us something other than that then we have a problem.

+    fBitmap.setConfig(info);
+
 #ifdef DUMP_IMAGEREF_LIFECYCLE
     SkDebugf("add ImageRef %p [%d] data=%d\n",
               this, this->info().fColorType, (int)stream->getLength());
 #endif
 }
 
 SkImageRef::~SkImageRef() {
 
 #ifdef DUMP_IMAGEREF_LIFECYCLE
     SkDebugf("delete ImageRef %p [%d] data=%d\n",
@@ skipping 68 matching lines @@
     } else {
         codec = SkImageDecoder::Factory(fStream);
     }
 
     if (codec) {
         SkAutoTDelete<SkImageDecoder> ad(codec);
 
         codec->setSampleSize(fSampleSize);
         codec->setDitherImage(fDoDither);
         if (this->onDecode(codec, fStream, &fBitmap, fBitmap.config(), mode)) {
+            if (kOpaque_SkAlphaType == fBitmap.alphaType()) {
+                this->changeAlphaType(kOpaque_SkAlphaType);
+            }
+            SkASSERT(this->info().fWidth == fBitmap.width());
+            SkASSERT(this->info().fHeight == fBitmap.height());

[scroggo, 2014/02/19 20:05:43]

Also the color type?

[djsollen, 2014/02/19 20:12:41]

Didn't put the colortype here is there is no easy accessor on the bitmap.  I
guess I could do the following...

SkImageInfo info;
SkASSERT(!fBitmap.asImageInfo(&info) || this->info().fColorType ==
info.fColorType);

             return true;
         }
     }
 
 #ifdef DUMP_IMAGEREF_LIFECYCLE
     if (NULL == codec) {
         SkDebugf("--- ImageRef: <%s> failed to find codec\n", this->getURI());
     } else {
         SkDebugf("--- ImageRef: <%s> failed in codec for %d mode\n",
                  this->getURI(), mode);
@@ skipping 40 matching lines @@
     size_t length = buffer.getArrayCount();
     if (buffer.validateAvailable(length)) {
         fStream = SkNEW_ARGS(SkMemoryStream, (length));
         buffer.readByteArray((void*)fStream->getMemoryBase(), length);
     } else {
         fStream = NULL;
     }
 
     fPrev = fNext = NULL;
     fFactory = NULL;
+
+    // This sets the colortype/alphatype to exactly match our info, so that this
+    // can get communicated down to the codec.
+    fBitmap.setConfig(this->info());
 }
 
 void SkImageRef::flatten(SkWriteBuffer& buffer) const {
     this->INHERITED::flatten(buffer);
 
     buffer.writeInt(fSampleSize);
     buffer.writeBool(fDoDither);
     // FIXME: Consider moving this logic should go into writeStream itself.
     // writeStream currently has no other callers, so this may be fine for
     // 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());
     }
 }