include/core/SkScalar.h - Issue 85463005: remove SkFloatToScalar macro

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/SkScalar.h

Issue 85463005: remove SkFloatToScalar macro (Closed) Base URL: https://skia.googlecode.com/svn/trunk

Patch Set: add flag to expose SkFloatToScalar to chromium Created 7 years, 1 month 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/SkScalar.h

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

index 2dd7a6283f1122f2627176db46c227ee0b138767..cc1cf99ac80ad16c2832c7e2406b899e1215a51d 100644

--- a/include/core/SkScalar.h

+++ b/include/core/SkScalar.h

@@ -78,7 +78,9 @@

#define SkScalarToFixed(x) SkFloatToFixed(x)

#define SkScalarToFloat(n) (n)

+#ifndef SK_SCALAR_TO_FLOAT_EXCLUDED

#define SkFloatToScalar(n) (n)

+#endif

#define SkScalarToDouble(n) (double)(n)

#define SkDoubleToScalar(n) (float)(n)

@@ -198,7 +200,9 @@

#define SkFixedToScalar(x) (x)

#define SkScalarToFixed(x) (x)

#define SkScalarToFloat(n) SkFixedToFloat(n)

+#ifndef SK_SCALAR_TO_FLOAT_EXCLUDED

#define SkFloatToScalar(n) SkFloatToFixed(n)

+#endif

#define SkScalarToDouble(n) SkFixedToDouble(n)

#define SkDoubleToScalar(n) SkDoubleToFixed(n)

« no previous file with comments | « include/core/SkDocument.h ('k') | samplecode/ClockFaceView.cpp » ('j') | no next file with comments »