| Index: src/images/SkImageDecoder.cpp
|
| diff --git a/src/images/SkImageDecoder.cpp b/src/images/SkImageDecoder.cpp
|
| index 52c43c83f17e8616397bb34c5875a6c14f8226f5..5c078ce63015a102370bbd6d435cdd54ce5d57fb 100644
|
| --- a/src/images/SkImageDecoder.cpp
|
| +++ b/src/images/SkImageDecoder.cpp
|
| @@ -450,27 +450,3 @@ bool SkImageDecoder::DecodeStream(SkStream* stream, SkBitmap* bm,
|
| }
|
| return success;
|
| }
|
| -
|
| -/**
|
| - * This function leaks, but that is okay because it is not intended
|
| - * to be called. It is only here so that the linker will include the
|
| - * decoders.
|
| - * Make sure to keep it in sync with images.gyp, so only the encoders
|
| - * which are created on a platform are linked.
|
| - */
|
| -void force_linking();
|
| -void force_linking() {
|
| - SkASSERT(false);
|
| - CreateJPEGImageDecoder();
|
| - CreateWEBPImageDecoder();
|
| - CreateBMPImageDecoder();
|
| - CreateICOImageDecoder();
|
| - CreateWBMPImageDecoder();
|
| - // Only link GIF and PNG on platforms that build them. See images.gyp
|
| -#if !defined(SK_BUILD_FOR_MAC) && !defined(SK_BUILD_FOR_WIN) && !defined(SK_BUILD_FOR_NACL)
|
| - CreateGIFImageDecoder();
|
| -#endif
|
| -#if !defined(SK_BUILD_FOR_MAC) && !defined(SK_BUILD_FOR_WIN)
|
| - CreatePNGImageDecoder();
|
| -#endif
|
| -}
|
|
|