Qualify the return value of SkImageDecoder::decode

src/ports/SkImageDecoder_WIC.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 "SkTypes.h"
 
@@ skipping 49 matching lines @@
      *  Helper function to decode an SkStream.
      *  @param stream SkStream to decode. Must be at the beginning.
      *  @param bm   SkBitmap to decode into. Only used if wicMode is kDecodeBounds_WICMode or
      *      kDecodePixels_WICMode, in which case it must not be NULL.
      *  @param format Out parameter for the SkImageDecoder::Format of the SkStream. Only used if
      *      wicMode is kDecodeFormat_WICMode.
      */
     bool decodeStream(SkStream* stream, SkBitmap* bm, WICModes wicMode, Format* format) const;
 
 protected:
-    virtual bool onDecode(SkStream* stream, SkBitmap* bm, Mode mode) SK_OVERRIDE;
+    virtual Result onDecode(SkStream* stream, SkBitmap* bm, Mode mode) SK_OVERRIDE;
 };
 
 struct FormatConversion {
     GUID                    fGuidFormat;
     SkImageDecoder::Format  fFormat;
 };
 
 static const FormatConversion gFormatConversions[] = {
     { GUID_ContainerFormatBmp, SkImageDecoder::kBMP_Format },
     { GUID_ContainerFormatGif, SkImageDecoder::kGIF_Format },
     { GUID_ContainerFormatIco, SkImageDecoder::kICO_Format },
     { GUID_ContainerFormatJpeg, SkImageDecoder::kJPEG_Format },
     { GUID_ContainerFormatPng, SkImageDecoder::kPNG_Format },
 };
 
 static SkImageDecoder::Format GuidContainerFormat_to_Format(REFGUID guid) {
     for (size_t i = 0; i < SK_ARRAY_COUNT(gFormatConversions); i++) {
         if (IsEqualGUID(guid, gFormatConversions[i].fGuidFormat)) {
             return gFormatConversions[i].fFormat;
         }
     }
     return SkImageDecoder::kUnknown_Format;
 }
 
-bool SkImageDecoder_WIC::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
+SkImageDecoder::Result SkImageDecoder_WIC::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
     WICModes wicMode;
     switch (mode) {
         case SkImageDecoder::kDecodeBounds_Mode:
             wicMode = kDecodeBounds_WICMode;
             break;
         case SkImageDecoder::kDecodePixels_Mode:
             wicMode = kDecodePixels_WICMode;
             break;
     }
-    return this->decodeStream(stream, bm, wicMode, NULL);
+    return this->decodeStream(stream, bm, wicMode, NULL) ? kSuccess : kFailure;
 }
 
 bool SkImageDecoder_WIC::decodeStream(SkStream* stream, SkBitmap* bm, WICModes wicMode,
                                       Format* format) const {
     //Initialize COM.
     SkAutoCoInitialize scopedCo;
     if (!scopedCo.succeeded()) {
         return false;
     }
 
@@ skipping 339 matching lines @@
 static SkImageDecoder::Format get_format_wic(SkStreamRewindable* stream) {
     SkImageDecoder::Format format;
     SkImageDecoder_WIC codec;
     if (!codec.decodeStream(stream, NULL, SkImageDecoder_WIC::kDecodeFormat_WICMode, &format)) {
         format = SkImageDecoder::kUnknown_Format;
     }
     return format;
 }
 
 static SkImageDecoder_FormatReg gFormatReg(get_format_wic);