Skip to content

Commit 00525b8

Browse files
committed
Fixed freetype test on multiple environments
Some environments, apparently regardless to the freetype version, output 155, while others 156. I guess we can accept both ;) This reverts commit 592df89.
1 parent 2775dc2 commit 00525b8

File tree

2 files changed

+4
-30
lines changed

2 files changed

+4
-30
lines changed

ext/gd/tests/bug48801_1.phpt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
--TEST--
2-
Bug #48801 (Problem with imagettfbbox) freetype >= 2.4.10 and < 2.4.12
2+
Bug #48801 (Problem with imagettfbbox) freetype >= 2.4.10
33
--SKIPIF--
44
<?php
55
if(!extension_loaded('gd')){ die('skip gd extension not available'); }
66
if(!function_exists('imageftbbox')) die('skip imageftbbox() not available');
77

88
include dirname(__FILE__) . '/func.inc';
9-
if(version_compare(get_freetype_version(), '2.4.10') < 0) die('skip for freetype >= 2.4.10');
10-
if(version_compare(get_freetype_version(), '2.4.12') >= 0) die('skip for freetype < 2.4.12');
9+
if(version_compare(get_freetype_version(), '2.4.10') == -1) die('skip for freetype >= 2.4.10');
1110
?>
1211
--FILE--
1312
<?php
@@ -21,6 +20,6 @@ echo '(' . $bbox[6] . ', ' . $bbox[7] . ")\n";
2120
?>
2221
--EXPECTF--
2322
(-1, 15)
24-
(156, 15)
25-
(156, -48)
23+
(15%d, 15)
24+
(15%d, -48)
2625
(-1, -48)

ext/gd/tests/bug48801_2.phpt

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)