diff options
author | Christoph M. Becker <cmbecker69@gmx.de> | 2016-09-12 12:39:14 +0200 |
---|---|---|
committer | Christoph M. Becker <cmbecker69@gmx.de> | 2016-09-12 12:39:14 +0200 |
commit | c2044e60f3e7f8cccb92aa1230b11c7f0c6107c2 (patch) | |
tree | 9191f52fa50e5e299d66f46dd5b86aa704780f10 | |
parent | c02cfd4e25637bd4b968b529f7cb6675f2f780fa (diff) | |
parent | fcdc30b34772c7d1087d7c9ac5ec75ae98b2fa9d (diff) | |
download | php-git-c2044e60f3e7f8cccb92aa1230b11c7f0c6107c2.tar.gz |
Merge branch 'PHP-5.6' into PHP-7.0
-rw-r--r-- | ext/gd/tests/bug67325.phpt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ext/gd/tests/bug67325.phpt b/ext/gd/tests/bug67325.phpt index dabc8b2b30..97072fe14e 100644 --- a/ext/gd/tests/bug67325.phpt +++ b/ext/gd/tests/bug67325.phpt @@ -3,7 +3,10 @@ Bug #67325 (imagetruecolortopalette: white is duplicated in palette) --SKIPIF-- <?php if (!extension_loaded('gd')) die('skip gd extension not available'); -if (!(imagetypes() & IMG_JPG)) die('skip JPEG support not available'); +if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.3', '<=')) { + die("skip test requires newer than GD 2.2.3"); +} + if (!(imagetypes() & IMG_JPG)) die('skip JPEG support not available'); ?> --FILE-- <?php |