Add an option to create unpremultiplied bitmaps.

include/core/SkImageDecoder.h

 
 /*
  * 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.
  */
 
 
 #ifndef SkImageDecoder_DEFINED
@@ skipping 64 matching lines @@
     bool getPreferQualityOverSpeed() const { return fPreferQualityOverSpeed; }
 
     /** Set to true if the the decoder should try to decode the
         resulting image to a higher quality even at the expense of
         the decoding speed.
     */
     void setPreferQualityOverSpeed(bool qualityOverSpeed) {
         fPreferQualityOverSpeed = qualityOverSpeed;
     }
 
+    /** Set to true if the decoder should return a bitmap with unpremultiplied
+        colors. The decoder is free to ignore this request. The default is
+        false, meaning the resulting bitmap will have its colors premultiplied.
+    */
+    void setRequestUnpremultipliedColors(bool request) {
+        fRequestUnpremultipliedColors = request;
+    }
+
+    /** Returns true if the decoder should try to return a bitmap with unpremultiplied
+        colors.
+    */
+    bool getRequestUnpremultipliedColors() const { return fRequestUnpremultipliedColors; }
+
     /** \class Peeker
 
         Base class for optional callbacks to retrieve meta/chunk data out of
         an image as it is being decoded.
     */
     class Peeker : public SkRefCnt {
     public:
         SK_DECLARE_INST_COUNT(Peeker)
 
         /** Return true to continue decoding, or false to indicate an error, which
@@ skipping 331 matching lines @@
     Peeker*                 fPeeker;
     Chooser*                fChooser;
     SkBitmap::Allocator*    fAllocator;
     int                     fSampleSize;
     SkBitmap::Config        fDefaultPref;   // use if fUsePrefTable is false
     SkBitmap::Config        fPrefTable[6];  // use if fUsePrefTable is true
     bool                    fDitherImage;
     bool                    fUsePrefTable;
     mutable bool            fShouldCancelDecode;
     bool                    fPreferQualityOverSpeed;
+    bool                    fRequestUnpremultipliedColors;
 };
 
 /** Calling newDecoder with a stream returns a new matching imagedecoder
     instance, or NULL if none can be found. The caller must manage its ownership
     of the stream as usual, calling unref() when it is done, as the returned
     decoder may have called ref() (and if so, the decoder is responsible for
     balancing its ownership when it is destroyed).
  */
 class SkImageDecoderFactory : public SkRefCnt {
 public:
@@ skipping 29 matching lines @@
 // not all of these will be available
 DECLARE_DECODER_CREATOR(BMPImageDecoder);
 DECLARE_DECODER_CREATOR(GIFImageDecoder);
 DECLARE_DECODER_CREATOR(ICOImageDecoder);
 DECLARE_DECODER_CREATOR(JPEGImageDecoder);
 DECLARE_DECODER_CREATOR(PNGImageDecoder);
 DECLARE_DECODER_CREATOR(WBMPImageDecoder);
 DECLARE_DECODER_CREATOR(WEBPImageDecoder);
 
 #endif