aaclip needs to handle paths with holes
Review URL: https://codereview.appspot.com/5671066
git-svn-id: http://skia.googlecode.com/svn/trunk@3209 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/core/SkAAClip.cpp b/src/core/SkAAClip.cpp
index 096fd6b..5402bcf 100644
--- a/src/core/SkAAClip.cpp
+++ b/src/core/SkAAClip.cpp
@@ -893,10 +893,10 @@
SkASSERT(count > 0);
SkASSERT(fBounds.contains(x, y));
SkASSERT(fBounds.contains(x + count - 1, y));
-
+
x -= fBounds.left();
y -= fBounds.top();
-
+
Row* row = fCurrRow;
if (y != fPrevY) {
SkASSERT(y > fPrevY);
@@ -1142,12 +1142,33 @@
};
class SkAAClip::BuilderBlitter : public SkBlitter {
+ int fLastY;
+
+ /*
+ If we see a gap of 1 or more empty scanlines while building in Y-order,
+ we inject an explicit empty scanline (alpha==0)
+
+ See AAClipTest.cpp : test_path_with_hole()
+ */
+ void checkForYGap(int y) {
+ SkASSERT(y >= fLastY);
+ if (fLastY > -SK_MaxS32) {
+ int gap = y - fLastY;
+ if (gap > 1) {
+ fBuilder->addRun(fLeft, y - 1, 0, fRight - fLeft);
+ }
+ }
+ fLastY = y;
+ }
+
public:
+
BuilderBlitter(Builder* builder) {
fBuilder = builder;
fLeft = builder->getBounds().fLeft;
fRight = builder->getBounds().fRight;
fMinY = SK_MaxS32;
+ fLastY = -SK_MaxS32; // sentinel
}
void finish() {
@@ -1170,6 +1191,7 @@
virtual void blitRect(int x, int y, int width, int height) SK_OVERRIDE {
this->recordMinY(y);
+ this->checkForYGap(y);
fBuilder->addRectRun(x, y, width, height);
}
@@ -1188,12 +1210,14 @@
virtual void blitH(int x, int y, int width) SK_OVERRIDE {
this->recordMinY(y);
+ this->checkForYGap(y);
fBuilder->addRun(x, y, 0xFF, width);
}
virtual void blitAntiH(int x, int y, const SkAlpha alpha[],
const int16_t runs[]) SK_OVERRIDE {
this->recordMinY(y);
+ this->checkForYGap(y);
for (;;) {
int count = *runs;
if (count <= 0) {