From 4b413c8bb123e42ca4b9c7bfa6bc2167283cb84c Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Mon, 25 Nov 2013 19:44:07 +0000 Subject: remove SkFloatToScalar macro BUG= R=reed@google.com, djsollen@google.com Author: caryclark@google.com Review URL: https://codereview.chromium.org/85463005 git-svn-id: http://skia.googlecode.com/svn/trunk@12385 2bbb7eff-a529-9590-31e7-b0007b416f81 --- samplecode/TransitionView.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'samplecode/TransitionView.cpp') diff --git a/samplecode/TransitionView.cpp b/samplecode/TransitionView.cpp index d18585414c..3a37172516 100644 --- a/samplecode/TransitionView.cpp +++ b/samplecode/TransitionView.cpp @@ -158,8 +158,8 @@ protected: fEnd[kPrevX] = -lr; fEnd[kPrevY] = -ud; fEnd[kNextX] = fEnd[kNextY] = 0; - SkScalar blend[] = { SkFloatToScalar(0.8f), SkFloatToScalar(0.0f), - SkFloatToScalar(0.0f), SK_Scalar1 }; + SkScalar blend[] = { 0.8f, 0.0f, + 0.0f, SK_Scalar1 }; fInterp.setKeyFrame(0, SkTime::GetMSecs(), fBegin, blend); fInterp.setKeyFrame(1, SkTime::GetMSecs()+kDurationMS, fEnd, blend); } -- cgit v1.2.3