exiftool-vendored.pl 12.49.0 → 12.54.0

package/bin/lib/Image/ExifTool/Apple.pm

@@ -6,6 +6,7 @@
 # Revisions:    2013-09-13 - P. Harvey Created
 #
 # References:   1) http://www.photoinvestigator.co/blog/the-mystery-of-maker-apple-metadata/
+#               2) Frank Rupprecht private communication
 #------------------------------------------------------------------------------
 
 package Image::ExifTool::Apple;
@@ -15,7 +16,9 @@ use vars qw($VERSION);
 use Image::ExifTool::Exif;
 use Image::ExifTool::PLIST;
 
-$VERSION = '1.07';
+$VERSION = '1.08';
+
+sub ConvertPLIST($$);
 
 # Apple iPhone metadata (ref PH)
 %Image::ExifTool::Apple::Main = (
@@ -24,17 +27,39 @@ $VERSION = '1.07';
     WRITABLE => 1,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Image' },
     NOTES => 'Tags extracted from the maker notes of iPhone images.',
-    # 0x0001 - int32s: seen 0,1,2,3,4,9
-    # 0x0002 - binary plist with a single data object of size 512 bytes (iPhone5s)
-    0x0003 => {
+    0x0001 => { # (Version, ref 2)
+        Name => 'MakerNoteVersion',
+        Writable => 'int32s',
+    },
+    0x0002 => { #2
+        Name => 'AEMatrix',
+        Unknown => 1,
+        # (not currently writable)
+        ValueConv => \&ConvertPLIST,
+    },
+    0x0003 => { # (Timestamp, ref 2)
         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 113-247, and 100 for blank images
-    # 0x0006 - int32s: seen values 27-258, and 20 for blank images
-    # 0x0007 - int32s: seen 1
-    0x0008 => { #1
+    0x0004 => { #2
+        Name => 'AEStable',
+        Writable => 'int32s',
+        PrintConv => { 0 => 'No', 1 => 'Yes' },
+    },
+    0x0005 => { #2
+        Name => 'AETarget',
+        Writable => 'int32s',
+    },
+    0x0006 => { #2
+        Name => 'AEAverage',
+        Writable => 'int32s',
+    },
+    0x0007 => { #2
+        Name => 'AFStable',
+        Writable => 'int32s',
+        PrintConv => { 0 => 'No', 1 => 'Yes' },
+    },
+    0x0008 => { #1 (FocusAccelerometerVector, ref 2)
         Name => 'AccelerationVector',
         Groups => { 2 => 'Camera' },
         Writable => 'rational64s',
@@ -51,8 +76,8 @@ $VERSION = '1.07';
             toward the bottom, and positive Z points into the face of the phone
         },
     },
-    # 0x0009 - int32s: seen 19,275,531,4371
-    0x000a => {
+    # 0x0009 - int32s: seen 19,275,531,4371 (SISMethod, ref 2)
+    0x000a => { # (HDRMethod, ref 2)
         Name => 'HDRImageType',
         Writable => 'int32s',
         PrintConv => {
@@ -61,12 +86,12 @@ $VERSION = '1.07';
             4 => 'Original Image',
         },
     },
-    0x000b => {
+    0x000b => { # (BurstUUID, ref 2)
         Name => 'BurstUUID',
         Writable => 'string',
         Notes => 'unique ID for all images in a burst',
     },
-    0x000c => { # ref forum13710 (Neal Krawetz)
+    0x000c => { # ref forum13710 (Neal Krawetz) (SphereHealthTrackingError, ref 2)
         Name => 'FocusDistanceRange',
         Writable => 'rational64s',
         Count => 2,
@@ -76,29 +101,157 @@ $VERSION = '1.07';
         },
         PrintConvInv => '$val =~ s/ - //; $val =~ s/ ?m$//; $val',
     },
-    # 0x000d - int32s: 0,1,6,20,24,32,40
-    # 0x000e - int32s: 0,1,4,12 (Orientation? 0=landscape? 4=portrait? ref 1)
-    # 0x000f - int32s: 2,3
-    # 0x0010 - int32s: 1
-    0x0011 => { # (if defined, there is a live photo associated with the video, #forum13565)
+    # 0x000d - int32s: 0,1,6,20,24,32,40 (SphereHealthAverageCurrent, ref 2)
+    # 0x000e - int32s: 0,1,4,12 (Orientation? 0=landscape? 4=portrait? ref 1) (SphereMotionDataStatus, ref 2)
+    0x000f => { #2
+        Name => 'OISMode',
+        Writable => 'int32s',
+        # seen: 2,3,5
+    },
+    # 0x0010 - int32s: 1 (SphereStatus, ref 2)
+    0x0011 => { # (if defined, there is a live photo associated with the video, #forum13565) (AssetIdentifier, ref 2)
         Name => 'MediaGroupUUID', #NealKrawetz private communication
         # (changed in 12.19 from Name => 'ContentIdentifier', #forum8750)
         Writable => 'string',
     },
-    # 0x0014 - int32s: 1,2,3,4,5 (iPhone 6s, iOS 6.1)
-    0x0015 => {
+    # 0x0012 - (QRMOutputType, ref 2)
+    # 0x0013 - (SphereExternalForceOffset, ref 2)
+    0x0014 => { # (StillImageCaptureType, ref 2)
+        Name => 'ImageCaptureType',
+        Writable => 'int32s',
+        Unknown => 1, # (don't know what the values mean)
+        # seen: 1,2,3,4,5,10,12
+    },
+    0x0015 => { # (ImageGroupIdentifier, ref 2)
         Name => 'ImageUniqueID',
         Writable => 'string',
     },
-    # 0x0016 - string[29]: "AXZ6pMTOh2L+acSh4Kg630XCScoO\0"
-    0x0017 => { #forum13565 (only valid if MediaGroupUUID exists)
+    # 0x0016 - string[29]: "AXZ6pMTOh2L+acSh4Kg630XCScoO\0" (PhotosOriginatingSignature, ref 2)
+    0x0017 => { #forum13565 (only valid if MediaGroupUUID exists) (StillImageCaptureFlags, ref 2)
         Name => 'LivePhotoVideoIndex',
         Notes => 'divide by RunTimeScale to get time in seconds',
     },
-    # 0x0017 - int32s: 0,8192
-    # 0x0019 - int32s: 0,2,128
-    # 0x001a - string[6]: "q825s\0"
-    # 0x001f - int32s: 0
+    # 0x0018 - (PhotosRenderOriginatingSignature, ref 2)
+    0x0019 => { # (StillImageProcessingFlags, ref 2)
+        Name => 'ImageProcessingFlags',
+        Writable => 'int32s',
+        Unknown => 1,
+        PrintConv => { BITMASK => { } },
+    },
+    0x001a => { # (PhotoTranscodeQualityHint, ref 2)
+        Name => 'QualityHint',
+        Writable => 'string',
+        Unknown => 1,
+        # seen: "q825s\0", "q750n\0", "q900n\0"
+    },
+    # 0x001b - (PhotosRenderEffect, ref 2)
+    # 0x001c - (BracketedCaptureSequenceNumber, ref 2)
+    0x001d => { #2
+        Name => 'LuminanceNoiseAmplitude',
+        Writable => 'rational64s',
+    },
+    # 0x001e - (OriginatingAppID, ref 2)
+    # 0x001f - int32s: 0,1 (PhotosAppFeatureFlags, ref 2)
+    0x0020 => { # (ImageCaptureRequestIdentifier, ref 2)
+        Name => 'ImageCaptureReqestID',
+        Writable => 'string',
+        Unknown => 1,
+    },
+    0x0021 => { # (MeteorHeadroom, ref 2)
+        Name => 'HDRHeadroom',
+        Writable => 'rational64s',
+    },
+    # 0x0022 - (ARKitPhoto, ref 2)
+    # 0x0023 - int32s[2] (AFPerformance, ref 2)
+    # 0x0024 - (AFExternalOffset, ref 2)
+    0x0025 => { # (StillImageSceneFlags, ref 2)
+        Name => 'SceneFlags',
+        Writable => 'int32s',
+        Unknown => 1,
+        PrintConv => { BITMASK => { } },
+    },
+    0x0026 => { # (StillImageSNRType, ref 2)
+        Name => 'SignalToNoiseRatioType',
+        Writable => 'int32s',
+        Unknown => 1,
+    },
+    0x0027 => { # (StillImageSNR, ref 2)
+        Name => 'SignalToNoiseRatio',
+        Writable => 'rational64s',
+    },
+    # 0x0028 - int32s (UBMethod, ref 2)
+    # 0x0029 - string (SpatialOverCaptureGroupIdentifier, ref 2)
+    # 0x002A - (iCloudServerSoftwareVersionForDynamicallyGeneratedMedia, ref 2)
+    # 0x002B - (PhotoIdentifier, ref 2)
+    # 0x002C - (SpatialOverCaptureImageType, ref 2)
+    # 0x002D - (CCT, ref 2)
+    # 0x002E - (ApsMode, ref 2)
+    0x002F => { #2
+        Name => 'FocusPosition',
+        Writable => 'int32s',
+    },
+    0x0030 => { # (MeteorPlusGainMap, ref 2)
+        Name => 'HDRGain',
+        Writable => 'rational64s',
+    },
+    # 0x0031 - (StillImageProcessingHomography, ref 2)
+    # 0x0032 - (IntelligentDistortionCorrection, ref 2)
+    # 0x0033 - (NRFStatus, ref 2)
+    # 0x0034 - (NRFInputBracketCount, ref 2)
+    # 0x0035 - (NRFRegisteredBracketCount, ref 2)
+    # 0x0036 - (LuxLevel, ref 2)
+    # 0x0037 - (LastFocusingMethod, ref 2)
+    0x0038 => { # (TimeOfFlightAssistedAutoFocusEstimatorMeasuredDepth, ref 2)
+        Name => 'AFMeasuredDepth',
+        Notes => 'from the time-of-flight-assisted auto-focus estimator',
+        Writable => 'int32s',
+    },
+    # 0x0039 - (TimeOfFlightAssistedAutoFocusEstimatorROIType, ref 2)
+    # 0x003A - (NRFSRLStatus, ref 2)
+    # 0x003B - (SystemPressureLevel, ref 2)
+    # 0x003C - (CameraControlsStatisticsMaster, ref 2)
+    0x003D => { # (TimeOfFlightAssistedAutoFocusEstimatorSensorConfidence, ref 2)
+        Name => 'AFConfidence',
+        Writable => 'int32s',
+    },
+    0x003E => { # (ColorCorrectionMatrix, ref 2)
+        Name => 'ColorCorrectionMatrix',
+        Unknown => 1,
+        ValueConv => \&ConvertPLIST,
+    },
+    0x003F => { #2
+        Name => 'GreenGhostMitigationStatus',
+        Writable => 'int32s',
+        Unknown => 1,
+    },
+    0x0040 => { #2
+        Name => 'SemanticStyle',
+        ValueConv => \&ConvertPLIST,
+    },
+    0x0041 => { # (SemanticStyleKey_RenderingVersion, ref 2)
+        Name => 'SemanticStyleRenderingVer',
+        ValueConv => \&ConvertPLIST,
+    },
+    0x0042 => { # (SemanticStyleKey_Preset, ref 2)
+        Name => 'SemanticStylePreset',
+        ValueConv => \&ConvertPLIST,
+    },
+    # 0x0043 - (SemanticStyleKey_ToneBias, ref 2)
+    # 0x0044 - (SemanticStyleKey_WarmthBias, ref 2)
+    0x0045 => { # (FrontFacing, ref 2)
+        Name => 'FrontFacingCamera',
+        Writable => 'int32s',
+        PrintConv => { 0 => 'No', 1 => 'Yes' }, #PH (NC)
+    },
+    # 0x0046 - (TimeOfFlightAssistedAutoFocusEstimatorContainsBlindSpot, ref 2)
+    # 0x0047 - (LeaderFollowerAutoFocusLeaderDepth, ref 2)
+    # 0x0048 - (LeaderFollowerAutoFocusLeaderFocusMethod, ref 2)
+    # 0x0049 - (LeaderFollowerAutoFocusLeaderConfidence, ref 2)
+    # 0x004A - (LeaderFollowerAutoFocusLeaderROIType, ref 2)
+    # 0x004B - (ZeroShutterLagFailureReason, ref 2)
+    # 0x004C - (TimeOfFlightAssistedAutoFocusEstimatorMSPMeasuredDepth, ref 2)
+    # 0x004D - (TimeOfFlightAssistedAutoFocusEstimatorMSPSensorConfidence, ref 2)
+    # 0x004E - (Camera, ref 2)
 );
 
 # PLIST-format CMTime structure (ref PH)
@@ -142,6 +295,23 @@ $VERSION = '1.07';
 # add our composite tags
 Image::ExifTool::AddCompositeTags('Image::ExifTool::Apple');
 
+#------------------------------------------------------------------------------
+# Convert from binary PLIST format to a tag value we can use
+# Inputs: 0) binary plist data, 1) ExifTool ref
+# Returns: converted value
+sub ConvertPLIST($$)
+{
+    my ($val, $et) = @_;
+    my $dirInfo = { DataPt => \$val };
+    require Image::ExifTool::PLIST;
+    Image::ExifTool::PLIST::ProcessBinaryPLIST($et, $dirInfo);
+    $val = $$dirInfo{Value};
+    if (ref $val eq 'HASH' and not $et->Options('Struct')) {
+        require 'Image/ExifTool/XMPStruct.pl';
+        $val = Image::ExifTool::XMP::SerializeStruct($val);
+    }
+    return $val;
+}
 
 1;  # end
 
@@ -162,7 +332,7 @@ Apple maker notes in EXIF information.
 
 =head1 AUTHOR
 
-Copyright 2003-2022, Phil Harvey (philharvey66 at gmail.com)
+Copyright 2003-2023, Phil Harvey (philharvey66 at gmail.com)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.

package/bin/lib/Image/ExifTool/Audible.pm

@@ -291,7 +291,7 @@ information from Audible audio books.
 
 =head1 AUTHOR
 
-Copyright 2003-2022, Phil Harvey (philharvey66 at gmail.com)
+Copyright 2003-2023, Phil Harvey (philharvey66 at gmail.com)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.

package/bin/lib/Image/ExifTool/BMP.pm

@@ -335,7 +335,7 @@ This module contains definitions required by Image::ExifTool to read BMP
 
 =head1 AUTHOR
 
-Copyright 2003-2022, Phil Harvey (philharvey66 at gmail.com)
+Copyright 2003-2023, Phil Harvey (philharvey66 at gmail.com)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.

package/bin/lib/Image/ExifTool/BPG.pm

@@ -231,7 +231,7 @@ This module contains definitions required by Image::ExifTool to read BPG
 
 =head1 AUTHOR
 
-Copyright 2003-2022, Phil Harvey (philharvey66 at gmail.com)
+Copyright 2003-2023, Phil Harvey (philharvey66 at gmail.com)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.

package/bin/lib/Image/ExifTool/BZZ.pm

@@ -445,7 +445,7 @@ compression ability).
 
 =head1 AUTHOR
 
-Copyright 2003-2022, Phil Harvey (philharvey66 at gmail.com)
+Copyright 2003-2023, Phil Harvey (philharvey66 at gmail.com)
 Copyright 2002, Leon Bottou and Yann Le Cun
 Copyright 2001, AT&T
 Copyright 1999-2001, LizardTech Inc.

package/bin/lib/Image/ExifTool/BigTIFF.pm

@@ -275,7 +275,7 @@ information in BigTIFF images.
 
 =head1 AUTHOR
 
-Copyright 2003-2022, Phil Harvey (philharvey66 at gmail.com)
+Copyright 2003-2023, Phil Harvey (philharvey66 at gmail.com)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.

package/bin/lib/Image/ExifTool/BuildTagLookup.pm

@@ -35,7 +35,7 @@ use Image::ExifTool::Sony;
 use Image::ExifTool::Validate;
 use Image::ExifTool::MacOS;
 
-$VERSION = '3.49';
+$VERSION = '3.50';
 @ISA = qw(Exporter);
 
 sub NumbersFirst($$);
@@ -671,7 +671,7 @@ L<Image::ExifTool::BuildTagLookup|Image::ExifTool::BuildTagLookup>.
 
 ~head1 AUTHOR
 
-Copyright 2003-2022, Phil Harvey (philharvey66 at gmail.com)
+Copyright 2003-2023, Phil Harvey (philharvey66 at gmail.com)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.
@@ -1291,16 +1291,19 @@ TagID:  foreach $tagID (@keys) {
                         $printConv = shift @printConvList;
                         $index = shift @indexList;
                     }
-                } elsif ($printConv and $printConv =~ /DecodeBits\(\$val,\s*(\{.*\})\s*\)/s) {
+                # look inside scalar PrintConv for a bit/byte conversion
+                # (see Photoshop:PrintFlags for use of "$byte" decoding)
+                } elsif ($printConv and $printConv =~ /DecodeBits\(\$(val|byte),\s*(\\\%[\w:]+|\{.*\})\s*\)/s) {
+                    my $type = $1 eq 'byte' ? 'Byte' : 'Bit';
                     $$self{Model} = '';   # needed for Nikon ShootingMode
-                    my $bits = eval $1;
+                    my $bits = eval $2;
                     delete $$self{Model};
                     if ($@) {
                         warn $@;
                     } else {
                         my @pk = sort { NumbersFirst($a,$b) } keys %$bits;
                         foreach (@pk) {
-                            push @values, "Bit $_ = " . $$bits{$_};
+                            push @values, "$type $_ = " . $$bits{$_};
                         }
                     }
                 }
@@ -1504,7 +1507,7 @@ TagID:  foreach $tagID (@keys) {
                     }
                 }
                 foreach $tagID (sort keys %$hash) {
-                    warn sprintf("Warning: Missing %s for %s %s, tag %d (0x%.4x)\n",
+                    warn sprintf("Warning: Missing %s for %s %s, tag %s (0x%.4x)\n",
                                  $var, $short, $$hash{$tagID}, $tagID, $tagID);
                 }
             }
@@ -2770,7 +2773,7 @@ Returned list of writable pseudo tags.
 
 =head1 AUTHOR
 
-Copyright 2003-2022, Phil Harvey (philharvey66 at gmail.com)
+Copyright 2003-2023, Phil Harvey (philharvey66 at gmail.com)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.

package/bin/lib/Image/ExifTool/CBOR.pm

@@ -307,7 +307,7 @@ specification.
 
 =head1 AUTHOR
 
-Copyright 2003-2022, Phil Harvey (philharvey66 at gmail.com)
+Copyright 2003-2023, Phil Harvey (philharvey66 at gmail.com)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.

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

@@ -88,7 +88,7 @@ sub ProcessCTMD($$$);
 sub ProcessExifInfo($$$);
 sub SwapWords($);
 
-$VERSION = '4.62';
+$VERSION = '4.64';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
@@ -620,8 +620,9 @@ $VERSION = '4.62';
    '61182.40' => 'Canon RF 1200mm F8L IS USM', #42
    '61182.41' => 'Canon RF 1200mm F8L IS USM + RF1.4x', #42
    '61182.42' => 'Canon RF 1200mm F8L IS USM + RF2x', #42
+   '61182.43' => 'Canon RF 135mm F1.8 L IS USM', #42
     # we need the RFLensType values for the following...
-   '61182.43' => 'Canon RF 5.2mm F2.8L Dual Fisheye 3D VR', #PH (NC)
+   '61182.44' => 'Canon RF 5.2mm F2.8L Dual Fisheye 3D VR', #PH (NC)
     65535 => 'n/a',
 );
 
@@ -982,6 +983,7 @@ $VERSION = '4.62';
     0x80000465 => 'EOS R10', #42
     0x80000467 => 'PowerShot ZOOM',
     0x80000468 => 'EOS M50 Mark II / Kiss M2', #IB
+    0x80000481 => 'EOS R6 Mark II', #42
     0x80000520 => 'EOS D2000C', #IB
     0x80000560 => 'EOS D6000C', #PH (guess)
 );
@@ -1944,7 +1946,7 @@ my %offOn = ( 0 => 'Off', 1 => 'On' );
             SubDirectory => { TagTable => 'Image::ExifTool::Canon::ColorData10' },
         },
         {   # (int16u[3973]) - R3 ref IB
-            Condition => '$count == 3973',
+            Condition => '$count == 3973 or $count == 3778',
             Name => 'ColorData11',
             SubDirectory => { TagTable => 'Image::ExifTool::Canon::ColorData11' },
         },
@@ -6377,10 +6379,11 @@ my %ciMaxFocal = (
     1 => {
         Name => 'TimeZone',
         PrintConv => 'Image::ExifTool::TimeZoneString($val)',
-        PrintConvInv => sub {
-            my $val = shift;
-            $val =~ /^([-+]?)(\d{1,2}):?(\d{2})$/ or return undef;
-            return(($1 eq '-' ? -1 : 1) * ($2 * 60 + $3));
+        PrintConvInv => q{
+            $val =~ /Z$/ and return 0;
+            $val =~ /([-+])(\d{1,2}):?(\d{2})$/ and return $1 . ($2 * 60 + $3);
+            $val =~ /^(\d{2})(\d{2})$/ and return $1 * 60 + $2;
+            return undef;
         },
     },
     2 => {
@@ -6836,6 +6839,7 @@ my %ciMaxFocal = (
             299 => 'Canon RF 1200mm F8L IS USM + RF1.4x', #42
             300 => 'Canon RF 1200mm F8L IS USM + RF2x', #42
             302 => 'Canon RF 15-30mm F4.5-6.3 IS STM', #42
+            303 => 'Canon RF 135mm F1.8 L IS USM', #42
             # Note: add new RF lenses to %canonLensTypes with ID 61182
         },
     },
@@ -8333,7 +8337,7 @@ my %ciMaxFocal = (
 # Color data (MakerNotes tag 0x4001, count=3973, ref IB)
 %Image::ExifTool::Canon::ColorData11 = (
     %binaryDataAttrs,
-    NOTES => 'These tags are used by the EOS R3',
+    NOTES => 'These tags are used by the EOS R3, R7 and R6mkII',
     FORMAT => 'int16s',
     FIRST_ENTRY => 0,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
@@ -8345,6 +8349,7 @@ my %ciMaxFocal = (
         RawConv => '$$self{ColorDataVersion} = $val',
         PrintConv => {
             34 => '34 (R3)', #IB
+            48 => '48 (R7, R10, R6 Mark II)', #IB
         },
     },
     0x69 => { Name => 'WB_RGGBLevelsAsShot',     Format => 'int16s[4]' },
@@ -8573,6 +8578,10 @@ my %ciMaxFocal = (
         Name => 'DistortionCorrectionSetting',
         PrintConv => \%offOn,
     },
+    9 => { #forum14286
+        Name => 'DigitalLensOptimizerSetting',
+        PrintConv => \%offOn,
+    },
 );
 
 # Auto Lighting Optimizater information (MakerNotes tag 0x4018) (ref PH)
@@ -8619,6 +8628,14 @@ my %ciMaxFocal = (
     # 6 - related to ChromaticAberrationCorr
     # 7 - related to DistortionCorrection (0=off, 1=On in a 5DmkIV sample)
     # 8 - related to PeripheralIlluminationCorr and ChromaticAberrationCorr
+    10 => { #forum14286
+        Name => 'DigitalLensOptimizer',
+        PrintConv => {
+            0 => 'Off',
+            1 => 'Stanard',
+            2 => 'High',
+        },
+    },
 );
 
 # Lens information (MakerNotes tag 0x4019) (ref 20)
@@ -10171,7 +10188,7 @@ Canon maker notes in EXIF information.
 
 =head1 AUTHOR
 
-Copyright 2003-2022, Phil Harvey (philharvey66 at gmail.com)
+Copyright 2003-2023, Phil Harvey (philharvey66 at gmail.com)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.

package/bin/lib/Image/ExifTool/CanonCustom.pm

@@ -2873,7 +2873,7 @@ Image::ExifTool to read this information.
 
 =head1 AUTHOR
 
-Copyright 2003-2022, Phil Harvey (philharvey66 at gmail.com)
+Copyright 2003-2023, Phil Harvey (philharvey66 at gmail.com)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.

package/bin/lib/Image/ExifTool/CanonRaw.pm

@@ -884,7 +884,7 @@ tags.)
 
 =head1 AUTHOR
 
-Copyright 2003-2022, Phil Harvey (philharvey66 at gmail.com)
+Copyright 2003-2023, Phil Harvey (philharvey66 at gmail.com)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.

package/bin/lib/Image/ExifTool/CanonVRD.pm

@@ -23,7 +23,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Canon;
 
-$VERSION = '1.34';
+$VERSION = '1.35';
 
 sub ProcessCanonVRD($$;$);
 sub WriteCanonVRD($$;$);
@@ -999,7 +999,7 @@ my $blankFooter = "CANON OPTIONAL DATA\0" . ("\0" x 42) . "\xff\xd9";
     PROCESS_PROC => \&ProcessDR4,
     WRITE_PROC => \&ProcessDR4,
     WRITABLE => 1,
-    GROUPS => { 2 => 'Image' },
+    GROUPS => { 1 => 'CanonDR4', 2 => 'Image' },
     VARS => { HEX_ID => 1, SORT_PROC => \&SortDR4 },
     NOTES => q{
         Tags written by Canon DPP version 4 in CanonVRD trailers and DR4 files. Each
@@ -1276,7 +1276,7 @@ my $blankFooter = "CANON OPTIONAL DATA\0" . ("\0" x 42) . "\xff\xd9";
     WRITABLE => 1,
     FIRST_ENTRY => 0,
     FORMAT => 'int32u',
-    GROUPS => { 2 => 'Image' },
+    GROUPS => { 1 => 'CanonDR4', 2 => 'Image' },
     # 0 - value: 'IIII' (presumably byte order)
     # 1 - value: 0x00040004 (currently use this for magic number)
     # 2 - value: 6
@@ -1301,7 +1301,7 @@ my $blankFooter = "CANON OPTIONAL DATA\0" . ("\0" x 42) . "\xff\xd9";
     WRITABLE => 1,
     FIRST_ENTRY => 0,
     FORMAT => 'int32u',
-    GROUPS => { 2 => 'Image' },
+    GROUPS => { 1 => 'CanonDR4', 2 => 'Image' },
     0x00 => {
         Name => 'ToneCurveColorSpace',
         PrintConv => {
@@ -1354,7 +1354,7 @@ my $blankFooter = "CANON OPTIONAL DATA\0" . ("\0" x 42) . "\xff\xd9";
     WRITABLE => 1,
     FIRST_ENTRY => 0,
     FORMAT => 'double',
-    GROUPS => { 2 => 'Image' },
+    GROUPS => { 1 => 'CanonDR4', 2 => 'Image' },
     0x02 => 'GammaContrast',
     0x03 => 'GammaColorTone',
     0x04 => 'GammaSaturation',
@@ -1410,7 +1410,7 @@ my $blankFooter = "CANON OPTIONAL DATA\0" . ("\0" x 42) . "\xff\xd9";
     WRITABLE => 1,
     FIRST_ENTRY => 0,
     FORMAT => 'int32s',
-    GROUPS => { 2 => 'Image' },
+    GROUPS => { 1 => 'CanonDR4', 2 => 'Image' },
     0 => { Name => 'CropActive', %noYes },
     1 => 'CropRotatedOriginalWidth',
     2 => 'CropRotatedOriginalHeight',
@@ -1432,7 +1432,7 @@ my $blankFooter = "CANON OPTIONAL DATA\0" . ("\0" x 42) . "\xff\xd9";
 # DR4 Stamp Tool tags (ref PH)
 %Image::ExifTool::CanonVRD::StampInfo = (
     PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
-    GROUPS => { 2 => 'Image' },
+    GROUPS => { 1 => 'CanonDR4', 2 => 'Image' },
     FORMAT => 'int32u',
     FIRST_ENTRY => 0,
     0x02 => 'StampToolCount',
@@ -1441,7 +1441,7 @@ my $blankFooter = "CANON OPTIONAL DATA\0" . ("\0" x 42) . "\xff\xd9";
 # DR4 dust delete information (ref PH)
 %Image::ExifTool::CanonVRD::DustInfo = (
     PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
-    GROUPS => { 2 => 'Image' },
+    GROUPS => { 1 => 'CanonDR4', 2 => 'Image' },
     FORMAT => 'int32u',
     FIRST_ENTRY => 0,
     0x02 => { Name => 'DustDeleteApplied', %noYes },
@@ -2263,7 +2263,7 @@ files, and as a trailer in JPEG, CRW, CR2 and TIFF images.
 
 =head1 AUTHOR
 
-Copyright 2003-2022, Phil Harvey (philharvey66 at gmail.com)
+Copyright 2003-2023, Phil Harvey (philharvey66 at gmail.com)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.

package/bin/lib/Image/ExifTool/CaptureOne.pm

@@ -221,7 +221,7 @@ settings files (COS).
 
 =head1 AUTHOR
 
-Copyright 2003-2022, Phil Harvey (philharvey66 at gmail.com)
+Copyright 2003-2023, Phil Harvey (philharvey66 at gmail.com)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.

package/bin/lib/Image/ExifTool/Casio.pm

@@ -634,7 +634,7 @@ $VERSION = '1.38';
             15 => 'High Speed Best Selection',
             16 => 'Portrait',
             17 => 'Scenery',
-            18 => 'Portrait With Scenery',
+            18 => 'Portrait with Scenery',
             19 => 'Flower',
             20 => 'Natural Green',
             21 => 'Autumn Leaves',
@@ -723,7 +723,7 @@ $VERSION = '1.38';
             14 => 'High Speed Best Selection',
             15 => 'Portrait',
             16 => 'Scenery',
-            17 => 'Portrait With Scenery',
+            17 => 'Portrait with Scenery',
             18 => 'Flower',
             19 => 'Natural Green',
             20 => 'Autumn Leaves',
@@ -1408,7 +1408,7 @@ $VERSION = '1.38';
             0 => 'Off',
             1 => 'Portrait',
             2 => 'Scenery',
-            3 => 'Portrait With Scenery',
+            3 => 'Portrait with Scenery',
             4 => 'Children',
             5 => 'Sports',
             6 => 'Night Scene',
@@ -2034,7 +2034,7 @@ Casio maker notes in EXIF information.
 
 =head1 AUTHOR
 
-Copyright 2003-2022, Phil Harvey (philharvey66 at gmail.com)
+Copyright 2003-2023, Phil Harvey (philharvey66 at gmail.com)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.