diff options
| author | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-05-08 13:15:37 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-05-08 13:15:37 +0000 |
| commit | c6ce750c73c6586a5c2e88a0620b04e9569af401 (patch) | |
| tree | bfa313ab7b16bae4898a767524f510218ca71161 /samplecode/TransitionView.cpp | |
| parent | 83edde21f3945f988656c023384bd33e87f8b48d (diff) | |
Fixed some fixed point build Windows compiler complaints
http://codereview.appspot.com/6197063/
git-svn-id: http://skia.googlecode.com/svn/trunk@3867 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'samplecode/TransitionView.cpp')
| -rw-r--r-- | samplecode/TransitionView.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/samplecode/TransitionView.cpp b/samplecode/TransitionView.cpp index 76e18b6a30..5e45e37a20 100644 --- a/samplecode/TransitionView.cpp +++ b/samplecode/TransitionView.cpp @@ -146,7 +146,8 @@ protected: fEnd[kPrevX] = -lr; fEnd[kPrevY] = -ud; fEnd[kNextX] = fEnd[kNextY] = 0; - SkScalar blend[] = {0.8f, 0.0f, 0.0f, 1.0f}; + SkScalar blend[] = { SkFloatToScalar(0.8f), SkFloatToScalar(0.0f), + SkFloatToScalar(0.0f), SK_Scalar1 }; fInterp.setKeyFrame(0, SkTime::GetMSecs(), fBegin, blend); fInterp.setKeyFrame(1, SkTime::GetMSecs()+500, fEnd, blend); } |