exiftool_vendored 12.68.0 → 12.72.0

data/bin/lib/Image/ExifTool/Canon.pm

@@ -88,7 +88,7 @@ sub ProcessCTMD($$$);
 sub ProcessExifInfo($$$);
 sub SwapWords($);
 
-$VERSION = '4.69';
+$VERSION = '4.72';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
@@ -611,22 +611,24 @@ $VERSION = '4.69';
    '61182.35' => 'Canon RF 600mm F4L IS USM', #GiaZopatti
    '61182.36' => 'Canon RF 600mm F4L IS USM + RF1.4x', #42
    '61182.37' => 'Canon RF 600mm F4L IS USM + RF2x', #42
-   '61182.38' => 'Canon RF 15-30mm F4.5-6.3 IS STM', #42
-   '61182.39' => 'Canon RF 800mm F5.6L IS USM', #42
-   '61182.40' => 'Canon RF 800mm F5.6L IS USM + RF1.4x', #42
-   '61182.41' => 'Canon RF 800mm F5.6L IS USM + RF2x', #42
-   '61182.42' => 'Canon RF 1200mm F8L IS USM', #42
-   '61182.43' => 'Canon RF 1200mm F8L IS USM + RF1.4x', #42
-   '61182.44' => 'Canon RF 1200mm F8L IS USM + RF2x', #42
-   '61182.45' => 'Canon RF 135mm F1.8 L IS USM', #42
-   '61182.46' => 'Canon RF 24-50mm F4.5-6.3 IS STM', #42
-   '61182.47' => 'Canon RF-S 55-210mm F5-7.1 IS STM', #42
-   '61182.48' => 'Canon RF 100-300mm F2.8L IS USM', #42
-   '61182.49' => 'Canon RF 100-300mm F2.8L IS USM + RF1.4x', #42
-   '61182.50' => 'Canon RF 100-300mm F2.8L IS USM + RF2x', #42
-   '61182.51' => 'Canon RF 28mm F2.8 STM', #42
-    # we need the RFLensType values for the following...
-   '61182.52' => 'Canon RF 5.2mm F2.8L Dual Fisheye 3D VR', #PH (NC)
+   '61182.38' => 'Canon RF 800mm F5.6L IS USM', #42
+   '61182.39' => 'Canon RF 800mm F5.6L IS USM + RF1.4x', #42
+   '61182.40' => 'Canon RF 800mm F5.6L IS USM + RF2x', #42
+   '61182.41' => 'Canon RF 1200mm F8L IS USM', #42
+   '61182.42' => 'Canon RF 1200mm F8L IS USM + RF1.4x', #42
+   '61182.43' => 'Canon RF 1200mm F8L IS USM + RF2x', #42
+   '61182.44' => 'Canon RF 5.2mm F2.8L Dual Fisheye 3D VR', #PH
+   '61182.45' => 'Canon RF 15-30mm F4.5-6.3 IS STM', #42
+   '61182.46' => 'Canon RF 135mm F1.8 L IS USM', #42
+   '61182.47' => 'Canon RF 24-50mm F4.5-6.3 IS STM', #42
+   '61182.48' => 'Canon RF-S 55-210mm F5-7.1 IS STM', #42
+   '61182.49' => 'Canon RF 100-300mm F2.8L IS USM', #42
+   '61182.50' => 'Canon RF 100-300mm F2.8L IS USM + RF1.4x', #42
+   '61182.51' => 'Canon RF 100-300mm F2.8L IS USM + RF2x', #42
+   '61182.52' => 'Canon RF 10-20mm F4 L IS STM', #42
+   '61182.53' => 'Canon RF 28mm F2.8 STM', #42
+   '61182.54' => 'Canon RF 24-105mm F2.8 L IS USM Z', #42
+   '61182.55' => 'Canon RF-S 10-18mm F4.5-6.3 IS STM', #42
     65535 => 'n/a',
 );
 
@@ -1395,6 +1397,11 @@ my %offOn = ( 0 => 'Off', 1 => 'On' );
             Condition => '$$self{Model} =~ /\bEOS R6$/',
             SubDirectory => { TagTable => 'Image::ExifTool::Canon::CameraInfoR6' },
         },
+        {
+            Name => 'CanonCameraInfoG5XII',
+            Condition => '$$self{Model} =~ /\bG5 X Mark II$/',
+            SubDirectory => { TagTable => 'Image::ExifTool::Canon::CameraInfoG5XII' },
+        },
         {
             Name => 'CanonCameraInfoPowerShot',
             # valid if format is int32u[138] or int32u[148]
@@ -4714,6 +4721,44 @@ my %ciMaxFocal = (
     },
 );
 
+# ref https://exiftool.org/forum/index.php?topic=15356.0
+%Image::ExifTool::Canon::CameraInfoG5XII = (
+    %binaryDataAttrs,
+    FIRST_ENTRY => 0,
+    PRIORITY => 0,
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
+    NOTES => 'CameraInfo tags for the PowerShot G5 X Mark II.',
+    0x0293 => {
+        Name => 'ShutterCount',
+        Format => 'int32u',
+        Notes => 'includes electronic + mechanical shutter',
+        # - advances by 1 for each photo file, regardless of mechanical or electronic shutter
+        # - does not advance for regular video files
+        # - advances for time lapse video files
+        # - creating a new directory or resetting the counter from the menu doesn't affect this shutter count
+    },
+    0x0b21 => {
+        Name => 'DirectoryIndex',
+        Groups => { 2 => 'Image' },
+        Format => 'int32u',
+    },
+    0x0b2d => {
+        Name => 'FileIndex',
+        Format => 'int32u',
+        Groups => { 2 => 'Image' },
+        Format => 'int32u',
+        ValueConv => '$val + 1',
+        ValueConvInv => '$val - 1',
+    },
+    #0x0b39 => {
+    #    Name => 'DirectoryIndex',
+    #    Groups => { 2 => 'Image' },
+    #    Format => 'int32u',
+    #    ValueConv => '$val - 1',
+    #    ValueConvInv => '$val + 1',
+    #},
+);
+
 # Canon camera information for 70D (MakerNotes tag 0x0d) (ref PH)
 %Image::ExifTool::Canon::CameraInfo70D = (
     %binaryDataAttrs,
@@ -6898,6 +6943,7 @@ my %ciMaxFocal = (
             298 => 'Canon RF 1200mm F8L IS USM', #42
             299 => 'Canon RF 1200mm F8L IS USM + RF1.4x', #42
             300 => 'Canon RF 1200mm F8L IS USM + RF2x', #42
+            301 => 'Canon RF 5.2mm F2.8L Dual Fisheye 3D VR', #PH
             302 => 'Canon RF 15-30mm F4.5-6.3 IS STM', #42
             303 => 'Canon RF 135mm F1.8 L IS USM', #42
             304 => 'Canon RF 24-50mm F4.5-6.3 IS STM', #42
@@ -6905,7 +6951,13 @@ my %ciMaxFocal = (
             306 => 'Canon RF 100-300mm F2.8L IS USM', #42
             307 => 'Canon RF 100-300mm F2.8L IS USM + RF1.4x', #42
             308 => 'Canon RF 100-300mm F2.8L IS USM + RF2x', #42
+            309 => 'Canon RF 200-800mm F6.3-9 IS USM', #42
+            310 => 'Canon RF 200-800mm F6.3-9 IS USM + RF1.4x', #42
+            311 => 'Canon RF 200-800mm F6.3-9 IS USM + RF2x', #42
+            312 => 'Canon RF 10-20mm F4 L IS STM', #42
             313 => 'Canon RF 28mm F2.8 STM', #42
+            314 => 'Canon RF 24-105mm F2.8 L IS USM Z', #42
+            315 => 'Canon RF-S 10-18mm F4.5-6.3 IS STM', #42
             # Note: add new RF lenses to %canonLensTypes with ID 61182
         },
     },
@@ -7422,7 +7474,7 @@ my %ciMaxFocal = (
         RawConv => '$$self{ColorDataVersion} = $val',
         PrintConv => {
             2 => '2 (1DmkIII)',
-            3 => '3 (40D)',
+            3 => '3 (40D)', # (doesn't record SpecularWhiteLevel, ref github#233)
             4 => '4 (1DSmkIII)',
             5 => '5 (450D/1000D)',
             6 => '6 (50D/5DmkII)',
@@ -7732,10 +7784,15 @@ my %ciMaxFocal = (
         SubDirectory => { TagTable => 'Image::ExifTool::Canon::ColorCalib2' }
     },
     0x108=> { #IB
-        Name => 'PerChannelBlackLevel',
+        Name => 'PerChannelBlackLevel', # (or perhaps AverageBlackLevel?, ref github#232)
         Condition => '$$self{ColorDataVersion} == -3',
         Format => 'int16s[4]',
     },
+    0x296 => { #github#232
+        Name => 'SpecularWhiteLevel',
+        Condition => '$$self{ColorDataVersion} == -3',
+        Format => 'int16u',
+    },
     0x14d=> { #IB
         Name => 'PerChannelBlackLevel',
         Condition => '$$self{ColorDataVersion} == -4',
@@ -8650,7 +8707,7 @@ my %ciMaxFocal = (
     },
 );
 
-# Auto Lighting Optimizater information (MakerNotes tag 0x4018) (ref PH)
+# Auto Lighting Optimizer information (MakerNotes tag 0x4018) (ref PH)
 %Image::ExifTool::Canon::LightingOpt = (
     %binaryDataAttrs,
     FORMAT => 'int32s',
@@ -8702,6 +8759,10 @@ my %ciMaxFocal = (
             2 => 'High',
         },
     },
+    11 => { #forum15445
+        Name => 'DualPixelRaw',
+        PrintConv => \%offOn,
+    },
 );
 
 # Lens information (MakerNotes tag 0x4019) (ref 20)
@@ -9100,8 +9161,14 @@ my %filterConv = (
     CMT3 => { # (CR3 files)
         Name => 'MakerNoteCanon',
         PreservePadding => 1,
+        Writable => 'undef', # (writable directory!)
+        # (note that ExifTool 12.68 and earlier lacked the ability to write this as a block,
+        #  and would instead add the maker notes the the CMT2 ExifIFD.  To remove these
+        #  incorrectly-placed maker notes, use "exiftool -exififd:makernotes= FILE")
+        MakerNotes => 1,
         SubDirectory => {
             TagTable => 'Image::ExifTool::Canon::Main',
+            DirName => 'MakerNotes', # (necessary for mechanism that prevents these from being deleted)
             ProcessProc => \&ProcessCMT3,
             WriteProc => \&Image::ExifTool::WriteTIFF,
         },

data/bin/lib/Image/ExifTool/DJI.pm

@@ -16,7 +16,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::XMP;
 use Image::ExifTool::GPS;
 
-$VERSION = '1.08';
+$VERSION = '1.09';
 
 sub ProcessDJIInfo($$$);
 
@@ -143,9 +143,10 @@ my %convFloat2 = (
         PrintConv    => 'Image::ExifTool::GPS::ToDMS($self, $val, 1, "N")',
         PrintConvInv => 'Image::ExifTool::GPS::ToDegrees($val, 1, "lat")',
     },
-    GpsLongtitude => { # (sic)
+    GpsLongtitude => { # [sic] (misspelt in DJI original file)
         Name => 'GPSLongtitude',
         Writable => 'real',
+        Avoid => 1, # (in case someone tries to write "GPSLong*")
         PrintConv    => 'Image::ExifTool::GPS::ToDMS($self, $val, 1, "E")',
         PrintConvInv => 'Image::ExifTool::GPS::ToDegrees($val, 1, "lon")',
     },

data/bin/lib/Image/ExifTool/DNG.pm

@@ -17,7 +17,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::MakerNotes;
 use Image::ExifTool::CanonRaw;
 
-$VERSION = '1.23';
+$VERSION = '1.24';
 
 sub ProcessOriginalRaw($$$);
 sub ProcessAdobeData($$$);
@@ -120,6 +120,25 @@ sub WriteAdobeStuff($$$);
     },
 );
 
+# (DNG 1.7)
+%Image::ExifTool::DNG::ImageSeq = (
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    0 => { Name => 'SeqID',         Format => 'var_string' },
+    1 => { Name => 'SeqType',       Format => 'var_string' },
+    2 => { Name => 'SeqFrameInfo',  Format => 'var_string' },
+    3 => { Name => 'SeqIndex',      Format => 'int32u' },
+    7 => { Name => 'SeqCount',      Format => 'int32u' },
+    11 => { Name => 'SeqFinal',     Format => 'int8u', PrintConv => { 0 => 'No', 1 => 'Yes' } },
+);
+
+# (DNG 1.7)
+%Image::ExifTool::DNG::ProfileDynamicRange = (
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    0 => { Name => 'PDRVersion',    Format => 'int16u' },
+    2 => { Name => 'DynamicRange',  Format => 'int16u', PrintConv => { 0 => 'Standard', 1 => 'High' } },
+    4 => { Name => 'HintMaxOutputValue', Format => 'float' },
+);
+
 # fill in maker notes
 {
     my $tagInfo;
@@ -786,7 +805,11 @@ sub ProcessAdobeMakN($$$)
                 return 1 unless $$tagInfo{Writable};
             }
             $val = substr($$dataPt, 20) unless defined $val;
-            $et->FoundTag($tagInfo, $val);
+            my $key = $et->FoundTag($tagInfo, $val);
+            if ($$et{MAKER_NOTE_FIXUP}) {
+                $$et{TAG_EXTRA}{$key}{Fixup} = $$et{MAKER_NOTE_FIXUP};
+                delete $$et{MAKER_NOTE_FIXUP};
+            }
         }
     }
     return 1;

data/bin/lib/Image/ExifTool/EXE.pm

@@ -21,7 +21,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.18';
+$VERSION = '1.19';
 
 sub ProcessPEResources($$);
 sub ProcessPEVersion($$);
@@ -726,6 +726,7 @@ my %languageCode = (
         Name => 'CPUType',
         Format => 'int16u',
         # ref /usr/include/linux/elf-em.h
+        # ref https://en.wikipedia.org/wiki/Executable_and_Linkable_Format
         PrintConv => {
             0 => 'None',
             1 => 'AT&T WE 32100',
@@ -736,21 +737,68 @@ my %languageCode = (
             6 => 'i486',
             7 => 'i860',
             8 => 'MIPS R3000',
+            9 => 'IBM System/370',
             10 => 'MIPS R4000',
-            15 => 'HPPA',
+            15 => 'HP PA-RISC',
             18 => 'Sun v8plus',
+            19 => 'Intel 80960',
             20 => 'PowerPC',
             21 => 'PowerPC 64-bit',
             22 => 'IBM S/390',
             23 => 'Cell BE SPU',
+            36 => 'NEC V800',
+            37=> 'Fujitsu FR20',
+            38 => 'TRW RH-32',
+            39 => 'Motorola RCE',
+            40 => 'Arm (up to Armv7/AArch32)',
+            41 => 'Digital Alpha',
             42 => 'SuperH',
             43 => 'SPARC v9 64-bit',
+            44 => 'Siemens TriCore',
+            45 => 'Argonaut RISC Core',
             46 => 'Renesas H8/300,300H,H8S',
+            47 => 'Hitachi H8/300H',
+            48 => 'Hitachi H8S',
+            49 => 'Hitachi H8/500',
             50 => 'HP/Intel IA-64',
-            62 => 'AMD x86-64',
-            76 => 'Axis Communications 32-bit embedded processor',
-            87 => 'NEC v850',
-            88 => 'Renesas M32R',
+            0x33 => 'Stanford MIPS-X',
+            0x34 => 'Motorola ColdFire',
+            0x35 => 'Motorola M68HC12',
+            0x36 => 'Fujitsu MMA Multimedia Accelerator',
+            0x37 => 'Siemens PCP',
+            0x38 => 'Sony nCPU embedded RISC processor',
+            0x39 => 'Denso NDR1 microprocessor',
+            0x3a => 'Motorola Star*Core processor',
+            0x3b => 'Toyota ME16 processor',
+            0x3c => 'STMicroelectronics ST100 processor',
+            0x3d => 'Advanced Logic Corp. TinyJ embedded processor family',
+            0x3e => 'AMD x86-64',
+            0x3f => 'Sony DSP Processor',
+            0x40 => 'Digital Equipment Corp. PDP-10',
+            0x41 => 'Digital Equipment Corp. PDP-11',
+            0x42 => 'Siemens FX66 microcontroller',
+            0x43 => 'STMicroelectronics ST9+ 8/16 bit microcontroller',
+            0x44 => 'STMicroelectronics ST7 8-bit microcontroller',
+            0x45 => 'Motorola MC68HC16 Microcontroller',
+            0x46 => 'Motorola MC68HC11 Microcontroller',
+            0x47 => 'Motorola MC68HC08 Microcontroller',
+            0x48 => 'Motorola MC68HC05 Microcontroller',
+            0x49 => 'Silicon Graphics SVx',
+            0x4a => 'STMicroelectronics ST19 8-bit microcontroller',
+            0x4b => 'Digital VAX',
+            0x4c => 'Axis Communications 32-bit embedded processor',
+            0x4d => 'Infineon Technologies 32-bit embedded processor',
+            0x4e => 'Element 14 64-bit DSP Processor',
+            0x4f => 'LSI Logic 16-bit DSP Processor',
+            0x57 => 'NEC v850',
+            0x58 => 'Renesas M32R',
+            0x8c => 'TMS320C6000 Family',
+            0xaf => 'MCST Elbrus e2k',
+            0xb7 => 'Arm 64-bits (Armv8/AArch64)',
+            0xdc => 'Zilog Z80',
+            0xf3 => 'RISC-V',
+            0xf7 => 'Berkeley Packet Filter',
+            0x101 => 'WDC 65C816',
             0x5441 => 'Fujitsu FR-V',
             0x9026 => 'Alpha', # (interim value)
             0x9041 => 'm32r (old)',