diff options
| author |  mike@reedtribe.org <mike@reedtribe.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-01-06 03:02:37 +0000 |
|---|---|---|
| committer | mike@reedtribe.org <mike@reedtribe.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-01-06 03:02:37 +0000 |
| commit | 9fb00413ec55deb3a4953d4dff2dba3ec5cdb645 (patch) | |
| tree | edf566ac7328d438455a3f3a8c4e6bc7f2f117d9 /src/core/SkScan_Antihair.cpp | |
| parent | 4e4b09a44e202215ba60f71235388694f4b352d8 (diff) | |
SK_SUPPORTED_DEPRECATED_FIXEDROUND around deprecated fixed[round,ceil,floor]
git-svn-id: http://skia.googlecode.com/svn/trunk@12903 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/core/SkScan_Antihair.cpp')
| -rw-r--r-- | src/core/SkScan_Antihair.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/core/SkScan_Antihair.cpp b/src/core/SkScan_Antihair.cpp index 175f085f91..1ad68e5075 100644 --- a/src/core/SkScan_Antihair.cpp +++ b/src/core/SkScan_Antihair.cpp @@ -466,11 +466,11 @@ static void do_anti_hairline(SkFDot6 x0, SkFDot6 y0, SkFDot6 x1, SkFDot6 y1, // now test if our Y values are completely inside the clip int top, bottom; if (slope >= 0) { // T2B - top = SkFixedFloor(fstart - SK_FixedHalf); - bottom = SkFixedCeil(fstart + (istop - istart - 1) * slope + SK_FixedHalf); + top = SkFixedFloorToInt(fstart - SK_FixedHalf); + bottom = SkFixedCeilToInt(fstart + (istop - istart - 1) * slope + SK_FixedHalf); } else { // B2T - bottom = SkFixedCeil(fstart + SK_FixedHalf); - top = SkFixedFloor(fstart + (istop - istart - 1) * slope - SK_FixedHalf); + bottom = SkFixedCeilToInt(fstart + SK_FixedHalf); + top = SkFixedFloorToInt(fstart + (istop - istart - 1) * slope - SK_FixedHalf); } #ifdef OUTSET_BEFORE_CLIP_TEST top -= 1; @@ -542,11 +542,11 @@ static void do_anti_hairline(SkFDot6 x0, SkFDot6 y0, SkFDot6 x1, SkFDot6 y1, // now test if our X values are completely inside the clip int left, right; if (slope >= 0) { // L2R - left = SkFixedFloor(fstart - SK_FixedHalf); - right = SkFixedCeil(fstart + (istop - istart - 1) * slope + SK_FixedHalf); + left = SkFixedFloorToInt(fstart - SK_FixedHalf); + right = SkFixedCeilToInt(fstart + (istop - istart - 1) * slope + SK_FixedHalf); } else { // R2L - right = SkFixedCeil(fstart + SK_FixedHalf); - left = SkFixedFloor(fstart + (istop - istart - 1) * slope - SK_FixedHalf); + right = SkFixedCeilToInt(fstart + SK_FixedHalf); + left = SkFixedFloorToInt(fstart + (istop - istart - 1) * slope - SK_FixedHalf); } #ifdef OUTSET_BEFORE_CLIP_TEST left -= 1; |