Remove image decoder and encoder autoregistration

src/images/SkImageDecoder_wbmp.cpp

 
 /*
  * 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.
  */
 
+#include "SkImageDecoder_wbmp.h"
 
-#include "SkImageDecoder.h"
 #include "SkColor.h"
 #include "SkColorPriv.h"
 #include "SkMath.h"
 #include "SkStream.h"
 #include "SkTemplates.h"
 #include "SkUtils.h"
 
 class SkWBMPImageDecoder : public SkImageDecoder {
 public:
     virtual Format getFormat() const SK_OVERRIDE {
@@ skipping 120 matching lines @@
     for (int y = 0; y < height; y++)
     {
         expand_bits_to_bytes(dst, src, width);
         dst += decodedBitmap->rowBytes();
         src += srcRB;
     }
 
     return true;
 }
 
-///////////////////////////////////////////////////////////////////////////////
-DEFINE_DECODER_CREATOR(WBMPImageDecoder);
-///////////////////////////////////////////////////////////////////////////////
-
-static SkImageDecoder* sk_wbmp_dfactory(SkStreamRewindable* stream) {
-    wbmp_head   head;
-
-    if (head.init(stream)) {
-        return SkNEW(SkWBMPImageDecoder);
-    }
-    return NULL;
-}
-
-static SkImageDecoder::Format get_format_wbmp(SkStreamRewindable* stream) {
+SkImageDecoder::Format SkDetectFormatWBMPImageDecoder(SkStreamRewindable* stream) {
     wbmp_head head;
     if (head.init(stream)) {
         return SkImageDecoder::kWBMP_Format;
     }
     return SkImageDecoder::kUnknown_Format;
 }
 
-static SkImageDecoder_DecodeReg gDReg(sk_wbmp_dfactory);
-static SkImageDecoder_FormatReg gFormatReg(get_format_wbmp);
+SkImageDecoder* SkCreateWBMPImageDecoder(SkStreamRewindable* stream) {
+    if (SkDetectFormatWBMPImageDecoder(stream) == SkImageDecoder::kWBMP_Format) {
+        return SkNEW(SkWBMPImageDecoder);
+    }
+    return NULL;
+}