Remove image decoder and encoder autoregistration

src/images/SkImageDecoder_libjpeg.cpp

Index: src/images/SkImageDecoder_libjpeg.cpp
diff --git a/src/images/SkImageDecoder_libjpeg.cpp b/src/images/SkImageDecoder_libjpeg.cpp
index 21e96be2d3049e091a48ef1728bf7554522ad684..8ce4e906f0a7e5d6c8287a69413553a5da794bb4 100644
--- a/src/images/SkImageDecoder_libjpeg.cpp
+++ b/src/images/SkImageDecoder_libjpeg.cpp
@@ -6,8 +6,8 @@
  */
 
 
-#include "SkImageDecoder.h"
-#include "SkImageEncoder.h"
+#include "SkImageDecoder_libjpeg.h"
+
 #include "SkJpegUtility.h"
 #include "SkColorPriv.h"
 #include "SkDither.h"
@@ -1371,6 +1371,29 @@ static WriteScanline ChooseWriter(const SkBitmap& bm) {
     }
 }
 
+SkImageDecoder::Format SkDetectFormatJPEGImageDecoder(SkStreamRewindable* stream) {

[scroggo, 2014/11/12 18:00:12]

nit: The change is easier to follow without moving the function

[Kimmo Kinnunen, 2014/11/18 08:29:45]

Done.

+    static const unsigned char gHeader[] = { 0xFF, 0xD8, 0xFF };
+    static const size_t HEADER_SIZE = sizeof(gHeader);
+
+    char buffer[HEADER_SIZE];
+    size_t len = stream->read(buffer, HEADER_SIZE);
+
+    if (len != HEADER_SIZE) {
+        return SkImageDecoder::kUnknown_Format;   // can't read enough
+    }
+    if (memcmp(buffer, gHeader, HEADER_SIZE)) {
+        return SkImageDecoder::kUnknown_Format;
+    }
+    return SkImageDecoder::kJPEG_Format;
+}
+
+SkImageDecoder* SkCreateJPEGImageDecoder(SkStreamRewindable* stream) {
+    if (SkDetectFormatJPEGImageDecoder(stream) == SkImageDecoder::kJPEG_Format) {
+        return SkNEW(SkJPEGImageDecoder);
+    }
+    return NULL;
+}
+
 class SkJPEGImageEncoder : public SkImageEncoder {
 protected:
     virtual bool onEncode(SkWStream* stream, const SkBitmap& bm, int quality) {
@@ -1445,46 +1468,6 @@ protected:
     }
 };
 
-///////////////////////////////////////////////////////////////////////////////
-DEFINE_DECODER_CREATOR(JPEGImageDecoder);
-DEFINE_ENCODER_CREATOR(JPEGImageEncoder);
-///////////////////////////////////////////////////////////////////////////////
-
-static bool is_jpeg(SkStreamRewindable* stream) {
-    static const unsigned char gHeader[] = { 0xFF, 0xD8, 0xFF };
-    static const size_t HEADER_SIZE = sizeof(gHeader);
-
-    char buffer[HEADER_SIZE];
-    size_t len = stream->read(buffer, HEADER_SIZE);
-
-    if (len != HEADER_SIZE) {
-        return false;   // can't read enough
-    }
-    if (memcmp(buffer, gHeader, HEADER_SIZE)) {
-        return false;
-    }
-    return true;
-}
-
-
-static SkImageDecoder* sk_libjpeg_dfactory(SkStreamRewindable* stream) {
-    if (is_jpeg(stream)) {
-        return SkNEW(SkJPEGImageDecoder);
-    }
-    return NULL;
-}
-
-static SkImageDecoder::Format get_format_jpeg(SkStreamRewindable* stream) {
-    if (is_jpeg(stream)) {
-        return SkImageDecoder::kJPEG_Format;
-    }
-    return SkImageDecoder::kUnknown_Format;
-}
-
-static SkImageEncoder* sk_libjpeg_efactory(SkImageEncoder::Type t) {
+SkImageEncoder* SkCreateJPEGImageEncoder(SkImageEncoder::Type t) {
     return (SkImageEncoder::kJPEG_Type == t) ? SkNEW(SkJPEGImageEncoder) : NULL;
 }
-
-static SkImageDecoder_DecodeReg gDReg(sk_libjpeg_dfactory);
-static SkImageDecoder_FormatReg gFormatReg(get_format_jpeg);
-static SkImageEncoder_EncodeReg gEReg(sk_libjpeg_efactory);