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.cpp | |
| 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.cpp')
| -rw-r--r-- | src/core/SkScan.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/core/SkScan.cpp b/src/core/SkScan.cpp index 44968bd9ec..b21dd6bf9c 100644 --- a/src/core/SkScan.cpp +++ b/src/core/SkScan.cpp @@ -53,8 +53,6 @@ void SkScan::FillXRect(const SkXRect& xr, const SkRegion* clip, SkScan::FillIRect(r, clip, blitter); } -#ifdef SK_SCALAR_IS_FLOAT - void SkScan::FillRect(const SkRect& r, const SkRegion* clip, SkBlitter* blitter) { SkIRect ir; @@ -63,8 +61,6 @@ void SkScan::FillRect(const SkRect& r, const SkRegion* clip, SkScan::FillIRect(ir, clip, blitter); } -#endif - /////////////////////////////////////////////////////////////////////////////// void SkScan::FillIRect(const SkIRect& r, const SkRasterClip& clip, @@ -97,8 +93,6 @@ void SkScan::FillXRect(const SkXRect& xr, const SkRasterClip& clip, FillXRect(xr, &wrapper.getRgn(), wrapper.getBlitter()); } -#ifdef SK_SCALAR_IS_FLOAT - void SkScan::FillRect(const SkRect& r, const SkRasterClip& clip, SkBlitter* blitter) { if (clip.isEmpty() || r.isEmpty()) { @@ -113,5 +107,3 @@ void SkScan::FillRect(const SkRect& r, const SkRasterClip& clip, SkAAClipBlitterWrapper wrapper(clip, blitter); FillRect(r, &wrapper.getRgn(), wrapper.getBlitter()); } - -#endif |