exiftool_vendored 10.25.0 → 10.31.0

data/bin/{Image-ExifTool-10.25 → Image-ExifTool-10.31}/lib/Image/ExifTool/Apple.pm

@@ -4,6 +4,8 @@
 # Description:  Apple EXIF maker notes tags
 #
 # Revisions:    2013-09-13 - P. Harvey Created
+#
+# References:   1) http://www.photoinvestigator.co/blog/the-mystery-of-maker-apple-metadata/
 #------------------------------------------------------------------------------
 
 package Image::ExifTool::Apple;
@@ -13,30 +15,48 @@ use vars qw($VERSION);
 use Image::ExifTool::Exif;
 use Image::ExifTool::PLIST;
 
-$VERSION = '1.02';
+$VERSION = '1.03';
 
+# Apple iPhone metadata (ref PH)
 %Image::ExifTool::Apple::Main = (
     WRITE_PROC => \&Image::ExifTool::Exif::WriteExif,
     CHECK_PROC => \&Image::ExifTool::Exif::CheckExif,
     WRITABLE => 1,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Image' },
-    NOTES => 'Tags extracted from maker notes of images from the iPhone 5 with iOS 7.',
+    NOTES => 'Tags extracted from the maker notes of iPhone images.',
     # 0x0001 - int32s: seen 0,1,2,3,4
     # 0x0002 - binary plist with a single data object of size 512 bytes (iPhone5s)
     0x0003 => {
-        Name => 'RunTime',
+        Name => 'RunTime', # (includes time plugged in, but not when suspended, ref 1)
         SubDirectory => { TagTable => 'Image::ExifTool::Apple::RunTime' },
     },
     # 0x0004 - int32s: normally 1, but 0 for low-light images
-    # 0x0005 - int32s: seen values 147-247, and 100 for blank images
-    # 0x0006 - int32s: seen values 120-258, and 20 for blank images
+    # 0x0005 - int32s: seen values 113-247, and 100 for blank images
+    # 0x0006 - int32s: seen values 27-258, and 20 for blank images
     # 0x0007 - int32s: seen 1
-    # 0x0008 - rational64s[3]: eg) "0.02683717579 -0.7210501641 -0.6948792783"
-    # 0x0009 - int32s: seen 19,531
+    0x0008 => { #1
+        Name => 'AccelerationVector',
+        Groups => { 2 => 'Camera' },
+        Writable => 'rational64s',
+        Count => 3,
+        # Note: the directions are contrary to the Apple documentation (which have the
+        # signs of all axes reversed -- apparently the Apple geeks aren't very good
+        # with basic physics, and don't understand the concept of acceleration.  See
+        # http://nscookbook.com/2013/03/ios-programming-recipe-19-using-core-motion-to-access-gyro-and-accelerometer/
+        # for one of the few correct descriptions of this).  Note that this leads to
+        # a left-handed coordinate system for acceleration.
+        Notes => q{
+            XYZ coordinates of the acceleration vector in units of g.  As viewed from
+            the front of the phone, positive X is toward the left side, positive Y is
+            toward the bottom, and positive Z points into the face of the phone
+        },
+    },
+    # 0x0009 - int32s: seen 19,275,531,4371
     0x000a => {
         Name => 'HDRImageType',
         Writable => 'int32s',
         PrintConv => {
+            # 2 => ? (iPad mini 2) 
             3 => 'HDR Image',
             4 => 'Original Image',
         },
@@ -47,12 +67,16 @@ $VERSION = '1.02';
         Notes => 'unique ID for all images in a burst',
     },
     # 0x000c - rational64s[2]: eg) "0.1640625 0.19921875"
-    # 0x000d - int32s: 0,1,6
-    # 0x000e - int32s: 0,1,12
+    # 0x000d - int32s: 0,1,6,20,40
+    # 0x000e - int32s: 0,1,4,12 (Orienation? 0=landscape? 4=portrait? ref 1)
     # 0x000f - int32s: 2,3
     # 0x0010 - int32s: 1
     # 0x0011 - string[37]: some type of UID, eg. "FFCBAC24-E547-4BBC-AF47-38B1A3D845E3\0" (iPhone 6s, iOS 6.1)
-    # 0x0014 - int32s: 1,2,3,5 (iPhone 6s, iOS 6.1)
+    # 0x0014 - int32s: 1,2,3,4,5 (iPhone 6s, iOS 6.1)
+    0x0015 => {
+        Name => 'ImageUniqueID',
+        Writable => 'string',
+    },
 );
 
 # PLIST-format CMTime structure (ref PH)

data/bin/{Image-ExifTool-10.25 → Image-ExifTool-10.31}/lib/Image/ExifTool/BuildTagLookup.pm

@@ -32,7 +32,7 @@ use Image::ExifTool::XMP;
 use Image::ExifTool::Canon;
 use Image::ExifTool::Nikon;
 
-$VERSION = '2.97';
+$VERSION = '3.00';
 @ISA = qw(Exporter);
 
 sub NumbersFirst($$);
@@ -68,9 +68,6 @@ my %tweakOrder = (
     FLIR    => 'Casio',
     FujiFilm => 'FLIR',
     Kodak   => 'JVC',
-   'Kodak::IFD' => 'Kodak::Unknown',
-   'Kodak::TextualInfo' => 'Kodak::IFD',
-   'Kodak::Processing' => 'Kodak::TextualInfo',
     Leaf    => 'Kodak',
     Minolta => 'Leaf',
     Motorola => 'Minolta',
@@ -164,8 +161,8 @@ B<Tag ID>, B<Index#> or B<Sequence> is given in the first column of each
 table.  A B<Tag ID> is the computer-readable equivalent of a tag name, and
 is the identifier that is actually stored in the file.  B<Index#> refers to
 the location of a value when found at a fixed position within a data block
-(B<#> is the multiplier for calculating a byte offset: B<1>, B<2> or B<4>).
-B<Sequence> gives the order of values for a serial data stream.
+(B<#> is the multiplier for calculating a byte offset: B<1>, B<2>, B<4> or
+B<8>). B<Sequence> gives the order of values for a serial data stream.
 
 A B<Tag Name> is the handle by which the information is accessed in
 ExifTool.  In some instances, more than one name may correspond to a single
@@ -197,7 +194,7 @@ when the print conversion is disabled (by setting PrintConv to 0, using the
 -n option, or suffixing the tag name with a C<#> character).  An exclamation
 point (C<!>) indicates a tag that is considered I<Unsafe> to write under
 normal circumstances.  These tags are not written unless specified
-explicitly (ie. wildcards and "all" may not be used), and care should be
+explicitly (ie. not when wildcards or "all" are used), and care should be
 taken when editing them manually since they may affect the way an image is
 rendered.  An asterisk (C<*>) indicates a I<Protected> tag which is not
 writable directly, but is written automatically by ExifTool (often when a
@@ -243,11 +240,11 @@ B<Group> listed below is used unless another group is specified.
 
 The table below lists all EXIF tags.  Also listed are TIFF, DNG, HDP and
 other tags which are not part of the EXIF specification, but may co-exist
-with EXIF tags in some images.  Tags which are part of the EXIF 2.3
+with EXIF tags in some images.  Tags which are part of the EXIF 2.31
 specification have an underlined B<Tag Name> in the HTML version of this
 documentation.  See
-L<http://www.cipa.jp/std/documents/e/DC-008-2012_E.pdf> for the official
-EXIF 2.3 specification.
+L<http://www.cipa.jp/std/documents/e/DC-008-Translation-2016-E.pdf> for the
+official EXIF 2.31 specification.
 },
     GPS => q{
 These GPS tags are part of the EXIF standard, and are stored in a separate
@@ -609,32 +606,34 @@ my %shortcutNotes = (
 # EXIF table tag ID's which are part of the EXIF 2.3 specification
 # (used only to add underlines in HTML version of EXIF Tag Table)
 my %exifSpec = (
-    0x100 => 1,  0x212 => 1,   0x9204 => 1,  0xa217 => 1,
-    0x101 => 1,  0x213 => 1,   0x9205 => 1,  0xa300 => 1,
-    0x102 => 1,  0x214 => 1,   0x9206 => 1,  0xa301 => 1,
-    0x103 => 1,  0x8298 => 1,  0x9207 => 1,  0xa302 => 1,
-    0x106 => 1,  0x829a => 1,  0x9208 => 1,  0xa401 => 1,
-    0x10e => 1,  0x829d => 1,  0x9209 => 1,  0xa402 => 1,
-    0x10f => 1,  0x8769 => 1,  0x920a => 1,  0xa403 => 1,
-    0x110 => 1,  0x8822 => 1,  0x9214 => 1,  0xa404 => 1,
-    0x111 => 1,  0x8824 => 1,  0x927c => 1,  0xa405 => 1,
-    0x112 => 1,  0x8825 => 1,  0x9286 => 1,  0xa406 => 1,
-    0x115 => 1,  0x8827 => 1,  0x9290 => 1,  0xa407 => 1,
-    0x116 => 1,  0x8828 => 1,  0x9291 => 1,  0xa408 => 1,
-    0x117 => 1,  0x8830 => 1,  0x9292 => 1,  0xa409 => 1,
-    0x11a => 1,  0x8831 => 1,  0xa000 => 1,  0xa40a => 1,
-    0x11b => 1,  0x8832 => 1,  0xa001 => 1,  0xa40b => 1,
-    0x11c => 1,  0x8833 => 1,  0xa002 => 1,  0xa40c => 1,
-    0x128 => 1,  0x8834 => 1,  0xa003 => 1,  0xa420 => 1,
-    0x12d => 1,  0x8835 => 1,  0xa004 => 1,  0xa430 => 1,
-    0x131 => 1,  0x9000 => 1,  0xa005 => 1,  0xa431 => 1,
-    0x132 => 1,  0x9003 => 1,  0xa20b => 1,  0xa432 => 1,
-    0x13b => 1,  0x9004 => 1,  0xa20c => 1,  0xa433 => 1,
-    0x13e => 1,  0x9101 => 1,  0xa20e => 1,  0xa434 => 1,
-    0x13f => 1,  0x9102 => 1,  0xa20f => 1,  0xa435 => 1,
-    0x201 => 1,  0x9201 => 1,  0xa210 => 1,
-    0x202 => 1,  0x9202 => 1,  0xa214 => 1,
-    0x211 => 1,  0x9203 => 1,  0xa215 => 1,
+    0x100 => 1,  0x214 => 1,   0x9205 => 1,  0xa210 => 1,
+    0x101 => 1,  0x8298 => 1,  0x9206 => 1,  0xa214 => 1,
+    0x102 => 1,  0x829a => 1,  0x9207 => 1,  0xa215 => 1,
+    0x103 => 1,  0x829d => 1,  0x9208 => 1,  0xa217 => 1,
+    0x106 => 1,  0x8769 => 1,  0x9209 => 1,  0xa300 => 1,
+    0x10e => 1,  0x8822 => 1,  0x920a => 1,  0xa301 => 1,
+    0x10f => 1,  0x8824 => 1,  0x9214 => 1,  0xa302 => 1,
+    0x110 => 1,  0x8825 => 1,  0x927c => 1,  0xa401 => 1,
+    0x111 => 1,  0x8827 => 1,  0x9286 => 1,  0xa402 => 1,
+    0x112 => 1,  0x8828 => 1,  0x9290 => 1,  0xa403 => 1,
+    0x115 => 1,  0x8830 => 1,  0x9291 => 1,  0xa404 => 1,
+    0x116 => 1,  0x8831 => 1,  0x9292 => 1,  0xa405 => 1,
+    0x117 => 1,  0x8832 => 1,  0x9400 => 1,  0xa406 => 1,
+    0x11a => 1,  0x8833 => 1,  0x9401 => 1,  0xa407 => 1,
+    0x11b => 1,  0x8834 => 1,  0x9402 => 1,  0xa408 => 1,
+    0x11c => 1,  0x8835 => 1,  0x9403 => 1,  0xa409 => 1,
+    0x128 => 1,  0x9000 => 1,  0x9404 => 1,  0xa40a => 1,
+    0x12d => 1,  0x9003 => 1,  0x9405 => 1,  0xa40b => 1,
+    0x131 => 1,  0x9004 => 1,  0xa000 => 1,  0xa40c => 1,
+    0x132 => 1,  0x9010 => 1,  0xa001 => 1,  0xa420 => 1,
+    0x13b => 1,  0x9011 => 1,  0xa002 => 1,  0xa430 => 1,
+    0x13e => 1,  0x9012 => 1,  0xa003 => 1,  0xa431 => 1,
+    0x13f => 1,  0x9101 => 1,  0xa004 => 1,  0xa432 => 1,
+    0x201 => 1,  0x9102 => 1,  0xa005 => 1,  0xa433 => 1,
+    0x202 => 1,  0x9201 => 1,  0xa20b => 1,  0xa434 => 1,
+    0x211 => 1,  0x9202 => 1,  0xa20c => 1,  0xa435 => 1,
+    0x212 => 1,  0x9203 => 1,  0xa20e => 1,
+    0x213 => 1,  0x9204 => 1,  0xa20f => 1,
 );
 # same thing for RIFF INFO tags found in the EXIF spec
 my %riffSpec = (
@@ -812,8 +811,8 @@ TagID:  foreach $tagID (@keys) {
                     $case{$lc} = $name;
                 }
                 my $format = $$tagInfo{Format};
-                # validate Name (must not start with a digit or else XML output will not be valid)
-                # (must not start with a dash or exiftool command line may get confused)
+                # validate Name (must not start with a digit or else XML output will not be valid;
+                # must not start with a dash or exiftool command line may get confused)
                 if ($name !~ /^[_A-Za-z][-\w]+$/ and
                     # single-character subdirectory names are allowed
                     (not $$tagInfo{SubDirectory} or $name !~ /^[_A-Za-z]$/))
@@ -1637,8 +1636,28 @@ sub Doc2Html($)
 # Inputs: 0) table list ref, 1) reference to tweak hash
 sub TweakOrder($$)
 {
+    local $_;
     my ($sortedTables, $tweakOrder) = @_;
     my @tweak = sort keys %$tweakOrder;
+    my (%addedMain, @sorted);
+    # flag files which have a "Main" table
+    foreach (@$sortedTables) {
+        $addedMain{$1} = 0 if /^Image::ExifTool::(\w+)::(\w+)/ and $2 eq 'Main';
+    }
+    # make sure that the main table always comes first in each file
+    foreach (@$sortedTables) {
+        if (/^Image::ExifTool::(\w+)::(\w+)/) {
+            if ($addedMain{$1}) {
+                next if $2 eq 'Main';   # don't add again
+            } elsif (defined $addedMain{$1}) {
+                push @sorted, "Image::ExifTool::${1}::Main" if $2 ne 'Main';
+                $addedMain{$1} = 1;
+            }
+        }
+        push @sorted, $_;
+    }
+    @$sortedTables = @sorted;
+    # apply manual tweaks
     while (@tweak) {
         my $table = shift @tweak;
         my $first = $$tweakOrder{$table};
@@ -2078,6 +2097,15 @@ sub WriteTagNames($$)
         } else {
             my $table = GetTagTable($tableName);
             $notes = $$table{NOTES};
+            if ($$table{NAMESPACE}) {
+                my $ns = $Image::ExifTool::XMP::stdXlatNS{$$table{NAMESPACE}} || $$table{NAMESPACE};
+                my $msg = "These tags belong to the ExifTool XMP-$ns family 1 group.";
+                if ($notes) {
+                    $notes .= "\n\n" . $msg;
+                } else {
+                    $notes = $msg;
+                }
+            }
             $longTags = $$table{VARS}{LONG_TAGS} if $$table{VARS};
             if ($$table{GROUPS}{0} eq 'Composite') {
                 $composite = 1;
@@ -2489,10 +2517,18 @@ validation and consistency checks on the tag tables.
 
   $builder = new Image::ExifTool::BuildTagLookup;
 
+  # update Image::ExifTool::TagLookup
   $ok = $builder->WriteTagLookup('lib/Image/ExifTool/TagLookup.pm');
 
+  # update the tag name documentation
   $ok = $builder->WriteTagNames('lib/Image/ExifTool/TagNames.pod','html');
 
+  # print some statistics
+  my $count = $$builder{COUNT};
+  foreach (sort keys %$count) {
+      printf "%5d %s\n", $$count{$_}, $_;
+  }
+
 =head1 MEMBER VARIABLES
 
 =over 4

data/bin/{Image-ExifTool-10.25 → Image-ExifTool-10.31}/lib/Image/ExifTool/Canon.pm

@@ -85,7 +85,7 @@ sub ProcessSerialData($$$);
 sub ProcessFilters($$$);
 sub SwapWords($);
 
-$VERSION = '3.65';
+$VERSION = '3.69';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
@@ -197,6 +197,7 @@ $VERSION = '3.65';
     52 => 'Canon EF-S 18-55mm f/3.5-5.6 IS II', #PH
     53 => 'Canon EF-S 18-55mm f/3.5-5.6 III', #Jon Charnas
     54 => 'Canon EF-S 55-250mm f/4-5.6 IS II', #47
+    60 => 'Irix 11mm f/4', #50
     94 => 'Canon TS-E 17mm f/4L', #42
     95 => 'Canon TS-E 24.0mm f/3.5 L II', #43
     124 => 'Canon MP-E 65mm f/2.8 1-5x Macro Photo', #9
@@ -300,11 +301,11 @@ $VERSION = '3.65';
     169.4 => 'Sigma 50mm f/1.4 EX DG HSM', #PH
     169.5 => 'Sigma 85mm f/1.4 EX DG HSM', #Rolando Ruzic
     169.6 => 'Sigma 30mm f/1.4 EX DC HSM', #Rodolfo Borges
-    169.7 => 'Sigma 35mm f/1.4 DG HSM', #PH (also "| A" version, ref forum3833)
+    169.7 => 'Sigma 35mm f/1.4 DG HSM', #PH (also "| A" version, ref 50)
     170 => 'Canon EF 200mm f/2.8L II', #9
     171 => 'Canon EF 300mm f/4L', #15
     172 => 'Canon EF 400mm f/5.6L or Sigma Lens', #32
-    172.1 =>'Sigma 150-600mm f/5-6.3 DG OS HSM | S', #forum3833
+    172.1 =>'Sigma 150-600mm f/5-6.3 DG OS HSM | S', #50
     173 => 'Canon EF 180mm Macro f/3.5L or Sigma Lens', #9
     173.1 => 'Sigma 180mm EX HSM Macro f/3.5', #14
     173.2 => 'Sigma APO Macro 150mm f/2.8 EX DG HSM', #14
@@ -401,7 +402,7 @@ $VERSION = '3.65';
     252 => 'Canon EF 70-200mm f/2.8L IS II USM + 1.4x', #50 (1.4x Mk II)
     253 => 'Canon EF 70-200mm f/2.8L IS II USM + 2x', #PH (NC)
     254 => 'Canon EF 100mm f/2.8L Macro IS USM', #42
-    255 => 'Sigma 24-105mm f/4 DG OS HSM | A or Other Sigma Lens', #50
+    255 => 'Sigma 24-105mm f/4 DG OS HSM | A or Sigma Lens', #50
     255.1 => 'Sigma 180mm f/2.8 EX DG OS HSM APO Macro', #50
     # Note: LensType 488 (0x1e8) is reported as 232 (0xe8) in 7D CameraSettings
     488 => 'Canon EF-S 15-85mm f/3.5-5.6 IS USM', #PH
@@ -422,9 +423,12 @@ $VERSION = '3.65';
     506 => 'Canon EF 400mm f/4 DO IS II USM', #42
     507 => 'Canon EF 16-35mm f/4L IS USM', #42
     508 => 'Canon EF 11-24mm f/4L USM', #PH
-    747 => 'Canon EF 100-400mm f/4.5-5.6L IS II USM', #JR
+    747 => 'Canon EF 100-400mm f/4.5-5.6L IS II USM or Tamron Lens', #JR
+    747.1 => 'Tamron SP 150-600mm F5-6.3 Di VC USD G2', #50
     748 => 'Canon EF 100-400mm f/4.5-5.6L IS II USM + 1.4x', #JR (1.4x Mk III)
     750 => 'Canon EF 35mm f/1.4L II USM', #42
+    751 => 'Canon EF 16-35mm f/2.8L III USM', #42
+    752 => 'Canon EF 24-105mm f/4L IS II USM', #42
     # (STM lenses seem to start with 0x10xx)
     4142 => 'Canon EF-S 18-135mm f/3.5-5.6 IS STM',
     4143 => 'Canon EF-M 18-55mm f/3.5-5.6 IS STM or Tamron Lens',
@@ -441,6 +445,7 @@ $VERSION = '3.65';
     4154 => 'Canon EF-S 24mm f/2.8 STM', #IB
     4155 => 'Canon EF-M 28mm f/3.5 Macro IS STM', #42
     4156 => 'Canon EF 50mm f/1.8 STM', #42
+    4157 => 'Canon EF-M 18-150mm 1:3.5-6.3 IS STM',#42
     36912 => 'Canon EF-S 18-135mm f/3.5-5.6 IS USM', #42
     65535 => 'n/a',
 );
@@ -663,6 +668,7 @@ $VERSION = '3.65';
     0x3890000 => 'PowerShot ELPH 170 IS / IXUS 170',
     0x3910000 => 'PowerShot SX410 IS',
     0x3930000 => 'PowerShot G9 X',
+    0x3940000 => 'EOS M5', #IB
     0x3950000 => 'PowerShot G5 X',
     0x3970000 => 'PowerShot G7 X Mark II',
     0x3990000 => 'PowerShot ELPH 360 HS / IXUS 285 HS / IXY 650',
@@ -672,6 +678,7 @@ $VERSION = '3.65';
     0x4040000 => 'PowerShot G1',
     0x4040001 => 'IXY 180', # ?? (from Canon sample)
     0x4050000 => 'PowerShot SX720 HS',
+    0x4060000 => 'PowerShot SX620 HS',
     0x6040000 => 'PowerShot S100 / Digital IXUS / IXY Digital',
 
 # (see http://cweb.canon.jp/e-support/faq/answer/digitalcamera/10447-1.html for PowerShot/IXUS/IXY names)
@@ -748,7 +755,7 @@ $VERSION = '3.65';
     0x80000298 => 'WFT-E4 II',
     0x80000301 => 'EOS Rebel T4i / 650D / Kiss X6i',
     0x80000302 => 'EOS 6D', #25
-    0x80000324 => 'EOS-1D C', # (NC)
+    0x80000324 => 'EOS-1D C', #(NC)
     0x80000325 => 'EOS 70D',
     0x80000326 => 'EOS Rebel T5i / 700D / Kiss X7i',
     0x80000327 => 'EOS Rebel T5 / 1200D / Kiss X70',
@@ -758,6 +765,7 @@ $VERSION = '3.65';
     0x80000355 => 'EOS M2',
     0x80000346 => 'EOS Rebel SL1 / 100D / Kiss X7',
     0x80000347 => 'EOS Rebel T6s / 760D / 8000D',
+    0x80000349 => 'EOS 5D Mark IV', #42
     0x80000382 => 'EOS 5DS',
     0x80000393 => 'EOS Rebel T6i / 750D / Kiss X8i',
     0x80000401 => 'EOS 5DS R',
@@ -1096,6 +1104,11 @@ my %offOn = ( 0 => 'Off', 1 => 'On' );
             Condition => '$$self{Model} =~ /EOS 70D$/',
             SubDirectory => { TagTable => 'Image::ExifTool::Canon::CameraInfo70D' },
         },
+        {
+            Name => 'CanonCameraInfo80D',
+            Condition => '$$self{Model} =~ /EOS 80D$/',
+            SubDirectory => { TagTable => 'Image::ExifTool::Canon::CameraInfo80D' },
+        },
         {
             Name => 'CanonCameraInfo450D',
             Condition => '$$self{Model} =~ /\b(450D|REBEL XSi|Kiss X2)\b/',
@@ -1118,9 +1131,24 @@ my %offOn = ( 0 => 'Off', 1 => 'On' );
         },
         {
             Name => 'CanonCameraInfo650D',
-            Condition => '$$self{Model} =~ /\b(650D|REBEL T4i|Kiss X6i|700D|Rebel T5i|Kiss X7i)\b/',
+            Condition => '$$self{Model} =~ /\b(650D|REBEL T4i|Kiss X6i)\b/',
             SubDirectory => { TagTable => 'Image::ExifTool::Canon::CameraInfo650D' },
         },
+        {
+            Name => 'CanonCameraInfo700D',
+            Condition => '$$self{Model} =~ /\b(700D|REBEL T5i|Kiss X7i)\b/',
+            SubDirectory => { TagTable => 'Image::ExifTool::Canon::CameraInfo650D' },
+        },
+        {
+            Name => 'CanonCameraInfo750D',
+            Condition => '$$self{Model} =~ /\b(750D|Rebel T6i|Kiss X8i)\b/',
+            SubDirectory => { TagTable => 'Image::ExifTool::Canon::CameraInfo750D' },
+        },
+        {
+            Name => 'CanonCameraInfo760D',
+            Condition => '$$self{Model} =~ /\b(760D|Rebel T6s|8000D)\b/',
+            SubDirectory => { TagTable => 'Image::ExifTool::Canon::CameraInfo750D' },
+        },
         {
             Name => 'CanonCameraInfo1000D',
             Condition => '$$self{Model} =~ /\b(1000D|REBEL XS|Kiss F)\b/',
@@ -1131,6 +1159,11 @@ my %offOn = ( 0 => 'Off', 1 => 'On' );
             Condition => '$$self{Model} =~ /\b(1100D|REBEL T3|Kiss X50)\b/',
             SubDirectory => { TagTable => 'Image::ExifTool::Canon::CameraInfo600D' },
         },
+        {
+            Name => 'CanonCameraInfo1200D',
+            Condition => '$$self{Model} =~ /\b(1200D|REBEL T5|Kiss X70)\b/',
+            SubDirectory => { TagTable => 'Image::ExifTool::Canon::CameraInfo60D' },
+        },
         {
             Name => 'CanonCameraInfoPowerShot',
             # valid if format is int32u[138] or int32u[148]
@@ -4253,16 +4286,16 @@ my %ciMaxFocal = (
     },
 );
 
-# Canon camera information for 60D (MakerNotes tag 0x0d) (ref PH)
+# Canon camera information for 60D/1200D (MakerNotes tag 0x0d) (ref PH)
 # NOTE: Can probably borrow more 50D tags here, possibly with an offset
 %Image::ExifTool::Canon::CameraInfo60D = (
     %binaryDataAttrs,
     FORMAT => 'int8u',
     FIRST_ENTRY => 0,
     PRIORITY => 0,
-    IS_SUBDIR => [ 0x321 ],
+    IS_SUBDIR => [ 0x2f9, 0x321 ],
     GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
-    NOTES => 'CameraInfo tags for the EOS 60D.',
+    NOTES => 'CameraInfo tags for the EOS 60D and 1200D.',
     0x03 => { %ciFNumber },
     0x04 => { %ciExposureTime },
     0x06 => { %ciISO },
@@ -4270,6 +4303,8 @@ my %ciMaxFocal = (
     0x1e => { %ciFocalLength },
     0x36 => {
         Name => 'CameraOrientation',
+        Condition => '$$self{Model} =~ /EOS 60D$/', #(NC)
+        Notes => '60D only',
         PrintConv => {
             0 => 'Horizontal (normal)',
             1 => 'Rotate 90 CW',
@@ -4278,14 +4313,20 @@ my %ciMaxFocal = (
     },
     0x55 => {
         Name => 'FocusDistanceUpper',
+        Condition => '$$self{Model} =~ /EOS 60D$/',
+        Notes => '60D only',
         %focusDistanceByteSwap,
     },
     0x57 => {
         Name => 'FocusDistanceLower',
+        Condition => '$$self{Model} =~ /EOS 60D$/',
+        Notes => '60D only',
         %focusDistanceByteSwap,
     },
     0x7d => {
         Name => 'ColorTemperature',
+        Condition => '$$self{Model} =~ /EOS 60D$/',
+        Notes => '60D only',
         Format => 'int16u',
     },
     0xe8 => {
@@ -4297,13 +4338,15 @@ my %ciMaxFocal = (
     },
     0xea => { %ciMinFocal },
     0xec => { %ciMaxFocal },
-    0x199 => {  # (at this location for firmware 2.8.1 and 1.0.5)
+    0x199 => {  # (at this location for 60D firmware 2.8.1/1.0.5, and 1200D 3.3.1/1.0.0)
         Name => 'FirmwareVersion',
         Format => 'string[6]',
         Writable => 0,
     },
     0x1d9 => {
         Name => 'FileIndex',
+        Condition => '$$self{Model} =~ /EOS 60D$/',
+        Notes => '60D only',
         Groups => { 2 => 'Image' },
         Format => 'int32u',
         ValueConv => '$val + 1',
@@ -4311,13 +4354,23 @@ my %ciMaxFocal = (
     },
     0x1e5 => { #(NC)
         Name => 'DirectoryIndex',
+        Condition => '$$self{Model} =~ /EOS 60D$/',
+        Notes => '60D only',
         Groups => { 2 => 'Image' },
         Format => 'int32u',
         ValueConv => '$val - 1',
         ValueConvInv => '$val + 1',
     },
+    0x2f9 => {
+        Name => 'PictureStyleInfo',
+        Condition => '$$self{Model} =~ /\b(1200D|REBEL T5|Kiss X70)\b/',
+        Notes => '1200D',
+        SubDirectory => { TagTable => 'Image::ExifTool::Canon::PSInfo2' },
+    },
     0x321 => {
         Name => 'PictureStyleInfo',
+        Condition => '$$self{Model} =~ /EOS 60D$/',
+        Notes => '60D',
         SubDirectory => { TagTable => 'Image::ExifTool::Canon::PSInfo2' },
     },
 );
@@ -4391,6 +4444,69 @@ my %ciMaxFocal = (
     },
 );
 
+# Canon camera information for 80D (MakerNotes tag 0x0d) (ref PH)
+%Image::ExifTool::Canon::CameraInfo80D = (
+    %binaryDataAttrs,
+    FORMAT => 'int8u',
+    FIRST_ENTRY => 0,
+    PRIORITY => 0,
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
+    NOTES => 'CameraInfo tags for the EOS 70D.',
+    0x03 => { %ciFNumber },
+    0x04 => { %ciExposureTime },
+    0x06 => { %ciISO },
+    0x1b => { %ciCameraTemperature },
+    0x23 => { %ciFocalLength },
+    0x96 => {
+        Name => 'CameraOrientation',
+        PrintConv => {
+            0 => 'Horizontal (normal)',
+            1 => 'Rotate 90 CW',
+            2 => 'Rotate 270 CW',
+        },
+    },
+    0xa5 => {
+        Name => 'FocusDistanceUpper',
+        %focusDistanceByteSwap,
+    },
+    0xa7 => {
+        Name => 'FocusDistanceLower',
+        %focusDistanceByteSwap,
+    },
+    0x13a => {
+        Name => 'ColorTemperature',
+        Format => 'int16u',
+    },
+    0x189 => {
+        Name => 'LensType',
+        Format => 'int16uRev', # value is big-endian
+        SeparateTable => 1,
+        ValueConvInv => 'int($val)', # (must truncate decimal part)
+        PrintConv => \%canonLensTypes,
+    },
+    0x18b => { %ciMinFocal },
+    0x18d => { %ciMaxFocal },
+    0x45a => {  # (at this location for firmware 1.0.1)
+        Name => 'FirmwareVersion',
+        Format => 'string[6]',
+        Writable => 0,
+    },
+    0x4ae => {
+        Name => 'FileIndex',
+        Groups => { 2 => 'Image' },
+        Format => 'int32u',
+        ValueConv => '$val + 1',
+        ValueConvInv => '$val - 1',
+    },
+    0x4ba => { #(NC)
+        Name => 'DirectoryIndex',
+        Groups => { 2 => 'Image' },
+        Format => 'int32u',
+        ValueConv => '$val - 1',
+        ValueConvInv => '$val + 1',
+    },
+);
+
 # Canon camera information for 450D (MakerNotes tag 0x0d) (ref PH)
 %Image::ExifTool::Canon::CameraInfo450D = (
     %binaryDataAttrs,
@@ -4784,7 +4900,7 @@ my %ciMaxFocal = (
     },
 );
 
-# Canon camera information for 650D (MakerNotes tag 0x0d) (ref PH)
+# Canon camera information for 650D/700D (MakerNotes tag 0x0d) (ref PH)
 %Image::ExifTool::Canon::CameraInfo650D = (
     %binaryDataAttrs,
     FORMAT => 'int8u',
@@ -4850,13 +4966,13 @@ my %ciMaxFocal = (
     },
     0x220 => { # (700D version 1.1.1/2.1.1)
         Name => 'FirmwareVersion',
-        Condition => '$$self{Model} =~ /(700D|Rebel T5i|Kiss X7i)\b/',
+        Condition => '$$self{Model} =~ /(700D|REBEL T5i|Kiss X7i)\b/',
         Notes => '700D',
         Format => 'string[6]',
         Writable => 0,
         RawConv => '$val=~/^\d+\.\d+\.\d+\s*$/ ? $val : undef',
     },
-    0x270 => { # (NC)
+    0x270 => { #(NC)
         Name => 'FileIndex',
         Condition => '$$self{Model} =~ /(650D|REBEL T4i|Kiss X6i)\b/',
         Notes => '650D',
@@ -4865,16 +4981,16 @@ my %ciMaxFocal = (
         ValueConv => '$val + 1',
         ValueConvInv => '$val - 1',
     },
-    0x274 => { # (NC)
+    0x274 => { #(NC)
         Name => 'FileIndex',
-        Condition => '$$self{Model} =~ /(700D|Rebel T5i|Kiss X7i)\b/',
+        Condition => '$$self{Model} =~ /(700D|REBEL T5i|Kiss X7i)\b/',
         Notes => '700D',
         Groups => { 2 => 'Image' },
         Format => 'int32u',
         ValueConv => '$val + 1',
         ValueConvInv => '$val - 1',
     },
-    0x27c => { # (NC)
+    0x27c => { #(NC)
         Name => 'DirectoryIndex',
         Condition => '$$self{Model} =~ /(650D|REBEL T4i|Kiss X6i)\b/',
         Notes => '650D',
@@ -4883,9 +4999,9 @@ my %ciMaxFocal = (
         ValueConv => '$val - 1',
         ValueConvInv => '$val + 1',
     },
-    0x280 => { # (NC)
+    0x280 => { #(NC)
         Name => 'DirectoryIndex',
-        Condition => '$$self{Model} =~ /(700D|Rebel T5i|Kiss X7i)\b/',
+        Condition => '$$self{Model} =~ /(700D|REBEL T5i|Kiss X7i)\b/',
         Notes => '700D',
         Groups => { 2 => 'Image' },
         Format => 'int32u',
@@ -4898,6 +5014,66 @@ my %ciMaxFocal = (
     },
 );
 
+# Canon camera information for 750D/760D (MakerNotes tag 0x0d) (ref PH)
+%Image::ExifTool::Canon::CameraInfo750D = (
+    %binaryDataAttrs,
+    FORMAT => 'int8u',
+    FIRST_ENTRY => 0,
+    PRIORITY => 0,
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
+    NOTES => 'CameraInfo tags for the EOS 750D and 760D.',
+    0x03 => { %ciFNumber },
+    0x04 => { %ciExposureTime },
+    0x06 => { %ciISO },
+    0x1b => { %ciCameraTemperature }, # (700D + 0)
+    0x23 => { %ciFocalLength }, # (700D + 0)
+    0xa5 => { # (700D + 0x19)
+        Name => 'FocusDistanceUpper',
+        %focusDistanceByteSwap,
+    },
+    0xa7 => { # (700D + 0x19)
+        Name => 'FocusDistanceLower',
+        %focusDistanceByteSwap,
+    },
+    0x131 => { # (700D + 0x19)
+        Name => 'WhiteBalance',
+        Format => 'int16u',
+        SeparateTable => 1,
+        PrintConv => \%canonWhiteBalance,
+    },
+    0x135 => {
+        Name => 'ColorTemperature',
+        Format => 'int16u',
+    },
+    0x169 => {
+        Name => 'PictureStyle',
+        Format => 'int8u',
+        Flags => ['PrintHex','SeparateTable'],
+        PrintConv => \%pictureStyles,
+    },
+    0x184 => {
+        Name => 'LensType',
+        Format => 'int16uRev', # value is big-endian
+        SeparateTable => 1,
+        ValueConvInv => 'int($val)', # (must truncate decimal part)
+        PrintConv => \%canonLensTypes,
+    },
+    0x186 => { %ciMinFocal },
+    0x188 => { %ciMaxFocal },
+    0x43d => { # (750D/760D firmware 6.7.2)
+        Name => 'FirmwareVersion',
+        Format => 'string[6]',
+        Writable => 0,
+        RawConv => '$val=~/^\d+\.\d+\.\d+\s*$/ ? $val : undef',
+    },
+    0x449 => { # (750D/760D firmware 1.0.0)
+        Name => 'FirmwareVersion',
+        Format => 'string[6]',
+        Writable => 0,
+        RawConv => '$val=~/^\d+\.\d+\.\d+\s*$/ ? $val : undef',
+    },
+);
+
 # Canon camera information for 1000D (MakerNotes tag 0x0d) (ref PH)
 %Image::ExifTool::Canon::CameraInfo1000D = (
     %binaryDataAttrs,
@@ -5945,7 +6121,7 @@ my %ciMaxFocal = (
             31 => 'Anchorage',      # [-9]
             32 => 'Honolulu',       # [-10]
             33 => 'Samoa',          # [+13]
-            32766 => '(not set)',   # (NC)
+            32766 => '(not set)',   #(NC)
         },
     },
     3 => {
@@ -7746,6 +7922,8 @@ my %filterConv = (
     10 => { #52
         Name => 'AutoAFPointSelEOSiTRAF',
         Description => 'Auto AF Point Sel EOS iTR AF',
+        # valid for: 1DX, 1DXmkII, 7DmkII, 5DS, 5DSR
+        # not valid for: 5DmkIII
         Notes => 'only valid for some models',
         Condition => '$$self{Model} !~ /5D /',
         PrintConv => {
@@ -7763,12 +7941,12 @@ my %filterConv = (
     12 => { #52
         Name => 'SelectAFAreaSelectionMode',
         PrintConv => { BITMASK => {
-            0 => 'Single pt',
+            0 => 'Single-point AF',
             1 => 'Auto', # (61 point)
-            2 => 'Zone',
-            3 => 'Expand area 4pt',
-            4 => 'Spot',
-            5 => 'Expand area 8pt',
+            2 => 'Zone AF',
+            3 => 'AF Point Expansion (4 point)',
+            4 => 'Spot AF',
+            5 => 'AF Point Expansion (8 point)',
         }},
     },
     13 => { #52