diff options
| author |  herb <herb@google.com> | 2016-05-27 10:57:58 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-05-27 10:57:58 -0700 |
| commit | ca1ec03c5c8db26e07a931415e9592d8e1966da0 (patch) | |
| tree | 74bb473018d0d49859147bd19ce9d59e7cd38348 | |
| parent | 785a5b941a4d74a1f272729fe8dca55c6eda6bb8 (diff) | |
Move forceSRGB to SkCommonFlags.
This fixes a duplicate symbol problem with the iOS build.
Add common forceSRGB flag.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2019073002
Review-Url: https://codereview.chromium.org/2019073002
| -rw-r--r-- | bench/nanobench.cpp | 2 | ||||
| -rw-r--r-- | dm/DM.cpp | 1 | ||||
| -rw-r--r-- | tools/flags/SkCommonFlags.cpp | 2 | ||||
| -rw-r--r-- | tools/flags/SkCommonFlags.h | 1 |
4 files changed, 3 insertions, 3 deletions
diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp index 6af54d830f..55ef34e79d 100644 --- a/bench/nanobench.cpp +++ b/bench/nanobench.cpp @@ -123,8 +123,6 @@ DEFINE_string(sourceType, "", DEFINE_string(benchType, "", "Apply usual --match rules to bench type: micro, recording, playback, skcodec, etc."); -DEFINE_bool(forceSRGB, false, "Force SRGB for imageinfos"); - static double now_ms() { return SkTime::GetNSecs() * 1e-6; } static SkString humanize(double ms) { @@ -71,7 +71,6 @@ DEFINE_string(uninterestingHashesFile, "", DEFINE_int32(shards, 1, "We're splitting source data into this many shards."); DEFINE_int32(shard, 0, "Which shard do I run?"); DEFINE_bool(simpleCodec, false, "Only decode images to native scale"); -DEFINE_bool(forceSRGB, false, "Force SRGB for imageinfos"); using namespace DM; using sk_gpu_test::GrContextFactory; diff --git a/tools/flags/SkCommonFlags.cpp b/tools/flags/SkCommonFlags.cpp index 1caffd54d6..3da5efebc5 100644 --- a/tools/flags/SkCommonFlags.cpp +++ b/tools/flags/SkCommonFlags.cpp @@ -13,6 +13,8 @@ DEFINE_bool(cpu, true, "master switch for running CPU-bound work."); DEFINE_bool(dryRun, false, "just print the tests that would be run, without actually running them."); +DEFINE_bool(forceSRGB, false, "Force SRGB for imageinfos"); + DEFINE_bool(gpu, true, "master switch for running GPU-bound work."); DEFINE_string(images, "", "List of images and/or directories to decode. A directory with no images" diff --git a/tools/flags/SkCommonFlags.h b/tools/flags/SkCommonFlags.h index ddd0fc89e0..b7eaca4eba 100644 --- a/tools/flags/SkCommonFlags.h +++ b/tools/flags/SkCommonFlags.h @@ -14,6 +14,7 @@ DECLARE_bool(cpu); DECLARE_bool(dryRun); +DECLARE_bool(forceSRGB); DECLARE_bool(gpu); DECLARE_string(images); DECLARE_string(colorImages); |