From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Fri, 23 Sep 2016 10:55:13 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.0RC3~47
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8dfee1a777a0fd38b3b3e8867155fb0fd90d21df;p=php

Merge branch 'PHP-7.0' into PHP-7.1
---

8dfee1a777a0fd38b3b3e8867155fb0fd90d21df
diff --cc ext/gd/tests/bug48801-mb.phpt
index 6a31cf10dc,0000000000..c2b6b455ab
mode 100644,000000..100644
--- a/ext/gd/tests/bug48801-mb.phpt
+++ b/ext/gd/tests/bug48801-mb.phpt
@@@ -1,27 -1,0 +1,22 @@@
 +--TEST--
- Bug #48801 (Problem with imagettfbbox) freetype < 2.4.10
++Bug #48801 (Problem with imagettfbbox)
 +--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.10') >= 0) die('skip for freetype < 2.4.10');
- 
- 	die('skip freetype issues');
 +?>
 +--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)
- (15%d, 15)
- (15%d, -48)
- (-1, -48)
++--EXPECTREGEX--
++\(4, 15\)
++\(16[0-1], 15\)
++\(16[0-1], -4[7-8]\)
++\(4, -4[7-8]\)