- JPEG 2000 support

diff --git a/ext/standard/tests/image/getimagesize.phpt b/ext/standard/tests/image/getimagesize.phpt
index 9d28acf7ac8592ea55ec2f1438c1f10ef446c48d..5c01d795f2f77a62872895d2549c6d60ad1eb93a 100644 (file)
--- a/ext/standard/tests/image/getimagesize.phpt
+++ b/ext/standard/tests/image/getimagesize.phpt
@@ -40,7 +40,7 @@ array(10) {
     string(9) "image/bmp"
   }
   ["test1pix.jpc"]=>
-  array(6) {
+  array(7) {
     [0]=>
     int(1)
     [1]=>
@@ -50,9 +50,11 @@ array(10) {
     [3]=>
     string(20) "width="1" height="1""
     ["bits"]=>
+    int(8)
+    ["channels"]=>
     int(3)
     ["mime"]=>
-    string(10) "image/jpeg"
+    string(24) "application/octet-stream"
   }
   ["test1pix.jpg"]=>
   array(7) {

diff --git a/ext/standard/tests/image/image_type_to_mime_type.phpt b/ext/standard/tests/image/image_type_to_mime_type.phpt
index 0f2eed1e32c2ec0e7f686e1dcb71e90c558cb812..da882aae8d806400ab5c514f0d5fa89990e6f6f8 100644 (file)
--- a/ext/standard/tests/image/image_type_to_mime_type.phpt
+++ b/ext/standard/tests/image/image_type_to_mime_type.phpt
@@ -29,7 +29,7 @@ array(10) {
   ["test1pix.bmp"]=>
   string(9) "image/bmp"
   ["test1pix.jpc"]=>
-  string(10) "image/jpeg"
+  string(24) "application/octet-stream"
   ["test1pix.jpg"]=>
   string(10) "image/jpeg"
   ["test2pix.gif"]=>