Index: include/core/SkImageDecoder.h |
diff --git a/include/core/SkImageDecoder.h b/include/core/SkImageDecoder.h |
index b384708d305b0db259b899e9185b26e729504a03..38090e13e862a0cc06e07a5c3d1c21e104ab663e 100644 |
--- a/include/core/SkImageDecoder.h |
+++ b/include/core/SkImageDecoder.h |
@@ -484,34 +484,4 @@ public: |
} |
}; |
-// This macro declares a global (i.e., non-class owned) creation entry point |
-// for each decoder (e.g., CreateJPEGImageDecoder) |
-#define DECLARE_DECODER_CREATOR(codec) \ |
- SkImageDecoder *Create ## codec (); |
- |
-// This macro defines the global creation entry point for each decoder. Each |
-// decoder implementation that registers with the decoder factory must call it. |
-#define DEFINE_DECODER_CREATOR(codec) \ |
- SkImageDecoder *Create ## codec () { \ |
- return SkNEW( Sk ## codec ); \ |
- } |
- |
-// All the decoders known by Skia. Note that, depending on the compiler settings, |
-// not all of these will be available |
-DECLARE_DECODER_CREATOR(BMPImageDecoder); |
-DECLARE_DECODER_CREATOR(GIFImageDecoder); |
-DECLARE_DECODER_CREATOR(ICOImageDecoder); |
-DECLARE_DECODER_CREATOR(JPEGImageDecoder); |
-DECLARE_DECODER_CREATOR(PNGImageDecoder); |
-DECLARE_DECODER_CREATOR(WBMPImageDecoder); |
-DECLARE_DECODER_CREATOR(WEBPImageDecoder); |
-DECLARE_DECODER_CREATOR(PKMImageDecoder); |
-DECLARE_DECODER_CREATOR(KTXImageDecoder); |
-DECLARE_DECODER_CREATOR(ASTCImageDecoder); |
- |
-// Typedefs to make registering decoder and formatter callbacks easier. |
-// These have to be defined outside SkImageDecoder. :( |
-typedef SkTRegistry<SkImageDecoder*(*)(SkStreamRewindable*)> SkImageDecoder_DecodeReg; |
-typedef SkTRegistry<SkImageDecoder::Format(*)(SkStreamRewindable*)> SkImageDecoder_FormatReg; |
- |
#endif |