diff options
author | Peter Kokot <peterkokot@gmail.com> | 2019-05-11 03:22:19 +0200 |
---|---|---|
committer | Peter Kokot <peterkokot@gmail.com> | 2019-05-11 03:22:19 +0200 |
commit | a68e0767b349360344fcdfa0f853bf577c37adbd (patch) | |
tree | 564a7e04b7a875eaaf992a1fed845f25e11cd80b /ext | |
parent | e586d3f447e35fa0ddb7fc831dea36bcf5739104 (diff) | |
download | php-git-a68e0767b349360344fcdfa0f853bf577c37adbd.tar.gz |
Rename *.jpeg files to *.jpg
These file extensions are not part of these tests and *.jpg is more
common.
Diffstat (limited to 'ext')
-rw-r--r-- | ext/exif/tests/bug48378.jpg (renamed from ext/exif/tests/bug48378.jpeg) | bin | 2566 -> 2566 bytes | |||
-rw-r--r-- | ext/exif/tests/bug48378.phpt | 2 | ||||
-rw-r--r-- | ext/exif/tests/bug54002.phpt | 8 | ||||
-rw-r--r-- | ext/exif/tests/bug54002_1.jpg (renamed from ext/exif/tests/bug54002_1.jpeg) | bin | 87599 -> 87599 bytes | |||
-rw-r--r-- | ext/exif/tests/bug54002_2.jpg (renamed from ext/exif/tests/bug54002_2.jpeg) | bin | 87599 -> 87599 bytes | |||
-rw-r--r-- | ext/exif/tests/bug72603.jpg (renamed from ext/exif/tests/bug72603.jpeg) | bin | 3711 -> 3711 bytes | |||
-rw-r--r-- | ext/exif/tests/bug72603.phpt | 4 | ||||
-rw-r--r-- | ext/gd/tests/bug67325.jpg (renamed from ext/gd/tests/bug67325.jpeg) | bin | 13608 -> 13608 bytes | |||
-rw-r--r-- | ext/gd/tests/bug67325.phpt | 2 | ||||
-rw-r--r-- | ext/gd/tests/bug77195.jpg (renamed from ext/gd/tests/bug77195.jpeg) | bin | 1038 -> 1038 bytes | |||
-rw-r--r-- | ext/gd/tests/bug77195.phpt | 2 | ||||
-rw-r--r-- | ext/gd/tests/conv_test.jpg (renamed from ext/gd/tests/conv_test.jpeg) | bin | 2317 -> 2317 bytes | |||
-rw-r--r-- | ext/gd/tests/conv_test私はガラスを食べられます.jpg (renamed from ext/gd/tests/conv_test私はガラスを食べられます.jpeg) | bin | 2317 -> 2317 bytes | |||
-rw-r--r-- | ext/gd/tests/gif.phpt | 2 | ||||
-rw-r--r-- | ext/gd/tests/jpeg2png.phpt | 2 | ||||
-rw-r--r-- | ext/gd/tests/jpg2gd-mb.phpt | 4 | ||||
-rw-r--r-- | ext/gd/tests/jpg2gd.phpt | 4 |
17 files changed, 15 insertions, 15 deletions
diff --git a/ext/exif/tests/bug48378.jpeg b/ext/exif/tests/bug48378.jpg Binary files differindex 759d805709..759d805709 100644 --- a/ext/exif/tests/bug48378.jpeg +++ b/ext/exif/tests/bug48378.jpg diff --git a/ext/exif/tests/bug48378.phpt b/ext/exif/tests/bug48378.phpt index a830f226b1..a232bedf43 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 031afad072..f9608b9939 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.jpg Binary files differindex a622d6d213..a622d6d213 100644 --- a/ext/exif/tests/bug54002_1.jpeg +++ b/ext/exif/tests/bug54002_1.jpg diff --git a/ext/exif/tests/bug54002_2.jpeg b/ext/exif/tests/bug54002_2.jpg Binary files differindex a622d6d213..a622d6d213 100644 --- a/ext/exif/tests/bug54002_2.jpeg +++ b/ext/exif/tests/bug54002_2.jpg diff --git a/ext/exif/tests/bug72603.jpeg b/ext/exif/tests/bug72603.jpg Binary files differindex 1764c805fb..1764c805fb 100644 --- a/ext/exif/tests/bug72603.jpeg +++ b/ext/exif/tests/bug72603.jpg diff --git a/ext/exif/tests/bug72603.phpt b/ext/exif/tests/bug72603.phpt index eacb6ee45a..1df7bdb055 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.jpg Binary files differindex 82e8233a76..82e8233a76 100644 --- a/ext/gd/tests/bug67325.jpeg +++ b/ext/gd/tests/bug67325.jpg diff --git a/ext/gd/tests/bug67325.phpt b/ext/gd/tests/bug67325.phpt index 97072fe14e..8290946c0f 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.jpg Binary files differindex 66f92cf946..66f92cf946 100644 --- a/ext/gd/tests/bug77195.jpeg +++ b/ext/gd/tests/bug77195.jpg diff --git a/ext/gd/tests/bug77195.phpt b/ext/gd/tests/bug77195.phpt index 1eb9024ce8..5aa1f51b02 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.jpg Binary files differindex 7283d1a475..7283d1a475 100644 --- a/ext/gd/tests/conv_test.jpeg +++ b/ext/gd/tests/conv_test.jpg diff --git a/ext/gd/tests/conv_test私はガラスを食べられます.jpeg b/ext/gd/tests/conv_test私はガラスを食べられます.jpg Binary files differindex 7283d1a475..7283d1a475 100644 --- a/ext/gd/tests/conv_test私はガラスを食べられます.jpeg +++ b/ext/gd/tests/conv_test私はガラスを食べられます.jpg diff --git a/ext/gd/tests/gif.phpt b/ext/gd/tests/gif.phpt index 218ef50fa4..39ade092c2 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 6e136514a8..8d14b33e3a 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 85959b4271..b7c0b98ab4 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 672a392df0..6ec714ef27 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: "; |