Index: src/images/SkImageDecoder_FactoryRegistrar.cpp |
diff --git a/src/images/SkImageDecoder_FactoryRegistrar.cpp b/src/images/SkImageDecoder_FactoryRegistrar.cpp |
index f1eca3d03afb3b0a1297a4bb262d81c0575fd456..f8818865a424d4159ac54b4311a7b358212f0a12 100644 |
--- a/src/images/SkImageDecoder_FactoryRegistrar.cpp |
+++ b/src/images/SkImageDecoder_FactoryRegistrar.cpp |
@@ -14,11 +14,11 @@ |
// for checking all the the registered SkImageDecoders for one that matches an |
// input SkStream. |
-typedef SkTRegistry<SkImageDecoder*, SkStream*> DecodeReg; |
+typedef SkTRegistry<SkImageDecoder*(*)(SkStream*)> DecodeReg; |
// N.B. You can't use "DecodeReg::gHead here" due to complex C++ |
// corner cases. |
-template DecodeReg* SkTRegistry<SkImageDecoder*, SkStream*>::gHead; |
+template DecodeReg* SkTRegistry<SkImageDecoder*(*)(SkStream*)>::gHead; |
SkImageDecoder* image_decoder_from_stream(SkStream*); |
@@ -26,7 +26,7 @@ SkImageDecoder* image_decoder_from_stream(SkStream* stream) { |
SkImageDecoder* codec = NULL; |
const DecodeReg* curr = DecodeReg::Head(); |
while (curr) { |
- codec = curr->factory()(stream); |
+ codec = curr->data()(stream); |
// we rewind here, because we promise later when we call "decode", that |
// the stream will be at its beginning. |
bool rewindSuceeded = stream->rewind(); |
@@ -47,14 +47,14 @@ SkImageDecoder* image_decoder_from_stream(SkStream* stream) { |
return NULL; |
} |
-typedef SkTRegistry<SkImageDecoder::Format, SkStream*> FormatReg; |
+typedef SkTRegistry<SkImageDecoder::Format(*)(SkStream*)> FormatReg; |
-template FormatReg* SkTRegistry<SkImageDecoder::Format, SkStream*>::gHead; |
+template FormatReg* SkTRegistry<SkImageDecoder::Format(*)(SkStream*)>::gHead; |
SkImageDecoder::Format SkImageDecoder::GetStreamFormat(SkStream* stream) { |
const FormatReg* curr = FormatReg::Head(); |
while (curr != NULL) { |
- Format format = curr->factory()(stream); |
+ Format format = curr->data()(stream); |
if (!stream->rewind()) { |
SkErrorInternals::SetError(kInvalidOperation_SkError, |
"Unable to rewind the image stream\n"); |