Remove image decoder and encoder autoregistration

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"
-
+#include "SkImageDecoder_WIC.h"
 // Workaround for:
 // http://connect.microsoft.com/VisualStudio/feedback/details/621653/
 // http://crbug.com/225822
 // In VS2010 both intsafe.h and stdint.h define the following without guards.
 // SkTypes brought in windows.h and stdint.h and the following defines are
 // not used by this file. However, they may be re-introduced by wincodec.h.
 #undef INT8_MIN
 #undef INT16_MIN
 #undef INT32_MIN
 #undef INT64_MIN
 #undef INT8_MAX
 #undef UINT8_MAX
 #undef INT16_MAX
 #undef UINT16_MAX
 #undef INT32_MAX
 #undef UINT32_MAX
 #undef INT64_MAX
 #undef UINT64_MAX
 
 #include <wincodec.h>
 #include "SkAutoCoInitialize.h"
-#include "SkImageDecoder.h"
-#include "SkImageEncoder.h"
 #include "SkIStream.h"
-#include "SkMovie.h"
 #include "SkStream.h"
 #include "SkTScopedComPtr.h"
 #include "SkUnPreMultiply.h"
 
 //All Windows SDKs back to XPSP2 export the CLSID_WICImagingFactory symbol.
 //In the Windows8 SDK the CLSID_WICImagingFactory symbol is still exported
 //but CLSID_WICImagingFactory is then #defined to CLSID_WICImagingFactory2.
 //Undo this #define if it has been done so that we link against the symbols
 //we intended to link against on all SDKs.
 #if defined(CLSID_WICImagingFactory)
@@ skipping 197 matching lines @@
         if (SkBitmap::ComputeIsOpaque(*bm)) {
             bm->setAlphaType(kOpaque_SkAlphaType);
         }
     }
 
     return SUCCEEDED(hr);
 }
 
 /////////////////////////////////////////////////////////////////////////
 
-extern SkImageDecoder* image_decoder_from_stream(SkStreamRewindable*);
-
-SkImageDecoder* SkImageDecoder::Factory(SkStreamRewindable* stream) {
-    SkImageDecoder* decoder = image_decoder_from_stream(stream);
-    if (NULL == decoder) {
-        // If no image decoder specific to the stream exists, use SkImageDecoder_WIC.
-        return SkNEW(SkImageDecoder_WIC);
-    } else {
-        return decoder;
-    }
+SkImageDecoder* SkCreateImageDecoder_WIC(SkImageDecoder::Format format) {
+    SkASSERT(SkImageDecoder::kUnknown_Format != format);
+    return SkNEW(SkImageDecoder_WIC);
 }
 
 /////////////////////////////////////////////////////////////////////////
-
-SkMovie* SkMovie::DecodeStream(SkStreamRewindable* stream) {
-    return NULL;
-}
-
-/////////////////////////////////////////////////////////////////////////
 
 class SkImageEncoder_WIC : public SkImageEncoder {
 public:
     SkImageEncoder_WIC(Type t) : fType(t) {}
 
 protected:
     virtual bool onEncode(SkWStream* stream, const SkBitmap& bm, int quality);
 
 private:
     Type fType;
@@ skipping 148 matching lines @@
 
     if (SUCCEEDED(hr)) {
         hr = piEncoder->Commit();
     }
 
     return SUCCEEDED(hr);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-static SkImageEncoder* sk_imageencoder_wic_factory(SkImageEncoder::Type t) {
+SkImageEncoder* SkCreateImageEncoder_WIC(SkImageEncoder::Type t) {
     switch (t) {
         case SkImageEncoder::kBMP_Type:
         case SkImageEncoder::kICO_Type:
         case SkImageEncoder::kJPEG_Type:
         case SkImageEncoder::kPNG_Type:
             break;
         default:
             return NULL;
     }
     return SkNEW_ARGS(SkImageEncoder_WIC, (t));
 }
 
-static SkImageEncoder_EncodeReg gEReg(sk_imageencoder_wic_factory);
-
-static SkImageDecoder::Format get_format_wic(SkStreamRewindable* stream) {
+SkImageDecoder::Format SkDetectFormatImageDecoder_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);