aboutsummaryrefslogtreecommitdiffhomepage
path: root/samplecode/SampleColorFilter.cpp
diff options
context:
space:
mode:
authorGravatar humper@google.com <humper@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-01-07 19:54:40 +0000
committerGravatar humper@google.com <humper@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-01-07 19:54:40 +0000
commit0e51577a14f903ffeafa117a75954baeb173ffb9 (patch)
tree3f3d849f3b6ec7778660f0da19f5d4175ba9f800 /samplecode/SampleColorFilter.cpp
parentaf2bd7bdf593b3fc91bb1acffcc4a51bdb2f29ec (diff)
fix warning from scalar --> int32 conversion
BUG= Review URL: https://codereview.appspot.com/7065050 git-svn-id: http://skia.googlecode.com/svn/trunk@7061 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'samplecode/SampleColorFilter.cpp')
-rw-r--r--samplecode/SampleColorFilter.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/samplecode/SampleColorFilter.cpp b/samplecode/SampleColorFilter.cpp
index e57ccb0d43..393f9b8c4f 100644
--- a/samplecode/SampleColorFilter.cpp
+++ b/samplecode/SampleColorFilter.cpp
@@ -23,6 +23,7 @@ static int trunc5(int x) {
#define SK_R16_BITS 5
+#ifdef SK_DEBUG
static int round5_slow(int x) {
int orig = x & 7;
int fake = x >> 5;
@@ -38,15 +39,17 @@ static int round5_slow(int x) {
}
return trunc + bias;
}
+#endif
static int round5_fast(int x) {
int result = x + 3 - (x >> 5) + (x >> 7);
result >>= 3;
-
+#ifdef SK_DEBUG
{
int r2 = round5_slow(x);
SkASSERT(r2 == result);
}
+#endif
return result;
}