alchemy-fr · aynsix · Feb 26, 2019 · Feb 26, 2019
diff --git a/.travis.yml b/.travis.yml
@@ -6,6 +6,7 @@ php:
   - 5.5
   - 5.6
   - 7.0
+  - 7.1
 
 matrix:
   fast_finish: true

diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
         "doctrine/cache": "^1.0",
         "doctrine/collections": "^1.0",
         "monolog/monolog": "^1.3",
-        "phpexiftool/exiftool": "10.10",
+        "phpexiftool/exiftool": "10.16",
         "symfony/console": "^2.1|^3.0",
         "symfony/process": "^2.1|^3.0"
     },

diff --git a/lib/PHPExiftool/Driver/Tag/Canon/CameraPictureStyle.php b/lib/PHPExiftool/Driver/Tag/Canon/CameraPictureStyle.php
@@ -0,0 +1,84 @@
+<?php
+
+/*
+ * This file is part of the PHPExifTool package.
+ *
+ * (c) Alchemy <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace PHPExiftool\Driver\Tag\Canon;
+
+use JMS\Serializer\Annotation\ExclusionPolicy;
+use PHPExiftool\Driver\AbstractTag;
+
+/**
+ * @ExclusionPolicy("all")
+ */
+class CameraPictureStyle extends AbstractTag
+{
+
+    protected $Id = 175;
+
+    protected $Name = 'CameraPictureStyle';
+
+    protected $FullName = 'Canon::CameraInfo7D';
+
+    protected $GroupName = 'Canon';
+
+    protected $g0 = 'MakerNotes';
+
+    protected $g1 = 'Canon';
+
+    protected $g2 = 'Camera';
+
+    protected $Type = 'int8u';
+
+    protected $Writable = true;
+
+    protected $Description = 'Camera Picture Style';
+
+    protected $flag_Permanent = true;
+
+    protected $Values = array(
+        33 => array(
+            'Id' => 33,
+            'Label' => 'User Defined 1',
+        ),
+        34 => array(
+            'Id' => 34,
+            'Label' => 'User Defined 2',
+        ),
+        35 => array(
+            'Id' => 35,
+            'Label' => 'User Defined 3',
+        ),
+        129 => array(
+            'Id' => 129,
+            'Label' => 'Standard',
+        ),
+        130 => array(
+            'Id' => 130,
+            'Label' => 'Portrait',
+        ),
+        131 => array(
+            'Id' => 131,
+            'Label' => 'Landscape',
+        ),
+        132 => array(
+            'Id' => 132,
+            'Label' => 'Neutral',
+        ),
+        133 => array(
+            'Id' => 133,
+            'Label' => 'Faithful',
+        ),
+        134 => array(
+            'Id' => 134,
+            'Label' => 'Monochrome',
+        ),
+    );
+
+}
diff --git a/lib/PHPExiftool/Driver/Tag/Canon/CanonModelID.php b/lib/PHPExiftool/Driver/Tag/Canon/CanonModelID.php
@@ -895,10 +895,38 @@ class CanonModelID extends AbstractTag
             'Id' => 60096512,
             'Label' => 'PowerShot G5 X',
         ),
+        60227584 => array(
+            'Id' => 60227584,
+            'Label' => 'PowerShot G7 X Mark II',
+        ),
+        60358656 => array(
+            'Id' => 60358656,
+            'Label' => 'PowerShot ELPH 360 HS / IXUS 285 HS / IXY 650',
+        ),
+        67174400 => array(
+            'Id' => 67174400,
+            'Label' => 'PowerShot SX540 HS',
+        ),
+        67239936 => array(
+            'Id' => 67239936,
+            'Label' => 'PowerShot SX420 IS',
+        ),
+        67305472 => array(
+            'Id' => 67305472,
+            'Label' => 'PowerShot ELPH 190 IS / IXUS 180 / IXY 190',
+        ),
         67371008 => array(
             'Id' => 67371008,
             'Label' => 'PowerShot G1',
         ),
+        67371009 => array(
+            'Id' => 67371009,
+            'Label' => 'IXY 180',
+        ),
+        67436544 => array(
+            'Id' => 67436544,
+            'Label' => 'PowerShot SX720 HS',
+        ),
         100925440 => array(
             'Id' => 100925440,
             'Label' => 'PowerShot S100 / Digital IXUS / IXY Digital',
@@ -1191,6 +1219,10 @@ class CanonModelID extends AbstractTag
             'Id' => '2147484455',
             'Label' => 'EOS Rebel T5 / 1200D / Kiss X70',
         ),
+        '2147484456' => array(
+            'Id' => '2147484456',
+            'Label' => 'EOS-1D X MARK II',
+        ),
         '2147484465' => array(
             'Id' => '2147484465',
             'Label' => 'EOS M',
@@ -1203,6 +1235,10 @@ class CanonModelID extends AbstractTag
             'Id' => '2147484487',
             'Label' => 'EOS Rebel T6s / 760D / 8000D',
         ),
+        '2147484496' => array(
+            'Id' => '2147484496',
+            'Label' => 'EOS 80D',
+        ),
         '2147484501' => array(
             'Id' => '2147484501',
             'Label' => 'EOS M2',
@@ -1219,6 +1255,10 @@ class CanonModelID extends AbstractTag
             'Id' => '2147484673',
             'Label' => 'EOS 5DS R',
         ),
+        '2147484676' => array(
+            'Id' => '2147484676',
+            'Label' => 'EOS Rebel T6 / 1300D / Kiss X80',
+        ),
     );
 
 }
diff --git a/lib/PHPExiftool/Driver/Tag/Canon/ColorDataVersion.php b/lib/PHPExiftool/Driver/Tag/Canon/ColorDataVersion.php
@@ -91,6 +91,14 @@ class ColorDataVersion extends AbstractTag
             'Id' => 12,
             'Label' => '12 (5DS/5DSR)',
         ),
+        12 => array(
+            'Id' => 13,
+            'Label' => '13 (80D)',
+        ),
+        13 => array(
+            'Id' => 14,
+            'Label' => '14 (1300D)',
+        ),
     );
 
 }
diff --git a/lib/PHPExiftool/Driver/Tag/Canon/LensType.php b/lib/PHPExiftool/Driver/Tag/Canon/LensType.php
@@ -529,7 +529,7 @@ class LensType extends AbstractTag
         ),
         '137.6' => array(
             'Id' => '137.6',
-            'Label' => 'Sigma 17-70mm f/2.8-4 DC Macro OS HSM',
+            'Label' => 'Sigma 17-70mm f/2.8-4 DC Macro OS HSM | C',
         ),
         '137.7' => array(
             'Id' => '137.7',
@@ -593,7 +593,11 @@ class LensType extends AbstractTag
         ),
         143 => array(
             'Id' => 143,
-            'Label' => 'Canon EF 500mm f/4L IS',
+            'Label' => 'Canon EF 500mm f/4L IS or Sigma Lens',
+        ),
+        '143.1' => array(
+            'Id' => '143.1',
+            'Label' => 'Sigma 17-70mm f/2.8-4 DC Macro OS HSM',
         ),
         144 => array(
             'Id' => 144,
@@ -723,6 +727,10 @@ class LensType extends AbstractTag
             'Id' => '160.4',
             'Label' => 'Tokina AT-X 116 AF Pro DX 11-16mm f/2.8',
         ),
+        '160.5' => array(
+            'Id' => '160.5',
+            'Label' => 'Tokina AT-X 11-20 F2.8 PRO DX Aspherical 11-20mm f/2.8',
+        ),
         161 => array(
             'Id' => 161,
             'Label' => 'Canon EF 28-70mm f/2.8L or Sigma or Tamron Lens',
@@ -781,7 +789,11 @@ class LensType extends AbstractTag
         ),
         168 => array(
             'Id' => 168,
-            'Label' => 'Canon EF 28mm f/1.8 USM',
+            'Label' => 'Canon EF 28mm f/1.8 USM or Sigma Lens',
+        ),
+        '168.1' => array(
+            'Id' => '168.1',
+            'Label' => 'Sigma 50-100mm f/1.8 DC HSM | A',
         ),
         169 => array(
             'Id' => 169,
@@ -1121,7 +1133,7 @@ class LensType extends AbstractTag
         ),
         '234.1' => array(
             'Id' => '234.1',
-            'Label' => 'Tokina AT-X 12-28mm f/4 PRO DX',
+            'Label' => 'Tokina AT-X 12-28 PRO DX 12-28mm f/4',
         ),
         235 => array(
             'Id' => 235,
@@ -1355,6 +1367,14 @@ class LensType extends AbstractTag
             'Id' => 4156,
             'Label' => 'Canon EF 50mm f/1.8 STM',
         ),
+        36912 => array(
+            'Id' => 36912,
+            'Label' => 'Canon EF-S 18-135mm f/3.5-5.6 IS USM',
+        ),
+        65535 => array(
+            'Id' => 65535,
+            'Label' => 'n/a',
+        ),
     );
 
 }
diff --git a/lib/PHPExiftool/Driver/Tag/CanonCustom/InitialAFPointAIServoAF.php b/lib/PHPExiftool/Driver/Tag/CanonCustom/InitialAFPointAIServoAF.php
@@ -0,0 +1,60 @@
+<?php
+
+/*
+ * This file is part of the PHPExifTool package.
+ *
+ * (c) Alchemy <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace PHPExiftool\Driver\Tag\CanonCustom;
+
+use JMS\Serializer\Annotation\ExclusionPolicy;
+use PHPExiftool\Driver\AbstractTag;
+
+/**
+ * @ExclusionPolicy("all")
+ */
+class InitialAFPointAIServoAF extends AbstractTag
+{
+
+    protected $Id = 1310;
+
+    protected $Name = 'InitialAFPointAIServoAF';
+
+    protected $FullName = 'CanonCustom::Functions2';
+
+    protected $GroupName = 'CanonCustom';
+
+    protected $g0 = 'MakerNotes';
+
+    protected $g1 = 'CanonCustom';
+
+    protected $g2 = 'Camera';
+
+    protected $Type = 'int32s';
+
+    protected $Writable = true;
+
+    protected $Description = 'Initial AF Point AI Servo AF';
+
+    protected $flag_Permanent = true;
+
+    protected $Values = array(
+        0 => array(
+            'Id' => 0,
+            'Label' => 'Auto',
+        ),
+        1 => array(
+            'Id' => 1,
+            'Label' => 'Initial AF point selected',
+        ),
+        2 => array(
+            'Id' => 2,
+            'Label' => 'Manual AF point',
+        ),
+    );
+
+}
diff --git a/lib/PHPExiftool/Driver/Tag/CanonRaw/CanonModelID.php b/lib/PHPExiftool/Driver/Tag/CanonRaw/CanonModelID.php
@@ -895,10 +895,38 @@ class CanonModelID extends AbstractTag
             'Id' => 60096512,
             'Label' => 'PowerShot G5 X',
         ),
+        60227584 => array(
+            'Id' => 60227584,
+            'Label' => 'PowerShot G7 X Mark II',
+        ),
+        60358656 => array(
+            'Id' => 60358656,
+            'Label' => 'PowerShot ELPH 360 HS / IXUS 285 HS / IXY 650',
+        ),
+        67174400 => array(
+            'Id' => 67174400,
+            'Label' => 'PowerShot SX540 HS',
+        ),
+        67239936 => array(
+            'Id' => 67239936,
+            'Label' => 'PowerShot SX420 IS',
+        ),
+        67305472 => array(
+            'Id' => 67305472,
+            'Label' => 'PowerShot ELPH 190 IS / IXUS 180 / IXY 190',
+        ),
         67371008 => array(
             'Id' => 67371008,
             'Label' => 'PowerShot G1',
         ),
+        67371009 => array(
+            'Id' => 67371009,
+            'Label' => 'IXY 180',
+        ),
+        67436544 => array(
+            'Id' => 67436544,
+            'Label' => 'PowerShot SX720 HS',
+        ),
         100925440 => array(
             'Id' => 100925440,
             'Label' => 'PowerShot S100 / Digital IXUS / IXY Digital',
@@ -1191,6 +1219,10 @@ class CanonModelID extends AbstractTag
             'Id' => '2147484455',
             'Label' => 'EOS Rebel T5 / 1200D / Kiss X70',
         ),
+        '2147484456' => array(
+            'Id' => '2147484456',
+            'Label' => 'EOS-1D X MARK II',
+        ),
         '2147484465' => array(
             'Id' => '2147484465',
             'Label' => 'EOS M',
@@ -1203,6 +1235,10 @@ class CanonModelID extends AbstractTag
             'Id' => '2147484487',
             'Label' => 'EOS Rebel T6s / 760D / 8000D',
         ),
+        '2147484496' => array(
+            'Id' => '2147484496',
+            'Label' => 'EOS 80D',
+        ),
         '2147484501' => array(
             'Id' => '2147484501',
             'Label' => 'EOS M2',
@@ -1219,6 +1255,10 @@ class CanonModelID extends AbstractTag
             'Id' => '2147484673',
             'Label' => 'EOS 5DS R',
         ),
+        '2147484676' => array(
+            'Id' => '2147484676',
+            'Label' => 'EOS Rebel T6 / 1300D / Kiss X80',
+        ),
     );
 
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,7 @@ php: @@
       - 5.5
       - 5.6
       - 7.0
+      - 7.1
     matrix:
       fast_finish: true
@@ Expand Down @@