unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
blob 18bc30bc79e36f2eff7bd32adbbbd0799b11fb5e 2856 bytes (raw)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
 
Fix some test failures when building with freetype-2.7.

https://github.com/python-pillow/Pillow/issues/2116
https://github.com/python-pillow/Pillow/pull/2286

Patch copied from upstream source repository:

https://github.com/python-pillow/Pillow/commit/acf68c835c93ba144f83198306aa7e6082a43f43

From acf68c835c93ba144f83198306aa7e6082a43f43 Mon Sep 17 00:00:00 2001
From: hugovk <hugovk@users.noreply.github.com>
Date: Mon, 12 Dec 2016 15:16:43 +0200
Subject: [PATCH] Increase epsilon for FreeType 2.7

---
 Tests/test_imagefont.py | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/Tests/test_imagefont.py b/Tests/test_imagefont.py
index de89ac92..5207dce3 100644
--- a/Tests/test_imagefont.py
+++ b/Tests/test_imagefont.py
@@ -125,7 +125,9 @@ try:
 
             target = 'Tests/images/rectangle_surrounding_text.png'
             target_img = Image.open(target)
-            self.assert_image_similar(im, target_img, .5)
+
+            # Epsilon ~.5 fails with FreeType 2.7
+            self.assert_image_similar(im, target_img, 2.5)
 
         def test_render_multiline(self):
             im = Image.new(mode='RGB', size=(300, 100))
@@ -144,7 +146,7 @@ try:
             # some versions of freetype have different horizontal spacing.
             # setting a tight epsilon, I'm showing the original test failure
             # at epsilon = ~38.
-            self.assert_image_similar(im, target_img, .5)
+            self.assert_image_similar(im, target_img, 6.2)
 
         def test_render_multiline_text(self):
             ttf = ImageFont.truetype(FONT_PATH, FONT_SIZE)
@@ -158,7 +160,8 @@ try:
             target = 'Tests/images/multiline_text.png'
             target_img = Image.open(target)
 
-            self.assert_image_similar(im, target_img, .5)
+            # Epsilon ~.5 fails with FreeType 2.7
+            self.assert_image_similar(im, target_img, 6.2)
 
             # Test that text() can pass on additional arguments
             # to multiline_text()
@@ -178,7 +181,8 @@ try:
                 target = 'Tests/images/multiline_text'+ext+'.png'
                 target_img = Image.open(target)
 
-                self.assert_image_similar(im, target_img, .5)
+                # Epsilon ~.5 fails with FreeType 2.7
+                self.assert_image_similar(im, target_img, 6.2)
 
         def test_unknown_align(self):
             im = Image.new(mode='RGB', size=(300, 100))
@@ -227,7 +231,8 @@ try:
             target = 'Tests/images/multiline_text_spacing.png'
             target_img = Image.open(target)
 
-            self.assert_image_similar(im, target_img, .5)
+            # Epsilon ~.5 fails with FreeType 2.7
+            self.assert_image_similar(im, target_img, 6.2)
 
         def test_rotated_transposed_font(self):
             img_grey = Image.new("L", (100, 100))
-- 
2.12.0


debug log:

solving 18bc30bc7 ...
found 18bc30bc7 in https://git.savannah.gnu.org/cgit/guix.git

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).