Merge pull request #95 from BlackFoundryCom/fix-issue93

Fix for issue #93: reverse application order of transform and clip path
BlackFoundryCom · Jun 9, 2022 · 5538aab · 5538aab
2 parents 8ff8b36 + 2e05cca
commit 5538aab
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 2 deletions.
diff --git a/Lib/blackrenderer/font.py b/Lib/blackrenderer/font.py
@@ -370,10 +370,10 @@ def _ensureClipAndPushPath(self, canvas, path):
         self.currentPath = path
         self.currentTransform = Identity
         with canvas.savedState():
-            if currentTransform != Identity:
-                canvas.transform(currentTransform)
             if currentPath is not None:
                 canvas.clipPath(currentPath)
+            if currentTransform != Identity:
+                canvas.transform(currentTransform)
             yield
         self.currentPath = currentPath
         self.currentTransform = currentTransform

diff --git a/Tests/data/nested-paintglyph.ttf b/Tests/data/nested-paintglyph.ttf
diff --git a/Tests/expectedOutput/glyph_nested_paintglyph_A_cairo.png b/Tests/expectedOutput/glyph_nested_paintglyph_A_cairo.png
diff --git a/Tests/expectedOutput/glyph_nested_paintglyph_A_coregraphics.png b/Tests/expectedOutput/glyph_nested_paintglyph_A_coregraphics.png
diff --git a/Tests/expectedOutput/glyph_nested_paintglyph_A_skia.png b/Tests/expectedOutput/glyph_nested_paintglyph_A_skia.png
diff --git a/Tests/expectedOutput/glyph_nested_paintglyph_A_svg.svg b/Tests/expectedOutput/glyph_nested_paintglyph_A_svg.svg
diff --git a/Tests/test_glyph_render.py b/Tests/test_glyph_render.py
@@ -27,6 +27,7 @@
     "twemoji": dataDir / "TwemojiMozilla.subset.default.3299.ttf",
     "more_samples": dataDir / "more_samples-glyf_colr_1.ttf",
     "crash": dataDir / "crash.subset.otf",
+    "nested_paintglyph": dataDir / "nested-paintglyph.ttf",
 }
 
 
@@ -91,6 +92,7 @@
     ("more_samples", "skew_25_0_center_500.0_500.0", None),
     ("more_samples", "skew_0_15_center_0_0", None),
     ("more_samples", "upem_box_glyph", None),
+    ("nested_paintglyph", "A", None),
 ]