include/core/SkFixed.h - 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: include/core/SkFixed.h

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: include/core/SkFixed.h

diff --git a/include/core/SkFixed.h b/include/core/SkFixed.h

index 95a32a43b184e86164ce492132d1220dcfc198b4..ea5e44c39388f1b6b29f972080a9424a253d8a2d 100644

--- a/include/core/SkFixed.h

+++ b/include/core/SkFixed.h

@@ -282,10 +282,6 @@ typedef int64_t SkFixed48;

#define SkFixed48ToFixed(x) ((SkFixed)((x) >> 32))

#define SkFloatToFixed48(x) ((SkFixed48)((x) * (65536.0f * 65536.0f * 65536.0f)))

-#ifdef SK_SCALAR_IS_FLOAT

- #define SkScalarToFixed48(x) SkFloatToFixed48(x)

-#else

- #define SkScalarToFixed48(x) SkFixedToFixed48(x)

-#endif

+#define SkScalarToFixed48(x) SkFloatToFixed48(x)

#endif