Index: src/images/SkImageDecoder_libbmp.cpp |
diff --git a/src/images/SkImageDecoder_libbmp.cpp b/src/images/SkImageDecoder_libbmp.cpp |
index af868e30a72cd41708aefa61a31d4644ea722747..fc1a3de10a0b2d2416063b272abd88021755eb64 100644 |
--- a/src/images/SkImageDecoder_libbmp.cpp |
+++ b/src/images/SkImageDecoder_libbmp.cpp |
@@ -6,14 +6,13 @@ |
* found in the LICENSE file. |
*/ |
- |
-#include "bmpdecoderhelper.h" |
+#include "SkImageDecoder_libbmp.h" |
#include "SkColorPriv.h" |
-#include "SkImageDecoder.h" |
#include "SkScaledBitmapSampler.h" |
#include "SkStream.h" |
#include "SkStreamPriv.h" |
#include "SkTDArray.h" |
+#include "bmpdecoderhelper.h" |
class SkBMPImageDecoder : public SkImageDecoder { |
public: |
@@ -30,37 +29,21 @@ private: |
typedef SkImageDecoder INHERITED; |
}; |
-/////////////////////////////////////////////////////////////////////////////// |
-DEFINE_DECODER_CREATOR(BMPImageDecoder); |
-/////////////////////////////////////////////////////////////////////////////// |
- |
-static bool is_bmp(SkStreamRewindable* stream) { |
+SkImageDecoder::Format SkDetectFormatBMPImageDecoder(SkStreamRewindable* stream) { |
static const char kBmpMagic[] = { 'B', 'M' }; |
- |
- |
char buffer[sizeof(kBmpMagic)]; |
- |
- return stream->read(buffer, sizeof(kBmpMagic)) == sizeof(kBmpMagic) && |
- !memcmp(buffer, kBmpMagic, sizeof(kBmpMagic)); |
-} |
- |
-static SkImageDecoder* sk_libbmp_dfactory(SkStreamRewindable* stream) { |
- if (is_bmp(stream)) { |
- return SkNEW(SkBMPImageDecoder); |
- } |
- return NULL; |
-} |
- |
-static SkImageDecoder_DecodeReg gReg(sk_libbmp_dfactory); |
- |
-static SkImageDecoder::Format get_format_bmp(SkStreamRewindable* stream) { |
- if (is_bmp(stream)) { |
+ if (stream->read(buffer, sizeof(kBmpMagic)) == sizeof(kBmpMagic) && |
+ 0 == memcmp(buffer, kBmpMagic, sizeof(kBmpMagic))) { |
return SkImageDecoder::kBMP_Format; |
} |
return SkImageDecoder::kUnknown_Format; |
} |
-static SkImageDecoder_FormatReg gFormatReg(get_format_bmp); |
+ |
+SkImageDecoder* SkCreateBMPImageDecoder(SkImageDecoder::Format format) { |
+ SkASSERT(SkImageDecoder::kBMP_Format == format); |
+ return SkNEW(SkBMPImageDecoder); |
+} |
/////////////////////////////////////////////////////////////////////////////// |