From: Remi Collet <remi@php.net>
Date: Wed, 3 Aug 2016 16:33:26 +0000 (+0200)
Subject: - add a test for makernote (#72682)
X-Git-Tag: php-7.2.0alpha1~1558^2~54
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=456e10eb9ba323e35a6e1ecccacbd3d70a219ee7;p=php

- add a test for makernote (#72682)
- reduce image size
- add panasonic.jpg sample
---

diff --git a/ext/exif/tests/bug72735/bug72682.phpt b/ext/exif/tests/bug72735/bug72682.phpt
new file mode 100644
index 0000000000..b3f17791a3
--- /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 24b2a04f35..38d9ed2199 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 48367bfb84..f402d765a6 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 0000000000..35713e63a1
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 70096066a8..1ec51eaf0c 100644
Binary files a/ext/exif/tests/bug72735/samsung.jpg and b/ext/exif/tests/bug72735/samsung.jpg differ