src/animator/SkDrawColor.cpp - Issue 117053002: remove SK_SCALAR_IS_[FLOAT,FIXED] and assume floats

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: src/animator/SkDrawColor.cpp

Issue 117053002: remove SK_SCALAR_IS_[FLOAT,FIXED] and assume floats (Closed) Base URL: https://skia.googlecode.com/svn/trunk

Patch Set: Created 7 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: src/animator/SkDrawColor.cpp

diff --git a/src/animator/SkDrawColor.cpp b/src/animator/SkDrawColor.cpp

index b6bc261d718167b56a3ee590f891bc715084612d..00c429b5a1842132fdc48f604155a99b96d40c23 100644

--- a/src/animator/SkDrawColor.cpp

+++ b/src/animator/SkDrawColor.cpp

@@ -226,11 +226,7 @@ bool SkDrawColor::setProperty(int index, SkScriptValue& value) {

switch (index) {

case SK_PROPERTY(alpha):

uint8_t alpha;

- #ifdef SK_SCALAR_IS_FLOAT

alpha = scalar == SK_Scalar1 ? 255 : SkToU8((U8CPU) (scalar * 256));

- #else

- alpha = SkToU8((scalar - (scalar >= SK_ScalarHalf)) >> 8);

- #endif

color = SkColorSetARGB(alpha, SkColorGetR(color),

SkColorGetG(color), SkColorGetB(color));

break;