[[ SkiaUpdate ]] Reinstate stipple.

livecodemichael · livecodemichael · commit 8b54bae0c3bd · 2017-05-12T16:20:09.000+01:00
Skia's old stipple implmentation has been pulled over into
libgraphics and updated to implement the new mask filter API.
diff --git a/libgraphics/libgraphics.gyp b/libgraphics/libgraphics.gyp
@@ -41,6 +41,7 @@
 				'src/spread.cpp',
 				'src/utils.cpp',
 				'src/w32text.cpp',
+				'src/SkStippleMaskFilter.cpp',
 			],
 			
 			'conditions':
diff --git a/libgraphics/src/SkStippleMaskFilter.cpp b/libgraphics/src/SkStippleMaskFilter.cpp
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkStippleMaskFilter.h"
+#include <SkString.h>
+
+bool SkStippleMaskFilter::filterMask(SkMask* dst,
+                                     const SkMask& src,
+                                     const SkMatrix& matrix,
+                                     SkIPoint* margin) const {
+
+    if (src.fFormat != SkMask::kA8_Format) {
+        return false;
+    }
+
+    dst->fBounds = src.fBounds;
+    dst->fRowBytes = dst->fBounds.width();
+    dst->fFormat = SkMask::kA8_Format;
+    dst->fImage = NULL;
+
+    if (NULL != src.fImage) {
+        size_t dstSize = dst->computeImageSize();
+        if (0 == dstSize) {
+            return false;   // too big to allocate, abort
+        }
+
+        dst->fImage = SkMask::AllocImage(dstSize);
+
+        uint8_t* srcScanLine = src.fImage;
+        uint8_t* scanline = dst->fImage;
+
+        for (int y = 0; y < src.fBounds.height(); ++y) {
+            for (int x = 0; x < src.fBounds.width(); ++x) {
+                scanline[x] = srcScanLine[x] && ((x+y) & 0x1) ? 0xFF : 0x00;
+            }
+            scanline += dst->fRowBytes;
+            srcScanLine += src.fRowBytes;
+        }
+    }
+
+    return true;
+}
+
+#ifndef SK_IGNORE_TO_STRING
+void SkStippleMaskFilter::toString(SkString* str) const {
+    str->append("SkStippleMaskFilter: ()");
+}
+#endif
+
+sk_sp<SkFlattenable> SkStippleMaskFilter::CreateProc(SkReadBuffer& buf) {
+    return sk_make_sp<SkStippleMaskFilter>();
+}
diff --git a/libgraphics/src/SkStippleMaskFilter.h b/libgraphics/src/SkStippleMaskFilter.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkStippleMaskFilter_DEFINED
+#define SkStippleMaskFilter_DEFINED
+
+#include <SkMaskFilter.h>
+
+/**
+ * Simple MaskFilter that creates a screen door stipple pattern.
+ */
+class SK_API SkStippleMaskFilter : public SkMaskFilter {
+public:
+    SkStippleMaskFilter() : INHERITED() {
+    }
+    
+    virtual bool filterMask(SkMask* dst, const SkMask& src,
+                            const SkMatrix& matrix,
+                            SkIPoint* margin) const override;
+    
+    // getFormat is from SkMaskFilter
+    virtual SkMask::Format getFormat() const override {
+        return SkMask::kA8_Format;
+    }
+
+    SK_TO_STRING_OVERRIDE()
+    SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkStippleMaskFilter)
+
+private:
+    typedef SkMaskFilter INHERITED;
+};
+
+#endif // SkStippleMaskFilter_DEFINED
diff --git a/libgraphics/src/context.cpp b/libgraphics/src/context.cpp
@@ -37,6 +37,8 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 
 #include <time.h>
 
+#include "SkStippleMaskFilter.h"
+
 ////////////////////////////////////////////////////////////////////////////////
 
 
@@ -2245,8 +2247,8 @@ static bool MCGContextApplyPaintSettingsToSkPaint(MCGContextRef self, MCGColor p
 		}
 		else if (p_paint_style == kMCGPaintStyleStippled)
 		{
-			//t_stipple = new (nothrow) SkStippleMaskFilter();
-			//t_success = t_stipple != NULL;			
+            t_stipple = sk_sp<SkMaskFilter>(new (nothrow) SkStippleMaskFilter());
+			t_success = t_stipple != NULL;
 		}
 	}	
 	

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,8 @@ along with LiveCode. If not see <http://www.gnu.org/licenses/>. */`
`37`	`37`
`38`	`38`	`#include <time.h>`
`39`	`39`
	`40`	`+#include "SkStippleMaskFilter.h"`
	`41`	`+`
`40`	`42`	`////////////////////////////////////////////////////////////////////////////////`
`41`	`43`
`42`	`44`
`@@ -2245,8 +2247,8 @@ static bool MCGContextApplyPaintSettingsToSkPaint(MCGContextRef self, MCGColor p`
`2245`	`2247`	`}`
`2246`	`2248`	`else if (p_paint_style == kMCGPaintStyleStippled)`
`2247`	`2249`	`{`
`2248`		`- //t_stipple = new (nothrow) SkStippleMaskFilter();`
`2249`		`- //t_success = t_stipple != NULL;`
	`2250`	`+ t_stipple = sk_sp<SkMaskFilter>(new (nothrow) SkStippleMaskFilter());`
	`2251`	`+ t_success = t_stipple != NULL;`
`2250`	`2252`	`}`
`2251`	`2253`	`}`
`2252`	`2254`