Index: src/images/SkImageDecoder_ktx.cpp |
diff --git a/src/images/SkImageDecoder_ktx.cpp b/src/images/SkImageDecoder_ktx.cpp |
index a852904cd6849c596e0bfdff40a7bd033b5a3b7c..23226e0ab3604e35d081c78fbb4038e6e9de90c4 100644 |
--- a/src/images/SkImageDecoder_ktx.cpp |
+++ b/src/images/SkImageDecoder_ktx.cpp |
@@ -4,10 +4,9 @@ |
* 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" |
@@ -244,6 +243,19 @@ bool SkKTXImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) { |
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 |
@@ -309,30 +321,6 @@ 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; |
-} |
- |
-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; |
+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_DecodeReg gReg(sk_libktx_dfactory); |
-static SkImageDecoder_FormatReg gFormatReg(get_format_ktx); |
-static SkImageEncoder_EncodeReg gEReg(sk_libktx_efactory); |