com php-src: Rename *.tif to *.tiff for consistency: ext/standard/tests/image/200x100.tif ext/standard/tests/image/200x100.tiff
ext/standard/tests/image/2x2mm.tif ext/standard/tests/image/2x2mm.tiff ext/standard/tests/image/getimagesize.phpt ext/standard/tests/i
mage/getimagesize_basic.phpt ext/standard/tests/image/get imagesize_tif_mm.phpt ext/standard/tests/image/image_ type_to_mime_type.phpt
ext/standard/tests/image/test 4pix.tif ext/standard/test
| From: | Peter Kokot | Date: | Thu, 16 May 2019 05:41:45 +0000 |
| Subject: | com php-src: Rename *.tif to *.tiff for consistency: ext/standard/tests/image/200x100.tif ext/standard/tests/image/200x100.tiff ext/standard/tests/image/2x2mm.tif ext/standard/tests/image/2x2mm.tiff ext/standard/tests/image/getimagesize.phpt ext/standard/tests/i mage/getimagesize_basic.phpt ext/standard/tests/image/get imagesize_tif_mm.phpt ext/standard/tests/image/image_ type_to_mime_type.phpt ext/standard/tests/image/test 4pix.tif ext/standard/test |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-106214@lists.php.net to get a copy of this message | ||
Commit: ab2710c8d0261b4e3a5b1efcd86256134b9905d0
Author: Peter Kokot <peterkokot@gmail.com> Thu, 16 May 2019 07:41:45 +0200
Parents: 806db1a793bb51225b6b30a3b698023e40bbda8c
Branches: PHP-7.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ab2710c8d0261b4e3a5b1efcd86256134b9905d0
Log:
Rename *.tif to *.tiff for consistency
There really isn't any practical difference between these two, but repo
currently uses *.tiff files more than 8.3 variant filenames of *.tif.
Also these aren't part of the test.
Changed paths:
D ext/standard/tests/image/200x100.tif
A ext/standard/tests/image/200x100.tiff
D ext/standard/tests/image/2x2mm.tif
A ext/standard/tests/image/2x2mm.tiff
M ext/standard/tests/image/getimagesize.phpt
M ext/standard/tests/image/getimagesize_basic.phpt
M ext/standard/tests/image/getimagesize_tif_mm.phpt
M ext/standard/tests/image/image_type_to_mime_type.phpt
D ext/standard/tests/image/test4pix.tif
A ext/standard/tests/image/test4pix.tiff
Diff:
diff --git a/ext/standard/tests/image/200x100.tif b/ext/standard/tests/image/200x100.tif
deleted file mode 100644
index 31d9b33..0000000
Binary files a/ext/standard/tests/image/200x100.tif and /dev/null differ
diff --git a/ext/standard/tests/image/200x100.tiff b/ext/standard/tests/image/200x100.tiff
new file mode 100644
index 0000000..31d9b33
Binary files /dev/null and b/ext/standard/tests/image/200x100.tiff differ
diff --git a/ext/standard/tests/image/2x2mm.tif b/ext/standard/tests/image/2x2mm.tif
deleted file mode 100644
index 8b95242..0000000
Binary files a/ext/standard/tests/image/2x2mm.tif and /dev/null differ
diff --git a/ext/standard/tests/image/2x2mm.tiff b/ext/standard/tests/image/2x2mm.tiff
new file mode 100644
index 0000000..8b95242
Binary files /dev/null and b/ext/standard/tests/image/2x2mm.tiff differ
diff --git a/ext/standard/tests/image/getimagesize.phpt b/ext/standard/tests/image/getimagesize.phpt
index 2d0ab01..db8213b 100644
--- a/ext/standard/tests/image/getimagesize.phpt
+++ b/ext/standard/tests/image/getimagesize.phpt
@@ -255,7 +255,7 @@ array(16) {
["mime"]=>
string(29) "application/x-shockwave-flash"
}
- ["test4pix.tif"]=>
+ ["test4pix.tiff"]=>
array(5) {
[0]=>
int(4)
diff --git a/ext/standard/tests/image/getimagesize_basic.phpt
b/ext/standard/tests/image/getimagesize_basic.phpt
index 1129975..8e03ff2 100644
--- a/ext/standard/tests/image/getimagesize_basic.phpt
+++ b/ext/standard/tests/image/getimagesize_basic.phpt
@@ -24,7 +24,7 @@ $imagetype_filenames = array(
"BMP image file" => "200x100.bmp",
//TIFF intel byte order
- "TIFF intel byte order image file" => "200x100.tif",
+ "TIFF intel byte order image file" => "200x100.tiff",
//JPC file
"JPC image file" => "test1pix.jpc",
@@ -143,7 +143,7 @@ array(6) {
array(0) {
}
--- TIFF intel byte order image file (200x100.tif) --
+-- TIFF intel byte order image file (200x100.tiff) --
array(5) {
[0]=>
int(200)
diff --git a/ext/standard/tests/image/getimagesize_tif_mm.phpt
b/ext/standard/tests/image/getimagesize_tif_mm.phpt
index fe4efaf..8fb7ceb 100644
--- a/ext/standard/tests/image/getimagesize_tif_mm.phpt
+++ b/ext/standard/tests/image/getimagesize_tif_mm.phpt
@@ -9,7 +9,7 @@ GetImageSize() for tiff format with big-endian (aka Motorola, aka MM) ordering
*/
echo "*** Testing getimagesize() : tiff_mm format ***\n";
-var_dump(getimagesize(__DIR__ . "/2x2mm.tif", $arr));
+var_dump(getimagesize(__DIR__ . "/2x2mm.tiff", $arr));
var_dump($arr);
?>
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 f1a40e3..b1781aa 100644
--- a/ext/standard/tests/image/image_type_to_mime_type.phpt
+++ b/ext/standard/tests/image/image_type_to_mime_type.phpt
@@ -55,6 +55,6 @@ array(16) {
string(9) "image/psd"
["test4pix.swf"]=>
string(29) "application/x-shockwave-flash"
- ["test4pix.tif"]=>
+ ["test4pix.tiff"]=>
string(10) "image/tiff"
}
diff --git a/ext/standard/tests/image/test4pix.tif b/ext/standard/tests/image/test4pix.tif
deleted file mode 100644
index 13367ee...0000000
Binary files a/ext/standard/tests/image/test4pix.tif and /dev/null differ
diff --git a/ext/standard/tests/image/test4pix.tiff b/ext/standard/tests/image/test4pix.tiff
new file mode 100644
index 0000000..13367ee
Binary files /dev/null and b/ext/standard/tests/image/test4pix.tiff differ