Remove image decoder and encoder autoregistration

src/images/SkImageDecoder_libbmp.cpp

 
 /*
  * Copyright 2007 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 "bmpdecoderhelper.h"
+#include "SkImageDecoder_libbmp.h"
 #include "SkColorPriv.h"
-#include "SkImageDecoder.h"
 #include "SkScaledBitmapSampler.h"
 #include "SkStream.h"
 #include "SkStreamPriv.h"
 #include "SkTDArray.h"
+#include "bmpdecoderhelper.h"
 
 class SkBMPImageDecoder : public SkImageDecoder {
 public:
     SkBMPImageDecoder() {}
 
     virtual Format getFormat() const SK_OVERRIDE {
         return kBMP_Format;
     }
 
 protected:
     virtual Result onDecode(SkStream* stream, SkBitmap* bm, Mode mode) SK_OVERRIDE;
 
 private:
     typedef SkImageDecoder INHERITED;
 };
 
-///////////////////////////////////////////////////////////////////////////////
-DEFINE_DECODER_CREATOR(BMPImageDecoder);
-///////////////////////////////////////////////////////////////////////////////
-
-static bool is_bmp(SkStreamRewindable* stream) {
+SkImageDecoder::Format SkDetectFormatBMPImageDecoder(SkStreamRewindable* stream) {
     static const char kBmpMagic[] = { 'B', 'M' };
-
-
     char buffer[sizeof(kBmpMagic)];
-
-    return stream->read(buffer, sizeof(kBmpMagic)) == sizeof(kBmpMagic) &&
-        !memcmp(buffer, kBmpMagic, sizeof(kBmpMagic));
-}
-
-static SkImageDecoder* sk_libbmp_dfactory(SkStreamRewindable* stream) {
-    if (is_bmp(stream)) {
-        return SkNEW(SkBMPImageDecoder);
-    }
-    return NULL;
-}
-
-static SkImageDecoder_DecodeReg gReg(sk_libbmp_dfactory);
-
-static SkImageDecoder::Format get_format_bmp(SkStreamRewindable* stream) {
-    if (is_bmp(stream)) {
+    if (stream->read(buffer, sizeof(kBmpMagic)) == sizeof(kBmpMagic) &&
+            0 == memcmp(buffer, kBmpMagic, sizeof(kBmpMagic))) {
         return SkImageDecoder::kBMP_Format;
     }
     return SkImageDecoder::kUnknown_Format;
 }
 
-static SkImageDecoder_FormatReg gFormatReg(get_format_bmp);
+
+SkImageDecoder* SkCreateBMPImageDecoder(SkImageDecoder::Format format) {
+    SkASSERT(SkImageDecoder::kBMP_Format == format);
+    return SkNEW(SkBMPImageDecoder);
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 
 class SkBmpDecoderCallback : public image_codec::BmpDecoderCallback {
 public:
     // we don't copy the bitmap, just remember the pointer
     SkBmpDecoderCallback(bool justBounds) : fJustBounds(justBounds) {}
 
     // override from BmpDecoderCallback
     virtual uint8* SetSize(int width, int height) {
@@ skipping 79 matching lines @@
     const int dstHeight = sampler.scaledHeight();
     const uint8_t* srcRow = callback.rgb();
 
     srcRow += sampler.srcY0() * srcRowBytes;
     for (int y = 0; y < dstHeight; y++) {
         sampler.next(srcRow);
         srcRow += sampler.srcDY() * srcRowBytes;
     }
     return kSuccess;
 }