Remove image decoder and encoder autoregistration

src/images/SkImageDecoder_ktx.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+#include "SkImageDecoder_ktx.h"
 
 #include "SkColorPriv.h"
-#include "SkImageDecoder.h"
-#include "SkImageEncoder.h"
 #include "SkPixelRef.h"
 #include "SkScaledBitmapSampler.h"
 #include "SkStream.h"
 #include "SkStreamPriv.h"
 #include "SkTypes.h"
 
 #include "ktx.h"
 #include "etc1.h"
 
 /////////////////////////////////////////////////////////////////////////////////////////
@@ skipping 216 matching lines @@
             sampler.next(srcRow);
             srcRow += sampler.srcDY() * srcRowBytes;
         }
 
         return true;
     }
 
     return false;
 }
 
+SkImageDecoder::Format SkDetectFormatKTXImageDecoder(SkStreamRewindable* stream) {
+    if (SkKTXFile::is_ktx(stream)) {
+      return SkImageDecoder::kKTX_Format;

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

indent 4 spaces

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

Done.

+    }
+    return SkImageDecoder::kUnknown_Format;
+}
+
+SkImageDecoder* SkCreateKTXImageDecoder(SkStreamRewindable* stream) {
+  if (SkDetectFormatKTXImageDecoder(stream) == SkImageDecoder::kKTX_Format) {

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

Why not call SkKTXFile::is_ktx?

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

Done.

+    return SkNEW(SkKTXImageDecoder);

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

indent 4 spaces.

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

Done.

+  }
+  return NULL;
+}
 ///////////////////////////////////////////////////////////////////////////////
 
 // KTX Image Encoder
 //
 // This encoder takes a best guess at how to encode the bitmap passed to it. If
 // there is an installed discardable pixel ref with existing PKM data, then we
 // will repurpose the existing ETC1 data into a KTX file. If the data contains
 // KTX data, then we simply return a copy of the same data. For all other files,
 // the underlying KTX library tries to do its best to encode the appropriate
 // data specified by the bitmap based on the config. (i.e. kAlpha8_Config will
@@ skipping 45 matching lines @@
     // that our dimensions are valid.
     if (width == 0 || (width & 3) != 0 || height == 0 || (height & 3) != 0) {
         return false;
     }
 
     // Advance pointer to etc1 data.
     bytes += ETC_PKM_HEADER_SIZE;
 
     return SkKTXFile::WriteETC1ToKTX(stream, bytes, width, height);
 }
-
-/////////////////////////////////////////////////////////////////////////////////////////
-DEFINE_DECODER_CREATOR(KTXImageDecoder);
-DEFINE_ENCODER_CREATOR(KTXImageEncoder);
-/////////////////////////////////////////////////////////////////////////////////////////
-
-static SkImageDecoder* sk_libktx_dfactory(SkStreamRewindable* stream) {
-    if (SkKTXFile::is_ktx(stream)) {
-        return SkNEW(SkKTXImageDecoder);
-    }
-    return NULL;
+SkImageEncoder* SkCreateKTXImageEncoder(SkImageEncoder::Type t) {
+  return (SkImageEncoder::kKTX_Type == t) ? SkNEW(SkKTXImageEncoder) : NULL;

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

4 spaces.

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

Done.

 }
-
-static SkImageDecoder::Format get_format_ktx(SkStreamRewindable* stream) {
-    if (SkKTXFile::is_ktx(stream)) {
-        return SkImageDecoder::kKTX_Format;
-    }
-    return SkImageDecoder::kUnknown_Format;
-}
-
-SkImageEncoder* sk_libktx_efactory(SkImageEncoder::Type t) {
-    return (SkImageEncoder::kKTX_Type == t) ? SkNEW(SkKTXImageEncoder) : NULL;
-}
-
-static SkImageDecoder_DecodeReg gReg(sk_libktx_dfactory);
-static SkImageDecoder_FormatReg gFormatReg(get_format_ktx);
-static SkImageEncoder_EncodeReg gEReg(sk_libktx_efactory);