Index: src/images/SkImageDecoder_ktx.cpp |
diff --git a/src/images/SkImageDecoder_ktx.cpp b/src/images/SkImageDecoder_ktx.cpp |
index 8566375f0c7c96597c4b097ad8de518f87f43e7b..22c70cc7f3e893cb12d5ecf0a58ef1d0561407ec 100644 |
--- a/src/images/SkImageDecoder_ktx.cpp |
+++ b/src/images/SkImageDecoder_ktx.cpp |
@@ -4,9 +4,8 @@ |
* 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 "SkPixelRef.h" |
#include "SkScaledBitmapSampler.h" |
#include "SkStream.h" |
@@ -309,29 +308,18 @@ bool SkKTXImageEncoder::encodePKM(SkWStream* stream, const SkData *data) { |
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; |
+SkImageDecoder* SkCreateKTXImageDecoder(SkImageDecoder::Format format) { |
+ SkASSERT(format == SkImageDecoder::kKTX_Format); |
+ return SkNEW(SkKTXImageDecoder); |
} |
-static SkImageDecoder::Format get_format_ktx(SkStreamRewindable* stream) { |
+SkImageDecoder::Format SkDetectFormatKTXImageDecoder(SkStreamRewindable* stream) { |
if (SkKTXFile::is_ktx(stream)) { |
return SkImageDecoder::kKTX_Format; |
} |
return SkImageDecoder::kUnknown_Format; |
} |
-SkImageEncoder* sk_libktx_efactory(SkImageEncoder::Type t) { |
+SkImageEncoder* SkCreateKTXImageEncoder(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); |