Remove image decoder and encoder autoregistration

src/images/SkImageDecoder_libico.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_libico.h"
+
 #include "SkColorPriv.h"
 #include "SkImageDecoder.h"
 #include "SkStream.h"
 #include "SkStreamPriv.h"
 #include "SkTypes.h"
 
 class SkICOImageDecoder : public SkImageDecoder {
 public:
     SkICOImageDecoder();
 
     virtual Format getFormat() const SK_OVERRIDE {
         return kICO_Format;
     }
 
 protected:
     virtual bool onDecode(SkStream* stream, SkBitmap* bm, Mode) SK_OVERRIDE;
 
 private:
     typedef SkImageDecoder INHERITED;
 };
-

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

Why the delete?

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

Done.

 /////////////////////////////////////////////////////////////////////////////////////////
 
 //read bytes starting from the begin-th index in the buffer
 //read in Intel order, and return an integer
 
 #define readByte(buffer,begin) buffer[begin]
 #define read2Bytes(buffer,begin) buffer[begin]+(buffer[begin+1]<<8)
 #define read4Bytes(buffer,begin) buffer[begin]+(buffer[begin+1]<<8)+(buffer[begin+2]<<16)+(buffer[begin+3]<<24)
 
 /////////////////////////////////////////////////////////////////////////////////////////
@@ skipping 343 matching lines @@
     int green = readByte(buf, xorOffset + 4*pixelNo + 1);
     int red = readByte(buf, xorOffset + 4*pixelNo + 2);
     int alphaBit = (alphaByte & m) >> shift;
 #if 1 // don't trust the alphaBit for 32bit images <mrr>
     alphaBit = 0;
 #endif
     int alpha = readByte(buf, xorOffset + 4*pixelNo + 3) & ((alphaBit-1)&0xFF);
     *address = SkPreMultiplyARGB(alpha, red, green, blue);
 }
 
-///////////////////////////////////////////////////////////////////////////////
-DEFINE_DECODER_CREATOR(ICOImageDecoder);
-/////////////////////////////////////////////////////////////////////////////////////////
-
-static bool is_ico(SkStreamRewindable* stream) {
+SkImageDecoder::Format SkDetectFormatICOImageDecoder(SkStreamRewindable* stream) {
     // Check to see if the first four bytes are 0,0,1,0
     // FIXME: Is that required and sufficient?
     SkAutoMalloc autoMal(4);
     unsigned char* buf = (unsigned char*)autoMal.get();
     stream->read((void*)buf, 4);
     int reserved = read2Bytes(buf, 0);
     int type = read2Bytes(buf, 2);
     if (reserved != 0 || type != 1) {
         // This stream does not represent an ICO image.
-        return false;
+        return SkImageDecoder::kUnknown_Format;
     }
-    return true;
+    return SkImageDecoder::kICO_Format;
 }
 
-static SkImageDecoder* sk_libico_dfactory(SkStreamRewindable* stream) {
-    if (is_ico(stream)) {
+SkImageDecoder* SkCreateICOImageDecoder(SkStreamRewindable* stream) {
+    if (SkDetectFormatICOImageDecoder(stream) == SkImageDecoder::kICO_Format) {
         return SkNEW(SkICOImageDecoder);
     }
     return NULL;
 }
 
-static SkImageDecoder_DecodeReg gReg(sk_libico_dfactory);
-
-static SkImageDecoder::Format get_format_ico(SkStreamRewindable* stream) {
-    if (is_ico(stream)) {
-        return SkImageDecoder::kICO_Format;
-    }
-    return SkImageDecoder::kUnknown_Format;
-}
-
-static SkImageDecoder_FormatReg gFormatReg(get_format_ico);