From bbbe9ed59ee1d3077fa4e6368a4a7294240a5ec6 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Fri, 30 Mar 2012 18:56:08 +0000 Subject: [PATCH] rm obsolete build-flag SK_IGNORE_HAIRLINE_CLIP_FIX git-svn-id: http://skia.googlecode.com/svn/trunk@3567 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/core/SkScan_Antihair.cpp | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/src/core/SkScan_Antihair.cpp b/src/core/SkScan_Antihair.cpp index 7222108..3a60778 100644 --- a/src/core/SkScan_Antihair.cpp +++ b/src/core/SkScan_Antihair.cpp @@ -14,10 +14,6 @@ #include "SkRasterClip.h" #include "SkFDot6.h" -// Define this in your Makefile if you want the old behavior, which may draw -// outside of the clip (but retains the old images if that is important). -//#define SK_IGNORE_HAIRLINE_CLIP_FIX - /* Our attempt to compute the worst case "bounds" for the horizontal and vertical cases has some numerical bug in it, and we sometimes undervalue our extends. The bug is that when this happens, we will set the clip to @@ -300,17 +296,11 @@ static void do_anti_hairline(SkFDot6 x0, SkFDot6 y0, SkFDot6 x1, SkFDot6 y1, istart = clip->fLeft; scaleStart = 64; } -#ifdef SK_IGNORE_HAIRLINE_CLIP_FIX - if (istop > clip->fRight) { - istop = clip->fRight; - scaleStop = 64; - } -#else if (istop > clip->fRight) { istop = clip->fRight; scaleStop = 0; // so we don't draw this last column } -#endif + SkASSERT(istart <= istop); if (istart == istop) { return; @@ -376,17 +366,11 @@ static void do_anti_hairline(SkFDot6 x0, SkFDot6 y0, SkFDot6 x1, SkFDot6 y1, istart = clip->fTop; scaleStart = 64; } -#ifdef SK_IGNORE_HAIRLINE_CLIP_FIX - if (istop > clip->fBottom) { - istop = clip->fBottom; - scaleStop = 64; // so we don't draw this last row - } -#else if (istop > clip->fBottom) { istop = clip->fBottom; scaleStop = 0; // so we don't draw this last row } -#endif + SkASSERT(istart <= istop); if (istart == istop) return; -- 2.7.4