Index: src/images/SkImageDecoder_pkm.cpp |
diff --git a/src/images/SkImageDecoder_pkm.cpp b/src/images/SkImageDecoder_pkm.cpp |
index f5fd4b3fbcad54f7c2327b1c072159a97b0b1a73..4dd9f5ecbf3555f8fc15f195994140de3c412964 100644 |
--- a/src/images/SkImageDecoder_pkm.cpp |
+++ b/src/images/SkImageDecoder_pkm.cpp |
@@ -4,9 +4,9 @@ |
* Use of this source code is governed by a BSD-style license that can be |
* found in the LICENSE file. |
*/ |
+#include "SkImageDecoder_pkm.h" |
#include "SkColorPriv.h" |
-#include "SkImageDecoder.h" |
#include "SkScaledBitmapSampler.h" |
#include "SkStream.h" |
#include "SkStreamPriv.h" |
@@ -102,34 +102,20 @@ bool SkPKMImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) { |
return true; |
} |
-///////////////////////////////////////////////////////////////////////////////////////// |
-DEFINE_DECODER_CREATOR(PKMImageDecoder); |
-///////////////////////////////////////////////////////////////////////////////////////// |
- |
-static bool is_pkm(SkStreamRewindable* stream) { |
- // Read the PKM header and make sure it's valid. |
+SkImageDecoder::Format SkDetectFormatPKMImageDecoder(SkStreamRewindable* stream) { |
unsigned char buf[ETC_PKM_HEADER_SIZE]; |
- if (stream->read((void*)buf, ETC_PKM_HEADER_SIZE) != ETC_PKM_HEADER_SIZE) { |
- return false; |
+ if (stream->read((void*)buf, ETC_PKM_HEADER_SIZE) == ETC_PKM_HEADER_SIZE) { |
+ if (etc1_pkm_is_valid(buf)) { |
scroggo
2014/11/12 18:00:13
nit: why not &&?
Kimmo Kinnunen
2014/11/18 08:29:45
Done.
|
+ return SkImageDecoder::kPKM_Format; |
+ } |
} |
- |
- return SkToBool(etc1_pkm_is_valid(buf)); |
+ return SkImageDecoder::kUnknown_Format; |
} |
-static SkImageDecoder* sk_libpkm_dfactory(SkStreamRewindable* stream) { |
- if (is_pkm(stream)) { |
+SkImageDecoder* SkCreatePKMImageDecoder(SkStreamRewindable* stream) { |
+ if (SkDetectFormatPKMImageDecoder(stream) == SkImageDecoder::kPKM_Format) { |
return SkNEW(SkPKMImageDecoder); |
} |
return NULL; |
} |
-static SkImageDecoder_DecodeReg gReg(sk_libpkm_dfactory); |
- |
-static SkImageDecoder::Format get_format_pkm(SkStreamRewindable* stream) { |
- if (is_pkm(stream)) { |
- return SkImageDecoder::kPKM_Format; |
- } |
- return SkImageDecoder::kUnknown_Format; |
-} |
- |
-static SkImageDecoder_FormatReg gFormatReg(get_format_pkm); |