com php-src: Rename *.jpeg files to *.jpg: ext/exif/tests/bug48378.jpeg ext/exif/tests/bug48378.jpg ext/exif/tests/bug48378.phpt
ext/exif/tests/bug54002.phpt ext/exif/tests/bug54002 _1.jpeg ext/exif/tests/bug54002_1.jpg ext/exif/tests/bug54002_2.jpeg ext/exif/te
sts/bug54002_2.jpg ext/exif/tests/bug72 603.jpeg ext/exif/tests/bug72603.jpg ex t/exif/tests/bug72603.phpt ext/gd/tests/bug67 325.jpeg
ext/gd/tests/bug67325.jpg ext/ gd/tests/bug67325.phpt ext/
| From: | Peter Kokot | Date: | Sat, 11 May 2019 01:22:19 +0000 |
| Subject: | com php-src: Rename *.jpeg files to *.jpg: ext/exif/tests/bug48378.jpeg ext/exif/tests/bug48378.jpg ext/exif/tests/bug48378.phpt ext/exif/tests/bug54002.phpt ext/exif/tests/bug54002 _1.jpeg ext/exif/tests/bug54002_1.jpg ext/exif/tests/bug54002_2.jpeg ext/exif/te sts/bug54002_2.jpg ext/exif/tests/bug72 603.jpeg ext/exif/tests/bug72603.jpg ex t/exif/tests/bug72603.phpt ext/gd/tests/bug67 325.jpeg ext/gd/tests/bug67325.jpg ext/ gd/tests/bug67325.phpt ext/ |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-106120@lists.php.net to get a copy of this message | ||
Commit: a68e0767b349360344fcdfa0f853bf577c37adbd
Author: Peter Kokot <peterkokot@gmail.com> Sat, 11 May 2019 03:22:19 +0200
Parents: e586d3f447e35fa0ddb7fc831dea36bcf5739104
Branches: PHP-7.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a68e0767b349360344fcdfa0f853bf577c37adbd
Log:
Rename *.jpeg files to *.jpg
These file extensions are not part of these tests and *.jpg is more
common.
Changed paths:
D ext/exif/tests/bug48378.jpeg
A ext/exif/tests/bug48378.jpg
M ext/exif/tests/bug48378.phpt
M ext/exif/tests/bug54002.phpt
D ext/exif/tests/bug54002_1.jpeg
A ext/exif/tests/bug54002_1.jpg
D ext/exif/tests/bug54002_2.jpeg
A ext/exif/tests/bug54002_2.jpg
D ext/exif/tests/bug72603.jpeg
A ext/exif/tests/bug72603.jpg
M ext/exif/tests/bug72603.phpt
D ext/gd/tests/bug67325.jpeg
A ext/gd/tests/bug67325.jpg
M ext/gd/tests/bug67325.phpt
D ext/gd/tests/bug77195.jpeg
A ext/gd/tests/bug77195.jpg
M ext/gd/tests/bug77195.phpt
D ext/gd/tests/conv_test.jpeg
A ext/gd/tests/conv_test.jpg
D
"ext/gd/tests/conv_test\347\247\201\343\201\257\343\202\254\343\203\251\343\202\271\343\202\222\351\243\237\343\201\271\343\202\211\343\202\214\343\201\276\343\201\231.jpeg"
A
"ext/gd/tests/conv_test\347\247\201\343\201\257\343\202\254\343\203\251\343\202\271\343\202\222\351\243\237\343\201\271\343\202\211\343\202\214\343\201\276\343\201\231.jpg"
M ext/gd/tests/gif.phpt
M ext/gd/tests/jpeg2png.phpt
M ext/gd/tests/jpg2gd-mb.phpt
M ext/gd/tests/jpg2gd.phpt
diff --git a/ext/exif/tests/bug48378.jpeg b/ext/exif/tests/bug48378.jpeg deleted file mode 100644 index 759d805..0000000 Binary files a/ext/exif/tests/bug48378.jpeg and /dev/null differ diff --git a/ext/exif/tests/bug48378.jpg b/ext/exif/tests/bug48378.jpg new file mode 100644 index 0000000..759d805 Binary files /dev/null and b/ext/exif/tests/bug48378.jpg differ diff --git a/ext/exif/tests/bug48378.phpt b/ext/exif/tests/bug48378.phpt index a830f22..a232bed 100644 --- a/ext/exif/tests/bug48378.phpt +++ b/ext/exif/tests/bug48378.phpt @@ -5,7 +5,7 @@ Bug #48378 (Infinite recursion due to corrupt JPEG) --FILE-- <?php exif_read_data( -__DIR__ . "/bug48378.jpeg", +__DIR__ . "/bug48378.jpg", "FILE,COMPUTED,ANY_TAG" ); ?> diff --git a/ext/exif/tests/bug54002.phpt b/ext/exif/tests/bug54002.phpt index 031afad..f9608b9 100644 --- a/ext/exif/tests/bug54002.phpt +++ b/ext/exif/tests/bug54002.phpt @@ -6,11 +6,11 @@ memory_limit=-1 <?php if (!extension_loaded('exif')) print 'skip exif extension not available';?> --FILE-- <?php -exif_read_data(__DIR__ . '/bug54002_1.jpeg'); -exif_read_data(__DIR__ . '/bug54002_2.jpeg'); +exif_read_data(__DIR__ . '/bug54002_1.jpg'); +exif_read_data(__DIR__ . '/bug54002_2.jpg'); ?> --EXPECTF-- -Warning: exif_read_data(bug54002_1.jpeg): Process tag(x0205=UndefinedTa): Illegal byte_count in %sbug54002.php on line %d +Warning: exif_read_data(bug54002_1.jpg): Process tag(x0205=UndefinedTa): Illegal byte_count in %sbug54002.php on line %d -Warning: exif_read_data(bug54002_2.jpeg): Process tag(x0205=UndefinedTa): Illegal byte_count in %sbug54002.php on line %d +Warning: exif_read_data(bug54002_2.jpg): Process tag(x0205=UndefinedTa): Illegal byte_count in %sbug54002.php on line %d diff --git a/ext/exif/tests/bug54002_1.jpeg b/ext/exif/tests/bug54002_1.jpeg deleted file mode 100644 index a622d6d..0000000 Binary files a/ext/exif/tests/bug54002_1.jpeg and /dev/null differ diff --git a/ext/exif/tests/bug54002_1.jpg b/ext/exif/tests/bug54002_1.jpg new file mode 100644 index 0000000..a622d6d Binary files /dev/null and b/ext/exif/tests/bug54002_1.jpg differ diff --git a/ext/exif/tests/bug54002_2.jpeg b/ext/exif/tests/bug54002_2.jpeg deleted file mode 100644 index a622d6d..0000000 Binary files a/ext/exif/tests/bug54002_2.jpeg and /dev/null differ diff --git a/ext/exif/tests/bug54002_2.jpg b/ext/exif/tests/bug54002_2.jpg new file mode 100644 index 0000000..a622d6d Binary files /dev/null and b/ext/exif/tests/bug54002_2.jpg differ diff --git a/ext/exif/tests/bug72603.jpeg b/ext/exif/tests/bug72603.jpeg deleted file mode 100644 index 1764c80..0000000 Binary files a/ext/exif/tests/bug72603.jpeg and /dev/null differ diff --git a/ext/exif/tests/bug72603.jpg b/ext/exif/tests/bug72603.jpg new file mode 100644 index 0000000..1764c80 Binary files /dev/null and b/ext/exif/tests/bug72603.jpg differ diff --git a/ext/exif/tests/bug72603.phpt b/ext/exif/tests/bug72603.phpt index eacb6ee..1df7bdb 100644 --- a/ext/exif/tests/bug72603.phpt +++ b/ext/exif/tests/bug72603.phpt @@ -4,8 +4,8 @@ Bug #72603 (Out of bound read in exif_process_IFD_in_MAKERNOTE) <?php if (!extension_loaded('exif')) print 'skip exif extension not available';?> --FILE-- <?php -var_dump(count(exif_read_data(__DIR__ . "/bug72603.jpeg"))); +var_dump(count(exif_read_data(__DIR__ . "/bug72603.jpg"))); ?> --EXPECTF-- -Warning: exif_read_data(bug72603.jpeg): %s in %s%ebug72603.php on line %d +Warning: exif_read_data(bug72603.jpg): %s in %s%ebug72603.php on line %d int(%d) diff --git a/ext/gd/tests/bug67325.jpeg b/ext/gd/tests/bug67325.jpeg deleted file mode 100644 index 82e8233..0000000 Binary files a/ext/gd/tests/bug67325.jpeg and /dev/null differ diff --git a/ext/gd/tests/bug67325.jpg b/ext/gd/tests/bug67325.jpg new file mode 100644 index 0000000..82e8233 Binary files /dev/null and b/ext/gd/tests/bug67325.jpg differ diff --git a/ext/gd/tests/bug67325.phpt b/ext/gd/tests/bug67325.phpt index 97072fe..8290946 100644 --- a/ext/gd/tests/bug67325.phpt +++ b/ext/gd/tests/bug67325.phpt @@ -10,7 +10,7 @@ if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.3', '<=')) { ?> --FILE-- <?php -$filename = __DIR__ . DIRECTORY_SEPARATOR . 'bug67325.jpeg'; +$filename = __DIR__ . DIRECTORY_SEPARATOR . 'bug67325.jpg'; $im = imagecreatefromjpeg($filename); imagetruecolortopalette($im, 0, 256); diff --git a/ext/gd/tests/bug77195.jpeg b/ext/gd/tests/bug77195.jpeg deleted file mode 100644 index 66f92cf..0000000 Binary files a/ext/gd/tests/bug77195.jpeg and /dev/null differ diff --git a/ext/gd/tests/bug77195.jpg b/ext/gd/tests/bug77195.jpg new file mode 100644 index 0000000..66f92cf Binary files /dev/null and b/ext/gd/tests/bug77195.jpg differ diff --git a/ext/gd/tests/bug77195.phpt b/ext/gd/tests/bug77195.phpt index 1eb9024..5aa1f51 100644 --- a/ext/gd/tests/bug77195.phpt +++ b/ext/gd/tests/bug77195.phpt @@ -7,7 +7,7 @@ if (!gd_info()['JPEG Support']) die('skip JPEG support not available'); ?> --FILE-- <?php -$filename = __DIR__ . '/bug77195.jpeg'; +$filename = __DIR__ . '/bug77195.jpg'; @imagecreatefromjpeg($filename); imagecreatefromjpeg($filename); ?> diff --git a/ext/gd/tests/conv_test.jpeg b/ext/gd/tests/conv_test.jpeg deleted file mode 100644 index 7283d1a..0000000 Binary files a/ext/gd/tests/conv_test.jpeg and /dev/null differ diff --git a/ext/gd/tests/conv_test.jpg b/ext/gd/tests/conv_test.jpg new file mode 100644 index 0000000..7283d1a Binary files /dev/null and b/ext/gd/tests/conv_test.jpg differ diff --git "a/ext/gd/tests/conv_test\347\247\201\343\201\257\343\202\254\343\203\251\343\202\271\343\202\222\351\243\237\343\201\271\343\202\211\343\202\214\343\201\276\343\201\231.jpeg" "b/ext/gd/tests/conv_test\347\247\201\343\201\257\343\202\254\343\203\251\343\202\271\343\202\222\351\243\237\343\201\271\343\202\211\343\202\214\343\201\276\343\201\231.jpeg" deleted file mode 100644 index 7283d1a..0000000 Binary files "a/ext/gd/tests/conv_test\347\247\201\343\201\257\343\202\254\343\203\251\343\202\271\343\202\222\351\243\237\343\201\271\343\202\211\343\202\214\343\201\276\343\201\231.jpeg" and /dev/null differ diff --git "a/ext/gd/tests/conv_test\347\247\201\343\201\257\343\202\254\343\203\251\343\202\271\343\202\222\351\243\237\343\201\271\343\202\211\343\202\214\343\201\276\343\201\231.jpg" "b/ext/gd/tests/conv_test\347\247\201\343\201\257\343\202\254\343\203\251\343\202\271\343\202\222\351\243\237\343\201\271\343\202\211\343\202\214\343\201\276\343\201\231.jpg" new file mode 100644 index 0000000..7283d1a Binary files /dev/null and "b/ext/gd/tests/conv_test\347\247\201\343\201\257\343\202\254\343\203\251\343\202\271\343\202\222\351\243\237\343\201\271\343\202\211\343\202\214\343\201\276\343\201\231.jpg" differ diff --git a/ext/gd/tests/gif.phpt b/ext/gd/tests/gif.phpt index 218ef50..39ade09 100644 --- a/ext/gd/tests/gif.phpt +++ b/ext/gd/tests/gif.phpt @@ -122,7 +122,7 @@ if (check_box($i,$i,$i)) { } -$im = imagecreatefromjpeg($cwd . '/conv_test.jpeg'); +$im = imagecreatefromjpeg($cwd . '/conv_test.jpg'); imagefilledrectangle($im, 5,5, 10,10, 0xffffff); imagegif($im, $cwd . '/test_gif.gif'); imagegif($im, $cwd . '/test_gif_2.gif'); diff --git a/ext/gd/tests/jpeg2png.phpt b/ext/gd/tests/jpeg2png.phpt index 6e13651..8d14b33 100644 --- a/ext/gd/tests/jpeg2png.phpt +++ b/ext/gd/tests/jpeg2png.phpt @@ -26,7 +26,7 @@ jpeg <--> png conversion test echo "\n"; echo "JPEG to PNG conversion: "; - echo imagepng(imagecreatefromjpeg($cwd . "/conv_test.jpeg"), $cwd . "/test_png.png") ? 'ok' : 'failed'; + echo imagepng(imagecreatefromjpeg($cwd . "/conv_test.jpg"), $cwd . "/test_png.png") ? 'ok' : 'failed'; echo "\n"; echo "Generated PNG to JPEG conversion: "; diff --git a/ext/gd/tests/jpg2gd-mb.phpt b/ext/gd/tests/jpg2gd-mb.phpt index 85959b4..b7c0b98 100644 --- a/ext/gd/tests/jpg2gd-mb.phpt +++ b/ext/gd/tests/jpg2gd-mb.phpt @@ -15,11 +15,11 @@ jpeg <--> gd1/gd2 conversion test $cwd = __DIR__; echo "JPEG to GD1 conversion: "; - echo imagegd(imagecreatefromjpeg($cwd . "/conv_test私はガラスを食べられます.jpeg"), $cwd . "/test私はガラスを食べられます.gd1") ? 'ok' : 'failed'; + echo imagegd(imagecreatefromjpeg($cwd . "/conv_test私はガラスを食べられます.jpg"), $cwd . "/test私はガラスを食べられます.gd1") ? 'ok' : 'failed'; echo "\n"; echo "JPEG to GD2 conversion: "; - echo imagegd2(imagecreatefromjpeg($cwd . "/conv_test私はガラスを食べられます.jpeg"), $cwd . "/test私はガラスを食べられます.gd2") ? 'ok' : 'failed'; + echo imagegd2(imagecreatefromjpeg($cwd . "/conv_test私はガラスを食べられます.jpg"), $cwd . "/test私はガラスを食べられます.gd2") ? 'ok' : 'failed'; echo "\n"; echo "GD1 to JPEG conversion: "; diff --git a/ext/gd/tests/jpg2gd.phpt b/ext/gd/tests/jpg2gd.phpt index 672a392..6ec714e 100644 --- a/ext/gd/tests/jpg2gd.phpt +++ b/ext/gd/tests/jpg2gd.phpt @@ -15,11 +15,11 @@ jpeg <--> gd1/gd2 conversion test $cwd = __DIR__; echo "JPEG to GD1 conversion: "; - echo imagegd(imagecreatefromjpeg($cwd . "/conv_test.jpeg"), $cwd . "/test_jpeg.gd1") ? 'ok' : 'failed'; + echo imagegd(imagecreatefromjpeg($cwd . "/conv_test.jpg"), $cwd . "/test_jpeg.gd1") ? 'ok' : 'failed'; echo "\n"; echo "JPEG to GD2 conversion: "; - echo imagegd2(imagecreatefromjpeg($cwd . "/conv_test.jpeg"), $cwd . "/test_jpeg.gd2") ? 'ok' : 'failed'; + echo imagegd2(imagecreatefromjpeg($cwd . "/conv_test.jpg"), $cwd . "/test_jpeg.gd2") ? 'ok' : 'failed'; echo "\n"; echo "GD1 to JPEG conversion: ";
diff --git a/ext/exif/tests/bug48378.jpeg b/ext/exif/tests/bug48378.jpeg deleted file mode 100644 index 759d805..0000000 Binary files a/ext/exif/tests/bug48378.jpeg and /dev/null differ diff --git a/ext/exif/tests/bug48378.jpg b/ext/exif/tests/bug48378.jpg new file mode 100644 index 0000000..759d805 Binary files /dev/null and b/ext/exif/tests/bug48378.jpg differ diff --git a/ext/exif/tests/bug48378.phpt b/ext/exif/tests/bug48378.phpt index a830f22..a232bed 100644 --- a/ext/exif/tests/bug48378.phpt +++ b/ext/exif/tests/bug48378.phpt @@ -5,7 +5,7 @@ Bug #48378 (Infinite recursion due to corrupt JPEG) --FILE-- <?php exif_read_data( -__DIR__ . "/bug48378.jpeg", +__DIR__ . "/bug48378.jpg", "FILE,COMPUTED,ANY_TAG" ); ?> diff --git a/ext/exif/tests/bug54002.phpt b/ext/exif/tests/bug54002.phpt index 031afad..f9608b9 100644 --- a/ext/exif/tests/bug54002.phpt +++ b/ext/exif/tests/bug54002.phpt @@ -6,11 +6,11 @@ memory_limit=-1 <?php if (!extension_loaded('exif')) print 'skip exif extension not available';?> --FILE-- <?php -exif_read_data(__DIR__ . '/bug54002_1.jpeg'); -exif_read_data(__DIR__ . '/bug54002_2.jpeg'); +exif_read_data(__DIR__ . '/bug54002_1.jpg'); +exif_read_data(__DIR__ . '/bug54002_2.jpg'); ?> --EXPECTF-- -Warning: exif_read_data(bug54002_1.jpeg): Process tag(x0205=UndefinedTa): Illegal byte_count in %sbug54002.php on line %d +Warning: exif_read_data(bug54002_1.jpg): Process tag(x0205=UndefinedTa): Illegal byte_count in %sbug54002.php on line %d -Warning: exif_read_data(bug54002_2.jpeg): Process tag(x0205=UndefinedTa): Illegal byte_count in %sbug54002.php on line %d +Warning: exif_read_data(bug54002_2.jpg): Process tag(x0205=UndefinedTa): Illegal byte_count in %sbug54002.php on line %d diff --git a/ext/exif/tests/bug54002_1.jpeg b/ext/exif/tests/bug54002_1.jpeg deleted file mode 100644 index a622d6d..0000000 Binary files a/ext/exif/tests/bug54002_1.jpeg and /dev/null differ diff --git a/ext/exif/tests/bug54002_1.jpg b/ext/exif/tests/bug54002_1.jpg new file mode 100644 index 0000000..a622d6d Binary files /dev/null and b/ext/exif/tests/bug54002_1.jpg differ diff --git a/ext/exif/tests/bug54002_2.jpeg b/ext/exif/tests/bug54002_2.jpeg deleted file mode 100644 index a622d6d..0000000 Binary files a/ext/exif/tests/bug54002_2.jpeg and /dev/null differ diff --git a/ext/exif/tests/bug54002_2.jpg b/ext/exif/tests/bug54002_2.jpg new file mode 100644 index 0000000..a622d6d Binary files /dev/null and b/ext/exif/tests/bug54002_2.jpg differ diff --git a/ext/exif/tests/bug72603.jpeg b/ext/exif/tests/bug72603.jpeg deleted file mode 100644 index 1764c80..0000000 Binary files a/ext/exif/tests/bug72603.jpeg and /dev/null differ diff --git a/ext/exif/tests/bug72603.jpg b/ext/exif/tests/bug72603.jpg new file mode 100644 index 0000000..1764c80 Binary files /dev/null and b/ext/exif/tests/bug72603.jpg differ diff --git a/ext/exif/tests/bug72603.phpt b/ext/exif/tests/bug72603.phpt index eacb6ee..1df7bdb 100644 --- a/ext/exif/tests/bug72603.phpt +++ b/ext/exif/tests/bug72603.phpt @@ -4,8 +4,8 @@ Bug #72603 (Out of bound read in exif_process_IFD_in_MAKERNOTE) <?php if (!extension_loaded('exif')) print 'skip exif extension not available';?> --FILE-- <?php -var_dump(count(exif_read_data(__DIR__ . "/bug72603.jpeg"))); +var_dump(count(exif_read_data(__DIR__ . "/bug72603.jpg"))); ?> --EXPECTF-- -Warning: exif_read_data(bug72603.jpeg): %s in %s%ebug72603.php on line %d +Warning: exif_read_data(bug72603.jpg): %s in %s%ebug72603.php on line %d int(%d) diff --git a/ext/gd/tests/bug67325.jpeg b/ext/gd/tests/bug67325.jpeg deleted file mode 100644 index 82e8233..0000000 Binary files a/ext/gd/tests/bug67325.jpeg and /dev/null differ diff --git a/ext/gd/tests/bug67325.jpg b/ext/gd/tests/bug67325.jpg new file mode 100644 index 0000000..82e8233 Binary files /dev/null and b/ext/gd/tests/bug67325.jpg differ diff --git a/ext/gd/tests/bug67325.phpt b/ext/gd/tests/bug67325.phpt index 97072fe..8290946 100644 --- a/ext/gd/tests/bug67325.phpt +++ b/ext/gd/tests/bug67325.phpt @@ -10,7 +10,7 @@ if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.3', '<=')) { ?> --FILE-- <?php -$filename = __DIR__ . DIRECTORY_SEPARATOR . 'bug67325.jpeg'; +$filename = __DIR__ . DIRECTORY_SEPARATOR . 'bug67325.jpg'; $im = imagecreatefromjpeg($filename); imagetruecolortopalette($im, 0, 256); diff --git a/ext/gd/tests/bug77195.jpeg b/ext/gd/tests/bug77195.jpeg deleted file mode 100644 index 66f92cf..0000000 Binary files a/ext/gd/tests/bug77195.jpeg and /dev/null differ diff --git a/ext/gd/tests/bug77195.jpg b/ext/gd/tests/bug77195.jpg new file mode 100644 index 0000000..66f92cf Binary files /dev/null and b/ext/gd/tests/bug77195.jpg differ diff --git a/ext/gd/tests/bug77195.phpt b/ext/gd/tests/bug77195.phpt index 1eb9024..5aa1f51 100644 --- a/ext/gd/tests/bug77195.phpt +++ b/ext/gd/tests/bug77195.phpt @@ -7,7 +7,7 @@ if (!gd_info()['JPEG Support']) die('skip JPEG support not available'); ?> --FILE-- <?php -$filename = __DIR__ . '/bug77195.jpeg'; +$filename = __DIR__ . '/bug77195.jpg'; @imagecreatefromjpeg($filename); imagecreatefromjpeg($filename); ?> diff --git a/ext/gd/tests/conv_test.jpeg b/ext/gd/tests/conv_test.jpeg deleted file mode 100644 index 7283d1a..0000000 Binary files a/ext/gd/tests/conv_test.jpeg and /dev/null differ diff --git a/ext/gd/tests/conv_test.jpg b/ext/gd/tests/conv_test.jpg new file mode 100644 index 0000000..7283d1a Binary files /dev/null and b/ext/gd/tests/conv_test.jpg differ diff --git "a/ext/gd/tests/conv_test\347\247\201\343\201\257\343\202\254\343\203\251\343\202\271\343\202\222\351\243\237\343\201\271\343\202\211\343\202\214\343\201\276\343\201\231.jpeg" "b/ext/gd/tests/conv_test\347\247\201\343\201\257\343\202\254\343\203\251\343\202\271\343\202\222\351\243\237\343\201\271\343\202\211\343\202\214\343\201\276\343\201\231.jpeg" deleted file mode 100644 index 7283d1a..0000000 Binary files "a/ext/gd/tests/conv_test\347\247\201\343\201\257\343\202\254\343\203\251\343\202\271\343\202\222\351\243\237\343\201\271\343\202\211\343\202\214\343\201\276\343\201\231.jpeg" and /dev/null differ diff --git "a/ext/gd/tests/conv_test\347\247\201\343\201\257\343\202\254\343\203\251\343\202\271\343\202\222\351\243\237\343\201\271\343\202\211\343\202\214\343\201\276\343\201\231.jpg" "b/ext/gd/tests/conv_test\347\247\201\343\201\257\343\202\254\343\203\251\343\202\271\343\202\222\351\243\237\343\201\271\343\202\211\343\202\214\343\201\276\343\201\231.jpg" new file mode 100644 index 0000000..7283d1a Binary files /dev/null and "b/ext/gd/tests/conv_test\347\247\201\343\201\257\343\202\254\343\203\251\343\202\271\343\202\222\351\243\237\343\201\271\343\202\211\343\202\214\343\201\276\343\201\231.jpg" differ diff --git a/ext/gd/tests/gif.phpt b/ext/gd/tests/gif.phpt index 218ef50..39ade09 100644 --- a/ext/gd/tests/gif.phpt +++ b/ext/gd/tests/gif.phpt @@ -122,7 +122,7 @@ if (check_box($i,$i,$i)) { } -$im = imagecreatefromjpeg($cwd . '/conv_test.jpeg'); +$im = imagecreatefromjpeg($cwd . '/conv_test.jpg'); imagefilledrectangle($im, 5,5, 10,10, 0xffffff); imagegif($im, $cwd . '/test_gif.gif'); imagegif($im, $cwd . '/test_gif_2.gif'); diff --git a/ext/gd/tests/jpeg2png.phpt b/ext/gd/tests/jpeg2png.phpt index 6e13651..8d14b33 100644 --- a/ext/gd/tests/jpeg2png.phpt +++ b/ext/gd/tests/jpeg2png.phpt @@ -26,7 +26,7 @@ jpeg <--> png conversion test echo "\n"; echo "JPEG to PNG conversion: "; - echo imagepng(imagecreatefromjpeg($cwd . "/conv_test.jpeg"), $cwd . "/test_png.png") ? 'ok' : 'failed'; + echo imagepng(imagecreatefromjpeg($cwd . "/conv_test.jpg"), $cwd . "/test_png.png") ? 'ok' : 'failed'; echo "\n"; echo "Generated PNG to JPEG conversion: "; diff --git a/ext/gd/tests/jpg2gd-mb.phpt b/ext/gd/tests/jpg2gd-mb.phpt index 85959b4..b7c0b98 100644 --- a/ext/gd/tests/jpg2gd-mb.phpt +++ b/ext/gd/tests/jpg2gd-mb.phpt @@ -15,11 +15,11 @@ jpeg <--> gd1/gd2 conversion test $cwd = __DIR__; echo "JPEG to GD1 conversion: "; - echo imagegd(imagecreatefromjpeg($cwd . "/conv_test私はガラスを食べられます.jpeg"), $cwd . "/test私はガラスを食べられます.gd1") ? 'ok' : 'failed'; + echo imagegd(imagecreatefromjpeg($cwd . "/conv_test私はガラスを食べられます.jpg"), $cwd . "/test私はガラスを食べられます.gd1") ? 'ok' : 'failed'; echo "\n"; echo "JPEG to GD2 conversion: "; - echo imagegd2(imagecreatefromjpeg($cwd . "/conv_test私はガラスを食べられます.jpeg"), $cwd . "/test私はガラスを食べられます.gd2") ? 'ok' : 'failed'; + echo imagegd2(imagecreatefromjpeg($cwd . "/conv_test私はガラスを食べられます.jpg"), $cwd . "/test私はガラスを食べられます.gd2") ? 'ok' : 'failed'; echo "\n"; echo "GD1 to JPEG conversion: "; diff --git a/ext/gd/tests/jpg2gd.phpt b/ext/gd/tests/jpg2gd.phpt index 672a392..6ec714e 100644 --- a/ext/gd/tests/jpg2gd.phpt +++ b/ext/gd/tests/jpg2gd.phpt @@ -15,11 +15,11 @@ jpeg <--> gd1/gd2 conversion test $cwd = __DIR__; echo "JPEG to GD1 conversion: "; - echo imagegd(imagecreatefromjpeg($cwd . "/conv_test.jpeg"), $cwd . "/test_jpeg.gd1") ? 'ok' : 'failed'; + echo imagegd(imagecreatefromjpeg($cwd . "/conv_test.jpg"), $cwd . "/test_jpeg.gd1") ? 'ok' : 'failed'; echo "\n"; echo "JPEG to GD2 conversion: "; - echo imagegd2(imagecreatefromjpeg($cwd . "/conv_test.jpeg"), $cwd . "/test_jpeg.gd2") ? 'ok' : 'failed'; + echo imagegd2(imagecreatefromjpeg($cwd . "/conv_test.jpg"), $cwd . "/test_jpeg.gd2") ? 'ok' : 'failed'; echo "\n"; echo "GD1 to JPEG conversion: ";