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

Ensure that we don't reference decoders that we don't build

Browse Source 
R=scroggo@google.com, robertphillips@google.com

Author: djsollen@google.com

Review URL: https://codereview.chromium.org/517663002
This commit is contained in:
djsollen 2014-08-28 12:04:41 -07:00 committed by Commit bot
parent e759a26622
commit 748783d18c
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/images/SkForceLinking.cpp
View File

@ -18,10 +18,13 @@ int SkForceLinking(bool doNotPassTrue) {
CreateWEBPImageDecoder();
CreateBMPImageDecoder();
CreateICOImageDecoder();
CreateWBMPImageDecoder();
// Only link hardware texture codecs on platforms that build them. See images.gyp
#ifndef SK_BUILD_FOR_ANDROID_FRAMEWORK
CreatePKMImageDecoder();
CreateKTXImageDecoder();
CreateASTCImageDecoder();
CreateWBMPImageDecoder();
#endif
// 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) \
&& !defined(SK_BUILD_FOR_IOS)