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

Side by Side Diff: gm/gmmain.cpp

Issue 17408002: remove double including of libpng decoder (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: add force linking to gm Created 7 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | gyp/images.gyp » ('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 2011 Google Inc. 2 * Copyright 2011 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 /* 8 /*
9 * Code for the "gm" (Golden Master) rendering comparison tool. 9 * Code for the "gm" (Golden Master) rendering comparison tool.
10 * 10 *
11 * If you make changes to this, re-run the self-tests at gm/tests/run.sh 11 * If you make changes to this, re-run the self-tests at gm/tests/run.sh
12 * to make sure they still pass... you may need to change the expected 12 * to make sure they still pass... you may need to change the expected
13 * results of the self-test. 13 * results of the self-test.
14 */ 14 */
15 15
16 #include "gm.h" 16 #include "gm.h"
17 #include "gm_error.h" 17 #include "gm_error.h"
18 #include "gm_expectations.h" 18 #include "gm_expectations.h"
19 #include "system_preferences.h" 19 #include "system_preferences.h"
20 #include "SkBitmap.h" 20 #include "SkBitmap.h"
21 #include "SkColorPriv.h" 21 #include "SkColorPriv.h"
22 #include "SkCommandLineFlags.h" 22 #include "SkCommandLineFlags.h"
23 #include "SkData.h" 23 #include "SkData.h"
24 #include "SkDeferredCanvas.h" 24 #include "SkDeferredCanvas.h"
25 #include "SkDevice.h" 25 #include "SkDevice.h"
26 #include "SkDrawFilter.h" 26 #include "SkDrawFilter.h"
27 #include "SkForceLinking.h"
27 #include "SkGPipe.h" 28 #include "SkGPipe.h"
28 #include "SkGraphics.h" 29 #include "SkGraphics.h"
29 #include "SkImageDecoder.h" 30 #include "SkImageDecoder.h"
30 #include "SkImageEncoder.h" 31 #include "SkImageEncoder.h"
31 #include "SkOSFile.h" 32 #include "SkOSFile.h"
32 #include "SkPicture.h" 33 #include "SkPicture.h"
33 #include "SkRefCnt.h" 34 #include "SkRefCnt.h"
34 #include "SkStream.h" 35 #include "SkStream.h"
35 #include "SkTArray.h" 36 #include "SkTArray.h"
36 #include "SkTDict.h" 37 #include "SkTDict.h"
37 #include "SkTileGridPicture.h" 38 #include "SkTileGridPicture.h"
38 #include "SamplePipeControllers.h" 39 #include "SamplePipeControllers.h"
39 40
41 __SK_FORCE_IMAGE_DECODER_LINKING;
42
40 #ifdef SK_BUILD_FOR_WIN 43 #ifdef SK_BUILD_FOR_WIN
41 // json includes xlocale which generates warning 4530 because we're compilin g without 44 // json includes xlocale which generates warning 4530 because we're compilin g without
42 // exceptions; see https://code.google.com/p/skia/issues/detail?id=1067 45 // exceptions; see https://code.google.com/p/skia/issues/detail?id=1067
43 #pragma warning(push) 46 #pragma warning(push)
44 #pragma warning(disable : 4530) 47 #pragma warning(disable : 4530)
45 #endif 48 #endif
46 #include "json/value.h" 49 #include "json/value.h"
47 #ifdef SK_BUILD_FOR_WIN 50 #ifdef SK_BUILD_FOR_WIN
48 #pragma warning(pop) 51 #pragma warning(pop)
49 #endif 52 #endif
(...skipping 2037 matching lines...) Expand 10 before | Expand all | Expand 10 after
2087 if (FLAGS_forceBWtext) { 2090 if (FLAGS_forceBWtext) {
2088 canvas->setDrawFilter(SkNEW(BWTextDrawFilter))->unref(); 2091 canvas->setDrawFilter(SkNEW(BWTextDrawFilter))->unref();
2089 } 2092 }
2090 } 2093 }
2091 2094
2092 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL) 2095 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL)
2093 int main(int argc, char * const argv[]) { 2096 int main(int argc, char * const argv[]) {
2094 return tool_main(argc, (char**) argv); 2097 return tool_main(argc, (char**) argv);
2095 } 2098 }
2096 #endif 2099 #endif
OLDNEW
« no previous file with comments | « no previous file | gyp/images.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698