mirror of
https://github.com/php/php-src.git
synced 2024-09-23 10:57:26 +00:00
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: Fixed test with freetype >= 2.4.12
This commit is contained in:
commit
72c9b0e12b
@ -1,12 +1,13 @@
|
|||||||
--TEST--
|
--TEST--
|
||||||
Bug #48801 (Problem with imagettfbbox) freetype >= 2.4.10
|
Bug #48801 (Problem with imagettfbbox) freetype >= 2.4.10 and < 2.4.12
|
||||||
--SKIPIF--
|
--SKIPIF--
|
||||||
<?php
|
<?php
|
||||||
if(!extension_loaded('gd')){ die('skip gd extension not available'); }
|
if(!extension_loaded('gd')){ die('skip gd extension not available'); }
|
||||||
if(!function_exists('imageftbbox')) die('skip imageftbbox() not available');
|
if(!function_exists('imageftbbox')) die('skip imageftbbox() not available');
|
||||||
|
|
||||||
include dirname(__FILE__) . '/func.inc';
|
include dirname(__FILE__) . '/func.inc';
|
||||||
if(version_compare(get_freetype_version(), '2.4.10') == -1) die('skip for freetype >= 2.4.10');
|
if(version_compare(get_freetype_version(), '2.4.10') < 0) die('skip for freetype >= 2.4.10');
|
||||||
|
if(version_compare(get_freetype_version(), '2.4.12') >= 0) die('skip for freetype < 2.4.12');
|
||||||
?>
|
?>
|
||||||
--FILE--
|
--FILE--
|
||||||
<?php
|
<?php
|
||||||
|
25
ext/gd/tests/bug48801_2.phpt
Normal file
25
ext/gd/tests/bug48801_2.phpt
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
--TEST--
|
||||||
|
Bug #48801 (Problem with imagettfbbox) freetype >= 2.4.12
|
||||||
|
--SKIPIF--
|
||||||
|
<?php
|
||||||
|
if(!extension_loaded('gd')){ die('skip gd extension not available'); }
|
||||||
|
if(!function_exists('imageftbbox')) die('skip imageftbbox() not available');
|
||||||
|
|
||||||
|
include dirname(__FILE__) . '/func.inc';
|
||||||
|
if(version_compare(get_freetype_version(), '2.4.12') < 0) die('skip for freetype >= 2.4.12');
|
||||||
|
?>
|
||||||
|
--FILE--
|
||||||
|
<?php
|
||||||
|
$cwd = dirname(__FILE__);
|
||||||
|
$font = "$cwd/Tuffy.ttf";
|
||||||
|
$bbox = imageftbbox(50, 0, $font, "image");
|
||||||
|
echo '(' . $bbox[0] . ', ' . $bbox[1] . ")\n";
|
||||||
|
echo '(' . $bbox[2] . ', ' . $bbox[3] . ")\n";
|
||||||
|
echo '(' . $bbox[4] . ', ' . $bbox[5] . ")\n";
|
||||||
|
echo '(' . $bbox[6] . ', ' . $bbox[7] . ")\n";
|
||||||
|
?>
|
||||||
|
--EXPECTF--
|
||||||
|
(-1, 15)
|
||||||
|
(155, 15)
|
||||||
|
(155, -48)
|
||||||
|
(-1, -48)
|
Loading…
Reference in New Issue
Block a user