Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(391)

Side by Side Diff: src/images/SkForceLinking.cpp

Issue 373383003: ios fixes (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: only build gyp on ios Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « src/core/SkPoint.cpp ('k') | src/ports/SkImageDecoder_CG.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2013 Google Inc. 2 * Copyright 2013 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "SkForceLinking.h" 8 #include "SkForceLinking.h"
9 #include "SkImageDecoder.h" 9 #include "SkImageDecoder.h"
10 10
(...skipping 11 matching lines...) Expand all
22 CreateKTXImageDecoder(); 22 CreateKTXImageDecoder();
23 CreateWBMPImageDecoder(); 23 CreateWBMPImageDecoder();
24 // Only link GIF and PNG on platforms that build them. See images.gyp 24 // Only link GIF and PNG on platforms that build them. See images.gyp
25 #if !defined(SK_BUILD_FOR_MAC) && !defined(SK_BUILD_FOR_WIN) && !defined(SK_BUIL D_FOR_NACL) \ 25 #if !defined(SK_BUILD_FOR_MAC) && !defined(SK_BUILD_FOR_WIN) && !defined(SK_BUIL D_FOR_NACL) \
26 && !defined(SK_BUILD_FOR_IOS) 26 && !defined(SK_BUILD_FOR_IOS)
27 CreateGIFImageDecoder(); 27 CreateGIFImageDecoder();
28 #endif 28 #endif
29 #if !defined(SK_BUILD_FOR_MAC) && !defined(SK_BUILD_FOR_WIN) && !defined(SK_BUIL D_FOR_IOS) 29 #if !defined(SK_BUILD_FOR_MAC) && !defined(SK_BUILD_FOR_WIN) && !defined(SK_BUIL D_FOR_IOS)
30 CreatePNGImageDecoder(); 30 CreatePNGImageDecoder();
31 #endif 31 #endif
32 #if defined(SK_BUILD_FOR_IOS)
33 CreatePNGImageEncoder_IOS();
34 #endif
32 return -1; 35 return -1;
33 } 36 }
34 return 0; 37 return 0;
35 } 38 }
OLDNEW
« no previous file with comments | « src/core/SkPoint.cpp ('k') | src/ports/SkImageDecoder_CG.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698