AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Build fix attempt number 2.

Browse Source 
Review URL: https://codereview.chromium.org/14646025

git-svn-id: http://skia.googlecode.com/svn/trunk@8943 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
scroggo@google.com 2013-05-01 21:40:58 +00:00
parent 1be4ec9f4f
commit 8244998dd3
1 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/images/SkImageDecoder.cpp
View File

@ -340,28 +340,26 @@ bool SkImageDecoder::DecodeStream(SkStream* stream, SkBitmap* bm,
return success;
}
namespace {
/**
* 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
/**
* 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();
CreateGIFImageDecoder();
#endif
#if !defined(SK_BUILD_FOR_MAC) && !defined(SK_BUILD_FOR_WIN)
CreatePNGImageDecoder();
CreatePNGImageDecoder();
#endif
}
}