exiftool_vendored 9.69.0 → 9.71.0

data/bin/{Image-ExifTool-9.69 → Image-ExifTool-9.71}/html/struct.html

@@ -21,6 +21,7 @@ li.c { margin-top: 0 }
 <br><a href="#Deleting">Deleting</a>
 <br><a href="#Fields">Field Names</a>
 <br><a href="#Serialize">Serialization</a>
+<br><a href="#Examples">Examples</a>
 <br><a href="#User">User-Defined</a>
 </div>
 <h1 class='up'>Structured Information</h1>
@@ -193,11 +194,11 @@ structures may not be specified. Conversely, if the structure option is enabled
 or with <code>-struct</code> on the command line), only structures are copied,
 and flattened tags may not be specified.</p>
 
-<p class=lt>(Note: This method of copying as flattened tags was the default
-behaviour with ExifTool 8.43 and earlier.  Copying as structures has been the
-default since the ability to write structured information was introduced in
-version 8.44, but an enhancement in version 8.82 allowed flattened tags to be
-copied explicitly without the need to disable the Struct option.)</p>
+<p class=lt>(Note: ExifTool 8.43 and earlier copied as flattened tags only, but
+copying as structures has been the default since the ability to write structured
+information was introduced in version 8.44.  An enhancement in version 8.82
+allowed flattened tags to be copied explicitly without the need to disable the
+Struct option.)</p>
 
 <a name='Deleting'></a>
 <h2>Deleting / Replacing</h2>
@@ -330,6 +331,84 @@ been added after the last field of each structure.  (Note that a comma may NOT
 be added after the last item in a list because this would be interpreted as an
 additional list item of a zero-length string.)</p>
 
+<a name='Examples'></a>
+<h2>Examples</h2>
+
+<p>Here is an example of an advanced console session showing some commands which
+manipulate a complex list of structures (see the
+<a href="TagNames/XMP.html#iptcExt">XMP-iptcExt tag documentation</a> for details
+about the ArtworkOrObject structure tags used):</p>
+
+<blockquote><table class='box'><tr><td>
+<pre><span class=lt># 1. Create a XMP-iptcExt:ArtworkOrObject structure using flattened tags</span>
+&gt; <span class=code>exiftool -artworktitle="a title" a.xmp</span>
+    1 image files created
+
+<span class=lt># -- Read back as flattened tags (-S is used just to shorten the output)</span>
+&gt; <span class=code>exiftool -xmp-iptcext:all -S a.xmp</span>
+ArtworkTitle: a title
+
+<span class=lt># -- Read back as a structure</span>
+&gt; <span class=code>exiftool -xmp-iptcext:all -S -struct a.xmp</span>
+ArtworkOrObject: [{AOTitle=a title}]
+
+<span class=lt># 2. Write another element to the structure as a flattened tag</span>
+&gt; <span class=code>exiftool -artworkcreator=phil a.xmp</span>
+    1 image files updated
+
+<span class=lt># -- Note that the structure now has a new element</span>
+&gt; <span class=code>exiftool -xmp-iptcext:all -S -struct a.xmp</span>
+ArtworkOrObject: [{AOCreator=[phil],AOTitle=a title}]
+
+<span class=lt># 3. Add another creator using the "+=" operator</span>
+&gt; <span class=code>exiftool -artworkcreator+=joe a.xmp</span>
+    1 image files updated
+
+<span class=lt># -- It was added to the first AOCreator list</span>
+&gt; <span class=code>exiftool -xmp-iptcext:all -S -struct a.xmp</span>
+ArtworkOrObject: [{AOCreator=[phil,joe],AOTitle=a title}]
+
+<span class=lt># 4. Add another artwork title</span>
+&gt; <span class=code>exiftool -artworktitle+="another one" a.xmp</span>
+    1 image files updated
+
+<span class=lt># -- This created a new ArtworkOrObject structure in the list of structures
+# (AOTitle itself is not a list, so a new structure must be created)</span>
+&gt; <span class=code>exiftool -xmp-iptcext:all -S -struct a.xmp</span>
+ArtworkOrObject: [{AOCreator=[phil,joe],AOTitle=a title},{AOTitle=another one}]
+
+<span class=lt># 5. Simply write a different title (do not add with "+=")</span>
+&gt; <span class=code>exiftool -artworktitle="different" a.xmp</span>
+    1 image files updated
+
+<span class=lt># -- This deleted all existing AOTitle elements and wrote back only one
+# (if the second ArtworkOrObject structure had contained more fields, they would have been
+# preserved, and the second structure would still exist, but without an AOTitle element)</span>
+&gt; <span class=code>exiftool -xmp-iptcext:all -S -struct a.xmp</span>
+ArtworkOrObject: [{AOCreator=[phil,joe],AOTitle=different}]
+
+<span class=lt># 6. Add a completely new structure to the list
+(this is very difficult to do properly using flattened tags)</span>
+&gt; <span class=code>exiftool -artworkorobject+="{aotitle=help,aocreator=[paul,ringo]}" a.xmp</span>
+    1 image files updated
+
+<span class=lt># -- The new structure was added with the specified elements</span>
+&gt; <span class=code>exiftool -xmp-iptcext:all -S -struct a.xmp</span>
+ArtworkOrObject: [{AOCreator=[phil,joe],AOTitle=different},{AOCreator=[paul,ringo],AOTitle=help}]
+
+<span class=lt># -- See how the relationships are lost when reading as flattened tags</span>
+&gt; <span class=code>exiftool -xmp-iptcext:all -S a.xmp</span>
+ArtworkCreator: phil, joe, paul, ringo
+ArtworkTitle: different, help
+
+<span class=lt># 7. Delete all structures containing a specific element</span>
+&gt; <span class=code>exiftool -artworkorobject-="{AOCreator=phil}" a.xmp</span>
+    1 image files updated
+
+<span class=lt># -- The ArtworkOrObject list now contains only one structure</span>
+&gt; <span class=code>exiftool -xmp-iptcext:all -S -struct a.xmp</span>
+ArtworkOrObject: [{AOCreator=[paul,ringo],AOTitle=help}]</pre></td></tr></table></blockquote>
+
 <a name='User'></a>
 <h2>User-Defined Structures</h2>
 
@@ -338,7 +417,7 @@ See the NewXMPxxxStruct tag definition in the <a href="config.html#xmp-xxx">XMP-
 examples of the sample config file</a> for more details.</p>
 
 <hr>
-<i>Last revised Apr. 8, 2014</i>
+<i>Last revised Sept. 6, 2014</i>
 <p class='lf'><a href="index.html">&lt;-- Back to ExifTool home page</a></p>
 </body>
 </html>

data/bin/{Image-ExifTool-9.69 → Image-ExifTool-9.71}/lib/Image/ExifTool.pm

@@ -27,7 +27,7 @@ use vars qw($VERSION $RELEASE @ISA @EXPORT_OK %EXPORT_TAGS $AUTOLOAD @fileTypes
             %mimeType $swapBytes $swapWords $currentByteOrder %unpackStd
             %jpegMarker %specialTags);
 
-$VERSION = '9.69';
+$VERSION = '9.71';
 $RELEASE = '';
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (
@@ -43,7 +43,7 @@ $RELEASE = '';
         Get16s Get32u Get32s Get64u GetFloat GetDouble GetFixed32s Write
         WriteValue Tell Set8u Set8s Set16u Set32u
     )],
-    Utils => [qw(GetTagTable TagTableKeys GetTagInfoList AddTagToTable)],
+    Utils => [qw(GetTagTable TagTableKeys GetTagInfoList AddTagToTable HexDump)],
     Vars  => [qw(%allTables @tableOrder @fileTypes)],
 );
 @EXPORT_OK = qw(Open);
@@ -125,13 +125,13 @@ sub ReadValue($$$$$;$);
     PhotoMechanic Exif GeoTiff CanonRaw KyoceraRaw Lytro MinoltaRaw PanasonicRaw
     SigmaRaw JPEG GIMP Jpeg2000 GIF BMP BMP::OS2 PICT PNG MNG DjVu DPX OpenEXR
     MIFF PGF PSP PhotoCD Radiance PDF PostScript Photoshop::Header FujiFilm::RAF
-    FujiFilm::IFD Sony::SRF2 Sony::SR2SubIFD Sony::PMP ITC ID3 Vorbis Ogg APE
-    APE::NewHeader APE::OldHeader MPC MPEG::Audio MPEG::Video MPEG::Xing M2TS
-    QuickTime QuickTime::ImageFile Matroska MXF DV Flash Flash::FLV Real::Media
-    Real::Audio Real::Metafile RIFF AIFF ASF DICOM MIE HTML XMP::SVG Palm
-    Palm::MOBI Palm::EXTH Torrent EXE EXE::PEVersion EXE::PEString EXE::MachO
-    EXE::PEF EXE::ELF EXE::CHM LNK Font RSRC Rawzor ZIP ZIP::GZIP ZIP::RAR RTF
-    OOXML iWork FLIR::AFF FLIR::FPF
+    FujiFilm::IFD Samsung::Trailer Sony::SRF2 Sony::SR2SubIFD Sony::PMP ITC ID3
+    Vorbis Ogg APE APE::NewHeader APE::OldHeader MPC MPEG::Audio MPEG::Video
+    MPEG::Xing M2TS QuickTime QuickTime::ImageFile Matroska MXF DV Flash
+    Flash::FLV Real::Media Real::Audio Real::Metafile RIFF AIFF ASF DICOM MIE
+    HTML XMP::SVG Palm Palm::MOBI Palm::EXTH Torrent EXE EXE::PEVersion
+    EXE::PEString EXE::MachO EXE::PEF EXE::ELF EXE::CHM LNK Font RSRC Rawzor ZIP
+    ZIP::GZIP ZIP::RAR RTF OOXML iWork FLIR::AFF FLIR::FPF
 );
 
 # alphabetical list of current Lang modules
@@ -289,10 +289,11 @@ my %fileTypeLookup = (
     J2K  =>  'JP2',
     JNG  => ['PNG',  'JPG Network Graphics'],
     JP2  => ['JP2',  'JPEG 2000 file'],
-    JPC  =>  'J2C',
-    JPF  =>  'JP2',
     # JP4? - looks like a JPEG but the image data is different
+    JPC  =>  'J2C',
+    JPE  =>  'JPEG',
     JPEG => ['JPEG', 'Joint Photographic Experts Group'],
+    JPF  =>  'JP2',
     JPG =>   'JPEG',
     JPM  => ['JP2',  'JPEG 2000 compound image'],
     JPX  => ['JP2',  'JPEG 2000 with extensions'],
@@ -1631,6 +1632,7 @@ sub ClearOptions($)
         Lang        => $defaultLang,# localized language for descriptions etc
         LargeFileSupport => undef,  # flag indicating support of 64-bit file offsets
         List        => undef,   # extract lists of PrintConv values into arrays
+        ListItem    => undef,   # used to return a specific item from lists
         ListSep     => ', ',    # list item separator
         ListSplit   => undef,   # regex for splitting list-type tag values when writing
         MakerNotes  => undef,   # extract maker notes as a block
@@ -2435,12 +2437,16 @@ sub GetValue($$;$)
     DoEscape($value, $$self{ESCAPE_PROC}) if $$self{ESCAPE_PROC};
 
     if (ref $value eq 'ARRAY') {
-        # return array if requested
-        return @$value if wantarray;
-        # return list reference for Raw, ValueConv or if List or not a list of scalars
-        return $value if $type ne 'PrintConv' or $$self{OPTIONS}{List} or ref $$value[0];
-        # otherwise join in comma-separated string
-        $value = join $$self{OPTIONS}{ListSep}, @$value;
+        if (defined $$self{OPTIONS}{ListItem}) {
+            $value = $$value[$$self{OPTIONS}{ListItem}];
+        } elsif (wantarray) {
+            # return array if requested
+            return @$value;
+        } elsif ($type eq 'PrintConv' and not $$self{OPTIONS}{List} and not ref $$value[0]) {
+            # join PrintConv values in comma-separated string if List option not used
+            # and list contains simple scalars (otherwise return ARRAY ref)
+            $value = join $$self{OPTIONS}{ListSep}, @$value;
+        }
     }
     return $value;
 }
@@ -4548,6 +4554,8 @@ sub IdentifyTrailer($;$)
                  $buff =~ /~\0\x04\0zmie~\0\0\x0a.{8}[\x10\x18]\x08$/s)
         {
             $type = 'MIE';
+        } elsif ($buff =~ /\0\0(QDIOBS|SEFT)$/) {
+            $type = 'Samsung';
         }
         last;
     }

data/bin/{Image-ExifTool-9.69 → Image-ExifTool-9.71}/lib/Image/ExifTool.pod

@@ -682,6 +682,14 @@ Flag to extract lists of PrintConv values into arrays instead of joining
 them into a string of values.  The L</ListSep> option specifies the
 separator used when combining values.  Default is 0.
 
+=item ListItem
+
+Return only a specific item from List-type values.  A value of 0 returns the
+first item in the list, 1 return the second item, etc.  Negative indices may
+also be used, with -1 representing the last item in the list.  Applies only
+to the top-level list of nested lists.  Default is undef to return all items
+in the list.
+
 =item ListSep
 
 Separator string used to join lists of PrintConv values when L</List> option
@@ -757,7 +765,7 @@ available for copying.  Default is 0.
 
 =item ScanForXMP
 
-Flag for scan all files (even unrecognized formats) for XMP information
+Flag to scan all files (even unrecognized formats) for XMP information
 unless XMP was already found in the file.  When combined with the FastScan
 option, only unrecognized file types are scanned for XMP.  Default is 0.
 

data/bin/{Image-ExifTool-9.69 → Image-ExifTool-9.71}/lib/Image/ExifTool/AFCP.pm

@@ -147,7 +147,7 @@ NoAFCP: for (;;) {
         if ($verbose > 2 and not $outfile) {
             my $dat = $buff . $dir;
             print $out "  AFCP Directory:\n";
-            Image::ExifTool::HexDump(\$dat, undef,
+            HexDump(\$dat, undef,
                 Addr   => $$dirInfo{DataPos},
                 Width  => 12,
                 Prefix => $$et{INDENT},

data/bin/{Image-ExifTool-9.69 → Image-ExifTool-9.71}/lib/Image/ExifTool/AIFF.pm

@@ -232,7 +232,7 @@ sub ProcessAIFF($$)
             );
         } elsif ($verbose > 2 and $len2 < 1024000) {
             $raf->Read($buff, $len2) == $len2 or $err = 1, last;
-            Image::ExifTool::HexDump(\$buff, undef, MaxLen => 512);
+            HexDump(\$buff, undef, MaxLen => 512);
         } else {
             $raf->Seek($len2, 1) or $err=1, last;
         }

data/bin/{Image-ExifTool-9.69 → Image-ExifTool-9.71}/lib/Image/ExifTool/Canon.pm

@@ -82,7 +82,7 @@ sub ProcessSerialData($$$);
 sub ProcessFilters($$$);
 sub SwapWords($);
 
-$VERSION = '3.34';
+$VERSION = '3.36';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
@@ -390,6 +390,7 @@ $VERSION = '3.34';
     4146 => 'Canon EF-S 18-55mm f/3.5-5.6 IS STM', #PH
     4147 => 'Canon EF-M 11-22mm f/4-5.6 IS STM', #42
     4148 => 'Canon EF-S 55-250mm f/4-5.6 IS STM', #42
+    4149 => 'Canon EF-M 55-200mm f/4.5-6.3 IS STM', #42
     4150 => 'Canon EF-S 10-18mm f/4.5-5.6 IS STM', #42
 );
 
@@ -594,6 +595,7 @@ $VERSION = '3.34';
     0x3690000 => 'PowerShot ELPH 135 / IXUS 145 / IXY 120',
     0x3700000 => 'PowerShot ELPH 340 HS / IXUS 265 HS / IXY 630',
     0x3710000 => 'PowerShot ELPH 150 IS / IXUS 155 / IXY 140',
+    0x3780000 => 'PowerShot G7 X', #52
     0x4040000 => 'PowerShot G1',
     0x6040000 => 'PowerShot S100 / Digital IXUS / IXY Digital',
 
@@ -665,6 +667,7 @@ $VERSION = '3.34';
     0x80000286 => 'EOS Rebel T3i / 600D / Kiss X5',
     0x80000287 => 'EOS 60D',
     0x80000288 => 'EOS Rebel T3 / 1100D / Kiss X50',
+    0x80000289 => 'EOS 7D Mark II', #52
     0x80000297 => 'WFT-E2 II',
     0x80000298 => 'WFT-E4 II',
     0x80000301 => 'EOS Rebel T4i / 650D / Kiss X6i',
@@ -1545,7 +1548,7 @@ my %binaryDataAttrs = (
             Name => 'ColorData4',
             SubDirectory => { TagTable => 'Image::ExifTool::Canon::ColorData4' },
         },
-        {   # (int16u[5120]) - G10
+        {   # (int16u[5120]) - G10, G7X
             Condition => '$count == 5120',
             Name => 'ColorData5',
             SubDirectory => { TagTable => 'Image::ExifTool::Canon::ColorData5' },
@@ -1557,8 +1560,9 @@ my %binaryDataAttrs = (
         },
         {   # (int16u[1312|1313|1316])
             # 1DX/5DmkIII/650D/700D/M (1312), 6D/70D/100D (1313),
-            # 1DX firmware 1.x (1316)
-            Condition => '$count == 1312 or $count == 1313 or $count == 1316',
+            # 1DX firmware 1.x (1316), 7DmkII (1506)
+            Condition => '$count == 1312 or $count == 1313 or $count == 1316 or
+                          $count == 1506',
             Name => 'ColorData7',
             SubDirectory => { TagTable => 'Image::ExifTool::Canon::ColorData7' },
         },
@@ -6823,6 +6827,7 @@ my %ciMaxFocal = (
     0xf6 => { Name => 'CameraColorCalibration13', %cameraColorCalibration2 },
     0xfb => { Name => 'CameraColorCalibration14', %cameraColorCalibration2 },
     0x100=> { Name => 'CameraColorCalibration15', %cameraColorCalibration2 },
+    0x108=> { Name => 'PerChannelBlackLevel', Format => 'int16s[4]' }, #52
 );
 
 # Color data (MakerNotes tag 0x4001, count=1273|1275) (ref PH)
@@ -6914,15 +6919,19 @@ my %ciMaxFocal = (
 # Color data (MakerNotes tag 0x4001, count=1312,1313,1316) (ref PH)
 %Image::ExifTool::Canon::ColorData7 = (
     %binaryDataAttrs,
-    NOTES => 'These tags are used by the EOS 1DX, 5DmkIII, 6D, 100D, 650D, 700D and M.',
+    NOTES => 'These tags are used by the EOS 1DX, 5DmkIII, 6D, 100D, 650D, 700D, M and 7DmkII.',
     FORMAT => 'int16s',
     FIRST_ENTRY => 0,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
+    DATAMEMBER => [ 0x00 ],
     IS_SUBDIR => [ 0xd5 ],
     0x00 => {
         Name => 'ColorDataVersion',
+        DataMember => 'ColorDataVersion',
+        RawConv => '$$self{ColorDataVersion} = $val',
         PrintConv => {
             10 => '10 (1DX/5DmkIII/6D/70D/100D/650D/700D/M)',
+            11 => '11 (7DmkII)',
         },
     },
     # not really sure about the AsShot, Auto and Measured values any more - PH
@@ -6996,16 +7005,62 @@ my %ciMaxFocal = (
     0x114 => { Name => 'AverageBlackLevel',     Format => 'int16u[4]' }, #52
     0x1ad => {
         Name => 'RawMeasuredRGGB',
+        Condition => '$$self{ColorDataVersion} == 10',
         Format => 'int32u[4]',
         Notes => 'raw MeasuredRGGB values, before normalization',
         # swap words because the word ordering is big-endian, opposite to the byte ordering
         ValueConv => \&SwapWords,
         ValueConvInv => \&SwapWords,
     },
-    0x1f8 => { Name => 'PerChannelBlackLevel',  Format => 'int16u[4]' }, #52
-    0x1fc => { Name => 'NormalWhiteLevel',      Format => 'int16u',  RawConv => '$val || undef' }, #52
-    0x1fd => { Name => 'SpecularWhiteLevel',    Format => 'int16u' }, #52
-    0x1fe => { Name => 'LinearityUpperMargin',  Format => 'int16u' }, #52
+    0x1f8 => { #52
+        Name => 'PerChannelBlackLevel',
+        Condition => '$$self{ColorDataVersion} == 10',
+        Format => 'int16u[4]',
+    },
+    0x1fc => { #52
+        Name => 'NormalWhiteLevel',
+        Condition => '$$self{ColorDataVersion} == 10',
+        Format => 'int16u',
+        RawConv => '$val || undef',
+    },
+    0x1fd => { #52
+        Name => 'SpecularWhiteLevel',
+        Condition => '$$self{ColorDataVersion} == 10',
+        Format => 'int16u',
+    },
+    0x1fe => { #52
+        Name => 'LinearityUpperMargin',
+        Condition => '$$self{ColorDataVersion} == 10',
+        Format => 'int16u',
+    },
+    0x26b => {
+        Name => 'RawMeasuredRGGB',
+        Condition => '$$self{ColorDataVersion} == 11',
+        Format => 'int32u[4]',
+        ValueConv => \&SwapWords,
+        ValueConvInv => \&SwapWords,
+    },
+    0x2d8 => {
+        Name => 'PerChannelBlackLevel',
+        Condition => '$$self{ColorDataVersion} == 11',
+        Format => 'int16u[4]',
+    },
+    0x2dc => { 
+        Name => 'NormalWhiteLevel',
+        Condition => '$$self{ColorDataVersion} == 11',
+        Format => 'int16u',
+        RawConv => '$val || undef',
+    },
+    0x2dd => { 
+        Name => 'SpecularWhiteLevel',
+        Condition => '$$self{ColorDataVersion} == 11',
+        Format => 'int16u',
+    },
+    0x2de => { 
+        Name => 'LinearityUpperMargin',
+        Condition => '$$self{ColorDataVersion} == 11',
+        Format => 'int16u',
+    },
 );
 
 # Unknown color data (MakerNotes tag 0x4001)

data/bin/{Image-ExifTool-9.69 → Image-ExifTool-9.71}/lib/Image/ExifTool/CanonCustom.pm

@@ -19,7 +19,7 @@ use Image::ExifTool qw(:DataAccess);
 use Image::ExifTool::Canon;
 use Image::ExifTool::Exif;
 
-$VERSION = '1.49';
+$VERSION = '1.50';
 
 sub ProcessCanonCustom($$$);
 sub ProcessCanonCustom2($$$);
@@ -1472,12 +1472,12 @@ my %convPFn = ( PrintConv => \&ConvertPfn, PrintConvInv => \&ConvertPfnInv );
         },
     ],
     0x0110 => { # new for 1DmkIV
-        Name => 'FEMicroadjustment',
+        Name => 'AEMicroadjustment',
         Count => 3,
         PrintConv => [ \%disableEnable ],
     },
     0x0111 => { # new for 1DmkIV
-        Name => 'AEMicroadjustment',
+        Name => 'FEMicroadjustment',
         Count => 3,
         PrintConv => [ \%disableEnable ],
     },
@@ -1842,7 +1842,11 @@ my %convPFn = ( PrintConv => \&ConvertPfn, PrintConvInv => \&ConvertPfnInv );
                 2 => 'Register',
                 3 => 'Select AF-modes',
             },
-            # must decode 2nd value
+            'sprintf("Flags 0x%x",$val)', # (70D=Manual 1pt,Manual zone,Auto 19pt)
+        ],
+        PrintConvInv => [
+            undef,
+            '$val=~/0x([\dA-F]+)/i ? hex($1) : undef',
         ],
     },
     0x0513 => { # new for 7D
@@ -1893,6 +1897,13 @@ my %convPFn = ( PrintConv => \&ConvertPfn, PrintConvInv => \&ConvertPfnInv );
             1 => 'Focus priority',
         },
     },
+    0x051b => { # (70D)
+        Name => 'AFAreaSelectMethod',
+        PrintConv => {
+            0 => 'AF area selection button',
+            1 => 'Main dial',
+        },
+    },
     #### 3b) Drive
     0x060f => {
         Name => 'MirrorLockup',
@@ -1929,6 +1940,18 @@ my %convPFn = ( PrintConv => \&ConvertPfn, PrintConvInv => \&ConvertPfnInv );
             '$val=~/(\d+)/ ? $1 : 0',
         ],
     },
+    0x0612 => { # (1DX)
+        Name => 'RestrictDriveModes',
+        Count => 2,
+        PrintConv => [
+            \%disableEnable,
+            'sprintf("Flags 0x%x",$val)', # (Single,Cont Hi,Cont Lo,Timer 10,Timer 2,Silent,Super Hi)
+        ],
+        PrintConvInv => [
+            undef,
+            '$val=~/0x([\dA-F]+)/i ? hex($1) : undef',
+        ],
+    },
     #### 4a) Operation
     0x0701 => [
         {
@@ -2101,6 +2124,7 @@ my %convPFn = ( PrintConv => \&ConvertPfn, PrintConvInv => \&ConvertPfnInv );
         PrintConv => {
             0 => 'Rear LCD panel',
             1 => 'LCD monitor',
+            2 => 'Off (disable button)', # (1DX)
         },
     },
     0x0709 => {
@@ -2162,6 +2186,17 @@ my %convPFn = ( PrintConv => \&ConvertPfn, PrintConvInv => \&ConvertPfnInv );
             }},
         ],
     },
+    0x710 => { # (M)
+        Name => 'TrashButtonFunction',
+        PrintConv => {
+            0 => 'Normal (set center AF point)',
+            1 => 'Depth-of-field preview',
+        },
+    },
+    0x711 => { # (M)
+        Name => 'ShutterReleaseWithoutLens',
+        PrintConv => \%disableEnable,
+    },
     #### 4b) Others
     0x080b => [
         {
@@ -2264,6 +2299,13 @@ my %convPFn = ( PrintConv => \&ConvertPfn, PrintConvInv => \&ConvertPfnInv );
             1 => 'Retain power off status',
         },
     },
+    0x0812 => { # (1DX)
+        Name => 'MemoAudioQuality',
+        PrintConv => {
+            0 => 'High (48 kHz)',
+            1 => 'Low (8 kHz)',
+        },
+    },
     0x0813 => { # new for 5DmkIII
         Name => 'DefaultEraseOption',
         PrintConv => {