include/core/SkFixed.h - Issue 1503423003: ubsan shift fixes

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 1503423003: ubsan shift fixes (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Created 5 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 fefa718d0fe7c9c45fb82478eedb0482d0b6ba96..236dde5fe139469319fd6fd1973d532b4c9e286d 100644

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

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

@@ -88,7 +88,7 @@ typedef int32_t SkFixed;

#else

// TODO(reed): this clamp shouldn't be needed. Use SkToS32().

#define SkFixedDiv(numer, denom) \

- SkTPin<int32_t>(((int64_t)numer << 16) / denom, SK_MinS32, SK_MaxS32)

+ SkTPin<int32_t>(((int64_t)numer * (1 << 16)) / denom, SK_MinS32, SK_MaxS32)

reed1 2015/12/08 18:29:03 nit: I think we should comment why we're multiplyi

_cary 2015/12/09 14:33:40 Done (Reworked so there's no more multiply workaro

#endif

//////////////////////////////////////////////////////////////////////////////////////////////////////

@@ -145,9 +145,9 @@ inline SkFixed SkFixedMul_longlong(SkFixed a, SkFixed b) {

typedef int64_t SkFixed3232; // 32.32

-#define SkIntToFixed3232(x) ((SkFixed3232)(x) << 32)

+#define SkIntToFixed3232(x) ((SkFixed3232)(x) * (1L << 32))

reed1 2015/12/08 18:29:03 same nit about commenting

_cary 2015/12/09 14:33:40 Done (Uses inline shift function now instead)

#define SkFixed3232ToInt(x) ((int)((x) >> 32))

-#define SkFixedToFixed3232(x) ((SkFixed3232)(x) << 16)

+#define SkFixedToFixed3232(x) ((SkFixed3232)(x) * (1 << 16))

#define SkFixed3232ToFixed(x) ((SkFixed)((x) >> 16))

#define SkFloatToFixed3232(x) ((SkFixed3232)((x) * (65536.0f * 65536.0f)))

« no previous file with comments | « gyp/libjpeg-turbo.gyp ('k') | src/core/SkBitmapProcState_matrixProcs.cpp » ('j') | no next file with comments »