com php-src: - add a test for makernote (#72682) - reduce image size - add panasonic.jpg sample: ext/exif/tests/bug72735/bug72682.phpt
ext/exif/tests/bug72735/bug72735.phpt ext/exif/tests/bug72735/nokia.jpg ext/exif/tests/bug72735/panasonic.jpg ext/exif/tests/bug72735/samsung.jpg

From: Date: Wed, 03 Aug 2016 16:33:26 +0000
Subject: com php-src: - add a test for makernote (#72682) - reduce image size - add panasonic.jpg sample: ext/exif/tests/bug72735/bug72682.phpt
ext/exif/tests/bug72735/bug72735.phpt ext/exif/tests/bug72735/nokia.jpg ext/exif/tests/bug72735/panasonic.jpg ext/exif/tests/bug72735/samsung.jpg
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-93588@lists.php.net to get a copy of this message
Commit: 456e10eb9ba323e35a6e1ecccacbd3d70a219ee7 Author: Remi Collet <remi@php.net> Wed, 3 Aug 2016 18:33:26 +0200 Parents: be8f1580cfcbc9d3213e86fcdebb579e9df90e61 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=456e10eb9ba323e35a6e1ecccacbd3d70a219ee7 Log: - add a test for makernote (#72682) - reduce image size - add panasonic.jpg sample Bugs: https://bugs.php.net/72682 Changed paths: A ext/exif/tests/bug72735/bug72682.phpt M ext/exif/tests/bug72735/bug72735.phpt M ext/exif/tests/bug72735/nokia.jpg A ext/exif/tests/bug72735/panasonic.jpg M ext/exif/tests/bug72735/samsung.jpg Diff: diff --git a/ext/exif/tests/bug72735/bug72682.phpt b/ext/exif/tests/bug72735/bug72682.phpt new file mode 100644 index 0000000..b3f1779 --- /dev/null +++ b/ext/exif/tests/bug72735/bug72682.phpt @@ -0,0 +1,17 @@ +--TEST-- +Bug #72735 MakerNote regression +--SKIPIF-- +<?php if (!extension_loaded('exif')) print 'skip exif extension not available';?> +--FILE-- +<?php +foreach (['nokia.jpg', 'samsung.jpg', 'panasonic.jpg'] as $picture) { + echo $picture . ': '; + + $info = exif_read_data(__DIR__ . DIRECTORY_SEPARATOR . $picture); + var_dump($info['MakerNote']); +} +?> +--EXPECTF-- +nokia..jpg: string(5) "Nikon" +samsung.jpg: NULL +panasonic.jpg: string(9) "Panasonic" diff --git a/ext/exif/tests/bug72735/bug72735.phpt b/ext/exif/tests/bug72735/bug72735.phpt index 24b2a04..38d9ed2 100644 --- a/ext/exif/tests/bug72735/bug72735.phpt +++ b/ext/exif/tests/bug72735/bug72735.phpt @@ -4,7 +4,7 @@ Bug #72735 (Samsung picture thumb not read (zero size)) <?php if (!extension_loaded('exif')) print 'skip exif extension not available';?> --FILE-- <?php -foreach (['nokia.jpg', 'samsung.jpg'] as $picture) { +foreach (['nokia.jpg', 'samsung.jpg', 'panasonic.jpg'] as $picture) { echo $picture . ': '; $len = strlen(exif_thumbnail(__DIR__ . DIRECTORY_SEPARATOR . $picture)); @@ -21,3 +21,4 @@ foreach (['nokia.jpg', 'samsung.jpg'] as $picture) { --EXPECTF-- nokia.jpg: int(5899) samsung.jpg: int(5778) +panasonic.jpg: int(651) diff --git a/ext/exif/tests/bug72735/nokia.jpg b/ext/exif/tests/bug72735/nokia.jpg index 48367bf..f402d76 100644 Binary files a/ext/exif/tests/bug72735/nokia.jpg and b/ext/exif/tests/bug72735/nokia.jpg differ diff --git a/ext/exif/tests/bug72735/panasonic.jpg b/ext/exif/tests/bug72735/panasonic.jpg new file mode 100644 index 0000000..35713e6 Binary files /dev/null and b/ext/exif/tests/bug72735/panasonic.jpg differ diff --git a/ext/exif/tests/bug72735/samsung.jpg b/ext/exif/tests/bug72735/samsung.jpg index 7009606..1ec51ea 100644 Binary files a/ext/exif/tests/bug72735/samsung.jpg and b/ext/exif/tests/bug72735/samsung.jpg differ

« previous php.cvs (#93588) next »