From 97ae0c89025dfd791047f5701e57d58da37c125c Mon Sep 17 00:00:00 2001 From: Ethan Nicholas Date: Thu, 12 Jul 2018 14:02:00 -0400 Subject: Revert "Revert "added GrSkSLFP and converted DitherEffect to use it"" This reverts commit f2030783094e502fb74221077a5ee7cb41287fe4. Bug: skia: Change-Id: Icaaa8b3ea652a8f126bfbcc788a360493a7ebe3e Reviewed-on: https://skia-review.googlesource.com/137391 Commit-Queue: Ethan Nicholas Reviewed-by: Brian Salomon --- tests/PaintTest.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'tests/PaintTest.cpp') diff --git a/tests/PaintTest.cpp b/tests/PaintTest.cpp index 2794058ceb..647f8e2f23 100644 --- a/tests/PaintTest.cpp +++ b/tests/PaintTest.cpp @@ -18,6 +18,7 @@ #include "SkUtils.h" #include "SkWriteBuffer.h" #include "Test.h" +#undef ASSERT static size_t uni_to_utf8(const SkUnichar src[], void* dst, int count) { char* u8 = (char*)dst; -- cgit v1.2.3