Remove image decoder and encoder autoregistration

src/images/SkImageDecoder_libpng.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.h"
-#include "SkImageEncoder.h"
+#include "SkImageDecoder_libpng.h"
+
 #include "SkColor.h"
 #include "SkColorPriv.h"
 #include "SkDither.h"
 #include "SkMath.h"
 #include "SkRTConf.h"
 #include "SkScaledBitmapSampler.h"
 #include "SkStream.h"
 #include "SkTemplates.h"
 #include "SkUtils.h"
 #include "transform_scanline.h"
@@ skipping 46 matching lines @@
             png_destroy_read_struct(&fPng_ptr, &fInfo_ptr, png_infopp_NULL);
         }
     }
 
     SkAutoTUnref<SkStreamRewindable>    fStream;
     png_structp                         fPng_ptr;
     png_infop                           fInfo_ptr;
     SkColorType                         fColorType;
 };
 
+

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

Why the extra line?

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

Done.

 class SkPNGImageDecoder : public SkImageDecoder {
 public:
     SkPNGImageDecoder() {
         fImageIndex = NULL;
     }
     virtual Format getFormat() const SK_OVERRIDE {
         return kPNG_Format;
     }
 
     virtual ~SkPNGImageDecoder() {
@@ skipping 1002 matching lines @@
     // these (remaining) entries are opaque
     for (i = num_trans; i < ctCount; i++) {
         SkPMColor c = *colors++;
         palette[i].red = SkGetPackedR32(c);
         palette[i].green = SkGetPackedG32(c);
         palette[i].blue = SkGetPackedB32(c);
     }
     return num_trans;
 }
 
+SkImageDecoder::Format SkDetectFormatPNGImageDecoder(SkStreamRewindable* stream) {
+    char buf[PNG_BYTES_TO_CHECK];
+    if (stream->read(buf, PNG_BYTES_TO_CHECK) == PNG_BYTES_TO_CHECK &&
+        !png_sig_cmp((png_bytep) buf, (png_size_t)0, PNG_BYTES_TO_CHECK)) {

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

nit: move brace to next line.

(Again, easier to follow if you hadn't moved the functions.)

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

Done. (Reverted the reordering.)

+        return SkImageDecoder::kPNG_Format;
+    }
+    return SkImageDecoder::kUnknown_Format;
+}
+
+SkImageDecoder* SkCreatePNGImageDecoder(SkStreamRewindable* stream) {
+    if (SkDetectFormatPNGImageDecoder(stream) == SkImageDecoder::kPNG_Format) {
+        return SkNEW(SkPNGImageDecoder);
+    }
+    return NULL;
+}
+
 class SkPNGImageEncoder : public SkImageEncoder {
 protected:
     virtual bool onEncode(SkWStream* stream, const SkBitmap& bm, int quality) SK_OVERRIDE;
 private:
     bool doEncode(SkWStream* stream, const SkBitmap& bm,
                   const bool& hasAlpha, int colorType,
                   int bitDepth, SkColorType ct,
                   png_color_8& sig_bit);
 
     typedef SkImageEncoder INHERITED;
@@ skipping 133 matching lines @@
         srcImage += bitmap.rowBytes();
     }
 
     png_write_end(png_ptr, info_ptr);
 
     /* clean up after the write, and free any memory allocated */
     png_destroy_write_struct(&png_ptr, &info_ptr);
     return true;
 }
 
-///////////////////////////////////////////////////////////////////////////////
-DEFINE_DECODER_CREATOR(PNGImageDecoder);
-DEFINE_ENCODER_CREATOR(PNGImageEncoder);
-///////////////////////////////////////////////////////////////////////////////
-
-static bool is_png(SkStreamRewindable* stream) {
-    char buf[PNG_BYTES_TO_CHECK];
-    if (stream->read(buf, PNG_BYTES_TO_CHECK) == PNG_BYTES_TO_CHECK &&
-        !png_sig_cmp((png_bytep) buf, (png_size_t)0, PNG_BYTES_TO_CHECK)) {
-        return true;
-    }
-    return false;
-}
-
-SkImageDecoder* sk_libpng_dfactory(SkStreamRewindable* stream) {
-    if (is_png(stream)) {
-        return SkNEW(SkPNGImageDecoder);
-    }
-    return NULL;
-}
-
-static SkImageDecoder::Format get_format_png(SkStreamRewindable* stream) {
-    if (is_png(stream)) {
-        return SkImageDecoder::kPNG_Format;
-    }
-    return SkImageDecoder::kUnknown_Format;
-}
-
-SkImageEncoder* sk_libpng_efactory(SkImageEncoder::Type t) {
+SkImageEncoder* SkCreatePNGImageEncoder(SkImageEncoder::Type t) {
     return (SkImageEncoder::kPNG_Type == t) ? SkNEW(SkPNGImageEncoder) : NULL;
 }
 
-static SkImageDecoder_DecodeReg gDReg(sk_libpng_dfactory);
-static SkImageDecoder_FormatReg gFormatReg(get_format_png);
-static SkImageEncoder_EncodeReg gEReg(sk_libpng_efactory);