aboutsummaryrefslogtreecommitdiffhomepage
path: root/bench/DashBench.cpp
diff options
context:
space:
mode:
authorGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-04-22 20:26:44 +0000
committerGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-04-22 20:26:44 +0000
commit5d7ca957edcc57f7f0be2741183e8d3c36cb5129 (patch)
tree0411b94219a31ef184fb78d303049997fa879482 /bench/DashBench.cpp
parentea774d2a5a049bf89474c0f047ed6a4e521de126 (diff)
Fix gyp files to allow ninja to build 64 bit on Mac.
Fix warnings that cropped up building as 64-bit. BUG= R=bsalomon@google.com, bungeman@google.com Author: mtklein@google.com Review URL: https://chromiumcodereview.appspot.com/13852013 git-svn-id: http://skia.googlecode.com/svn/trunk@8814 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'bench/DashBench.cpp')
-rw-r--r--bench/DashBench.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/bench/DashBench.cpp b/bench/DashBench.cpp
index 3853a20488..5d320a2822 100644
--- a/bench/DashBench.cpp
+++ b/bench/DashBench.cpp
@@ -323,12 +323,13 @@ public:
enum LineType {
kHori_LineType,
kVert_LineType,
- kDiag_LineType
+ kDiag_LineType,
+ kLineTypeCount
};
static const char* LineTypeName(LineType lt) {
static const char* gNames[] = { "hori", "vert", "diag" };
- SkASSERT((size_t)lt <= SK_ARRAY_COUNT(gNames));
+ SK_COMPILE_ASSERT(kLineTypeCount == SK_ARRAY_COUNT(gNames), names_wrong_size);
return gNames[lt];
}
@@ -356,6 +357,9 @@ public:
case kDiag_LineType:
matrix.setRotate(45, cx, cy);
break;
+ case kLineTypeCount:
+ // Not a real enum value.
+ break;
}
const SkScalar overshoot = 100*1000;