Add option to SkDecodingImageGenerator to require unpremul.

src/images/SkDecodingImageGenerator.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkData.h"
 #include "SkDecodingImageGenerator.h"
 #include "SkImageDecoder.h"
@@ skipping 17 matching lines @@
     virtual bool getInfo(SkImageInfo* info) SK_OVERRIDE;
     virtual bool getPixels(const SkImageInfo& info,
                            void* pixels,
                            size_t rowBytes) SK_OVERRIDE;
 
     SkData*                fData;
     SkStreamRewindable*    fStream;
     const SkImageInfo      fInfo;
     const int              fSampleSize;
     const bool             fDitherImage;
+    const bool             fRequireUnpremul;

[reed1, 2014/04/07 18:21:12]

why isn't this deducible from fInfo?

[scroggo, 2014/04/07 19:00:12]

Done. (I'm actually deducing it from the passed in info to getPixels.)

 
     DecodingImageGenerator(SkData* data,
                            SkStreamRewindable* stream,
                            const SkImageInfo& info,
                            int sampleSize,
-                           bool ditherImage);
+                           bool ditherImage,
+                           bool requireUnpremul);
     typedef SkImageGenerator INHERITED;
 };
 
 /**
  *  Special allocator used by getPixels(). Uses preallocated memory
  *  provided if possible, else fall-back on the default allocator
  */
 class TargetAllocator : public SkBitmap::Allocator {
 public:
     TargetAllocator(const SkImageInfo& info,
@@ skipping 46 matching lines @@
 }
 #endif  // SK_DEBUG
 
 ////////////////////////////////////////////////////////////////////////////////
 
 DecodingImageGenerator::DecodingImageGenerator(
         SkData* data,
         SkStreamRewindable* stream,
         const SkImageInfo& info,
         int sampleSize,
-        bool ditherImage)
+        bool ditherImage,
+        bool requireUnpremul)
     : fData(data)
     , fStream(stream)
     , fInfo(info)
     , fSampleSize(sampleSize)
     , fDitherImage(ditherImage)
+    , fRequireUnpremul(requireUnpremul)
 {
     SkASSERT(stream != NULL);
     SkSafeRef(fData);  // may be NULL.
 }
 
 DecodingImageGenerator::~DecodingImageGenerator() {
     SkSafeUnref(fData);
     fStream->unref();
 }
 
@@ skipping 42 matching lines @@
         return false;
     }
 
     SkAssertResult(fStream->rewind());
     SkAutoTDelete<SkImageDecoder> decoder(SkImageDecoder::Factory(fStream));
     if (NULL == decoder.get()) {
         return false;
     }
     decoder->setDitherImage(fDitherImage);
     decoder->setSampleSize(fSampleSize);
+    decoder->setRequireUnpremultipliedColors(fRequireUnpremul);
 
     SkBitmap bitmap;
     TargetAllocator allocator(fInfo, pixels, rowBytes);
     decoder->setAllocator(&allocator);
     // TODO: need to be able to pass colortype directly to decoder
     SkBitmap::Config legacyConfig = SkColorTypeToBitmapConfig(info.colorType());
     bool success = decoder->decode(fStream, &bitmap, legacyConfig,
                                    SkImageDecoder::kDecodePixels_Mode);
     decoder->setAllocator(NULL);
     if (!success) {
@@ skipping 55 matching lines @@
         }
     } else {
         if (!bitmap.canCopyTo(opts.fRequestedColorType)) {
             SkASSERT(bitmap.colorType() != opts.fRequestedColorType);
             return NULL;  // Can not translate to needed config.
         }
         info.fColorType = opts.fRequestedColorType;
     }
     return SkNEW_ARGS(DecodingImageGenerator,
                       (data, autoStream.detach(), info,
-                       opts.fSampleSize, opts.fDitherImage));
+                       opts.fSampleSize, opts.fDitherImage,
+                       opts.fRequireUnpremul));
 }
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 
 SkImageGenerator* SkDecodingImageGenerator::Create(
         SkData* data,
         const SkDecodingImageGenerator::Options& opts) {
     SkASSERT(data != NULL);
@@ skipping 10 matching lines @@
         SkStreamRewindable* stream,
         const SkDecodingImageGenerator::Options& opts) {
     SkASSERT(stream != NULL);
     SkASSERT(stream->unique());
     if ((stream == NULL) || !stream->unique()) {
         SkSafeUnref(stream);
         return NULL;
     }
     return CreateDecodingImageGenerator(NULL, stream, opts);
 }