diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-17 16:44:46 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-17 16:44:46 +0000 |
| commit | 8f4d2306fa866a26f9448048ff63f692b2ba43aa (patch) | |
| tree | 7a48d817cb5220f87e81781320b002eead2495a0 /src/core/SkScan.h | |
| parent | a34b638b909f58dd7c66546a0f49923112f7f785 (diff) | |
remove SK_SCALAR_IS_[FLOAT,FIXED] and assume floats
To keep the CL (slightly) managable, this does not make any changes to
existing macros (e.g. SkScalarMul). Just tackling #ifdef constructs this
time around.
BUG=
R=bsalomon@google.com, caryclark@google.com
Review URL: https://codereview.chromium.org/117053002
git-svn-id: http://skia.googlecode.com/svn/trunk@12712 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/core/SkScan.h')
| -rw-r--r-- | src/core/SkScan.h | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/src/core/SkScan.h b/src/core/SkScan.h index 5989435d29..0780e332a3 100644 --- a/src/core/SkScan.h +++ b/src/core/SkScan.h @@ -31,19 +31,8 @@ public: static void FillIRect(const SkIRect&, const SkRasterClip&, SkBlitter*); static void FillXRect(const SkXRect&, const SkRasterClip&, SkBlitter*); -#ifdef SK_SCALAR_IS_FIXED - static void FillRect(const SkRect& rect, const SkRasterClip& clip, - SkBlitter* blitter) { - SkScan::FillXRect(*(const SkXRect*)&rect, clip, blitter); - } - static void AntiFillRect(const SkRect& rect, const SkRasterClip& clip, - SkBlitter* blitter) { - SkScan::AntiFillXRect(*(const SkXRect*)&rect, clip, blitter); - } -#else static void FillRect(const SkRect&, const SkRasterClip&, SkBlitter*); static void AntiFillRect(const SkRect&, const SkRasterClip&, SkBlitter*); -#endif static void AntiFillXRect(const SkXRect&, const SkRasterClip&, SkBlitter*); static void FillPath(const SkPath&, const SkRasterClip&, SkBlitter*); static void AntiFillPath(const SkPath&, const SkRasterClip&, SkBlitter*); @@ -67,19 +56,8 @@ private: static void FillIRect(const SkIRect&, const SkRegion* clip, SkBlitter*); static void FillXRect(const SkXRect&, const SkRegion* clip, SkBlitter*); -#ifdef SK_SCALAR_IS_FIXED - static void FillRect(const SkRect& rect, const SkRegion* clip, - SkBlitter* blitter) { - SkScan::FillXRect(*(const SkXRect*)&rect, clip, blitter); - } - static void AntiFillRect(const SkRect& rect, const SkRegion* clip, - SkBlitter* blitter) { - SkScan::AntiFillXRect(*(const SkXRect*)&rect, clip, blitter); - } -#else static void FillRect(const SkRect&, const SkRegion* clip, SkBlitter*); static void AntiFillRect(const SkRect&, const SkRegion* clip, SkBlitter*); -#endif static void AntiFillXRect(const SkXRect&, const SkRegion*, SkBlitter*); static void FillPath(const SkPath&, const SkRegion& clip, SkBlitter*); static void AntiFillPath(const SkPath&, const SkRegion& clip, SkBlitter*, |