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

Side by Side Diff: tools/skpdiff/skpdiff_main.cpp

Issue 628763005: Fix usage of SK_BUILD_* defines. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 2 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 | « tools/skpdiff/SkCLImageDiffer.h ('k') | tools/skpdiff/skpdiff_util.h » ('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 // TODO(djsollen): Rename this whole package (perhaps to "SkMultiDiffer"). 8 // TODO(djsollen): Rename this whole package (perhaps to "SkMultiDiffer").
9 // It's not just for "pdiff" (perceptual diffs)--it's a harness that allows 9 // It's not just for "pdiff" (perceptual diffs)--it's a harness that allows
10 // the execution of an arbitrary set of difference algorithms. 10 // the execution of an arbitrary set of difference algorithms.
11 // See http://skbug.com/2711 ('rename skpdiff') 11 // See http://skbug.com/2711 ('rename skpdiff')
12 12
13 #if SK_SUPPORT_OPENCL 13 #if SK_SUPPORT_OPENCL
14 14
15 #define __NO_STD_VECTOR // Uses cl::vectpr instead of std::vectpr 15 #define __NO_STD_VECTOR // Uses cl::vectpr instead of std::vectpr
16 #define __NO_STD_STRING // Uses cl::STRING_CLASS instead of std::string 16 #define __NO_STD_STRING // Uses cl::STRING_CLASS instead of std::string
17 #if SK_BUILD_FOR_MAC 17 #if defined(SK_BUILD_FOR_MAC)
18 // Note that some macs don't have this header and it can be downloaded from the Khronos registry 18 // Note that some macs don't have this header and it can be downloaded from the Khronos registry
19 # include <OpenCL/cl.hpp> 19 # include <OpenCL/cl.hpp>
20 #else 20 #else
21 # include <CL/cl.hpp> 21 # include <CL/cl.hpp>
22 #endif 22 #endif
23 23
24 #endif 24 #endif
25 25
26 #include "SkCommandLineFlags.h" 26 #include "SkCommandLineFlags.h"
27 #include "SkGraphics.h" 27 #include "SkGraphics.h"
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 } 257 }
258 258
259 return 0; 259 return 0;
260 } 260 }
261 261
262 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL) 262 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL)
263 int main(int argc, char * argv[]) { 263 int main(int argc, char * argv[]) {
264 return tool_main(argc, (char**) argv); 264 return tool_main(argc, (char**) argv);
265 } 265 }
266 #endif 266 #endif
OLDNEW
« no previous file with comments | « tools/skpdiff/SkCLImageDiffer.h ('k') | tools/skpdiff/skpdiff_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698