Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0: Shrink another large image
9 years ago · 2d6d1ec55b
2 changed files with 3 additions and 3 deletions
--- a/ext/standard/tests/image/getimagesize.phpt
+++ b/ext/standard/tests/image/getimagesize.phpt
@ -57,13 +57,13 @@ array(16) {
  ["test1bpix.bmp"]=>
  array(6) {
    [0]=>
-    int(500)
+    int(1)
    [1]=>
-    int(345)
+    int(1)
    [2]=>
    int(6)
    [3]=>
-    string(24) "width="500" height="345""
+    string(20) "width="1" height="1""
    ["bits"]=>
    int(32)
    ["mime"]=>
--- a/ext/standard/tests/image/test1bpix.bmp
+++ b/ext/standard/tests/image/test1bpix.bmp