exiftool_vendored 12.08.0 → 12.13.0

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

@@ -512,6 +512,7 @@ my %panasonicWhiteBalance = ( #forum9396
         # when format is int32u (S models), these values have been observed (ref IB):
         #  256 - Leica lens
         #  257 - Lumix lens
+        #  258 - ? (seen once)
     },
     0x1202 => { #IB
         Name => 'LensTypeModel',

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

@@ -58,7 +58,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 use Image::ExifTool::HP;
 
-$VERSION = '3.34';
+$VERSION = '3.35';
 
 sub CryptShutterCount($$);
 sub PrintFilter($$$);
@@ -2894,13 +2894,20 @@ my %binaryDataAttrs = (
         Writable => 'string',
         Notes => 'left blank by some cameras',
     },
-    0x022a => { #PH (K-5)
+    0x022a => [{ #PH (RICOH models (GR III))
+        Name => 'FilterInfo',
+        Condition => '$$self{Make} =~ /^RICOH/',
+        SubDirectory => {
+            TagTable => 'Image::ExifTool::Pentax::FilterInfo',
+            ByteOrder => 'LittleEndian',
+        },
+    },{ #PH (K-5)
         Name => 'FilterInfo',
         SubDirectory => {
             TagTable => 'Image::ExifTool::Pentax::FilterInfo',
             ByteOrder => 'BigEndian',
         },
-    },
+    }],
     0x022b => { #PH (K-5)
         Name => 'LevelInfo',
         SubDirectory => { TagTable => 'Image::ExifTool::Pentax::LevelInfo' },

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

@@ -47,7 +47,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 
-$VERSION = '2.53';
+$VERSION = '2.56';
 
 sub ProcessMOV($$;$);
 sub ProcessKeys($$$);
@@ -214,11 +214,16 @@ my %ftypLookup = (
     'crx ' => 'Canon Raw (.CRX)', #PH (CR3 or CRM; use Canon CompressorVersion to decide)
 );
 
-# information for time/date-based tags (time zero is Jan 1, 1904)
+# information for int32u date/time tags (time zero is Jan 1, 1904)
 my %timeInfo = (
     Notes => 'converted from UTC to local time if the QuickTimeUTC option is set',
+    Shift => 'Time',
+    Writable => 1,
+    Permanent => 1,
+    DelValue => 0,
     # It is not uncommon for brain-dead software to use the wrong time zero,
     # so assume a time zero of Jan 1, 1970 if the date is before this
+    # Note: This value will be in UTC if generated by a system that is aware of the time zone
     RawConv => q{
         my $offset = (66 * 365 + 17) * 24 * 3600;
         return $val - $offset if $val >= $offset or $$self{OPTIONS}{QuickTimeUTC};
@@ -227,12 +232,17 @@ my %timeInfo = (
         }
         return $val;
     },
-    Shift => 'Time',
-    Writable => 1,
-    Permanent => 1,
-    DelValue => 0,
-    # Note: This value will be in UTC if generated by a system that is aware of the time zone
-    ValueConv => 'ConvertUnixTime($val, $self->Options("QuickTimeUTC"))',
+    RawConvInv => q{
+        if ($$self{FileType} eq 'CR3' and not $self->Options('QuickTimeUTC')) {
+            # convert to UTC
+            my $offset = (66 * 365 + 17) * 24 * 3600;
+            $val = ConvertUnixTime($val - $offset);
+            $val = GetUnixTime($val, 1) + $offset;
+        }
+        return $val;
+    },
+    # (all CR3 files store UTC times - PH)
+    ValueConv => 'ConvertUnixTime($val, $self->Options("QuickTimeUTC") || $$self{FileType} eq "CR3")',
     ValueConvInv => 'GetUnixTime($val, $self->Options("QuickTimeUTC")) + (66 * 365 + 17) * 24 * 3600',
     PrintConv => '$self->ConvertDateTime($val)',
     PrintConvInv => '$self->InverseDateTime($val)',
@@ -672,7 +682,7 @@ my %eeBox = (
         ValueConv => '$val=~tr/-/:/; $val',
         ValueConvInv => '$val=~s/(\d+):(\d+):/$1-$2-/; $val',
         PrintConv => '$self->ConvertDateTime($val)',
-        PrintConvInv => '$self->InverseDateTime($val)',
+        PrintConvInv => '$self->InverseDateTime($val,1)', # (add time zone if it didn't exist)
     },
     gps0 => { #PH (DuDuBell M1, VSYS M6L)
         Name => 'GPSTrack',
@@ -1405,7 +1415,7 @@ my %eeBox = (
             return $val;
         },
         PrintConv => '$self->ConvertDateTime($val)',
-        PrintConvInv => '$self->InverseDateTime($val)',
+        PrintConvInv => '$self->InverseDateTime($val,1)', # (add time zone if it didn't exist)
     },
     "\xa9ART" => 'Artist', #PH (iTunes 8.0.2)
     "\xa9alb" => 'Album', #PH (iTunes 8.0.2)
@@ -1679,7 +1689,7 @@ my %eeBox = (
             return $val;
         },
         PrintConv => '$self->ConvertDateTime($val)',
-        PrintConvInv => '$self->InverseDateTime($val)',
+        PrintConvInv => '$self->InverseDateTime($val,1)', # (add time zone if it didn't exist)
     },
     manu => { # (SX280)
         Name => 'Make',
@@ -2114,7 +2124,7 @@ my %eeBox = (
             return $val;
         },
         PrintConv => '$self->ConvertDateTime($val)',
-        PrintConvInv => '$self->InverseDateTime($val)',
+        PrintConvInv => '$self->InverseDateTime($val,1)', # (add time zone if it didn't exist)
     },
     '@xyz' => { #PH (iPhone 3GS)
         Name => 'GPSCoordinates',
@@ -2555,7 +2565,23 @@ my %eeBox = (
             Start => 4,
         },
     },
-    # idat
+    idat => {
+        Name => 'MetaImageSize', #PH (NC)
+        Format => 'int16u',
+        # (don't know what the first two numbers are for)
+        PrintConv => '$val =~ s/^(\d+) (\d+) (\d+) (\d+)/${3}x$4/; $val',
+    },
+    uuid => [
+        { #PH (Canon R5/R6 HIF)
+            Name => 'MetaVersion', # (NC)
+            Condition => '$$valPt=~/^\x85\xc0\xb6\x87\x82\x0f\x11\xe0\x81\x11\xf4\xce\x46\x2b\x6a\x48/',
+            RawConv => 'substr($val, 0x14)',
+        },
+        {
+            Name => 'UUID-Unknown',
+            %unknownInfo,
+        },
+    ],
 );
 
 # additional metadata container (ref ISO14496-12:2015)
@@ -2867,12 +2893,16 @@ my %eeBox = (
     WRITE_PROC => \&WriteQuickTime,
     GROUPS => { 2 => 'Image' },
     # (Note: ExifTool's ItemRefVersion may be used to test the iref version number)
-    # dimg - DerivedImage
-    # thmb - Thumbnail
-    # auxl - AuxiliaryImage
+    NOTES => q{
+        The Item reference entries listed in the table below contain information about
+        the associations between items in the file.  This information is used by
+        ExifTool, but these entries are not extracted as tags.
+    },
+    dimg => { Name => 'DerivedImageRef',   RawConv => 'undef' },
+    thmb => { Name => 'ThumbnailRef',      RawConv => 'undef' },
+    auxl => { Name => 'AuxiliaryImageRef', RawConv => 'undef' },
     cdsc => {
         Name => 'ContentDescribes',
-        Notes => 'parsed, but not extracted as a tag',
         RawConv => \&ParseContentDescribes,
         WriteHook => \&ParseContentDescribes,
     },
@@ -2992,7 +3022,7 @@ my %eeBox = (
             return $val;
         },
         PrintConv => '$self->ConvertDateTime($val)',
-        PrintConvInv => '$self->InverseDateTime($val)',
+        PrintConvInv => '$self->InverseDateTime($val,1)', # (add time zone if it didn't exist)
     },
     "\xa9des" => 'Description', #4
     "\xa9enc" => 'EncodedBy', #10
@@ -6170,7 +6200,7 @@ my %eeBox = (
             return $val;
         },
         PrintConv => '$self->ConvertDateTime($val)',
-        PrintConvInv => '$self->InverseDateTime($val)',
+        PrintConvInv => '$self->InverseDateTime($val,1)', # (add time zone if it didn't exist)
     },
     description => { },
     director    => { },
@@ -6230,7 +6260,7 @@ my %eeBox = (
             return $val;
         },
         PrintConv => '$self->ConvertDateTime($val)',
-        PrintConvInv => '$self->InverseDateTime($val)',
+        PrintConvInv => '$self->InverseDateTime($val,1)', # (add time zone if it didn't exist)
     },
     'direction.facing' => { Name => 'CameraDirection', Groups => { 2 => 'Location' } },
     'direction.motion' => { Name => 'CameraMotion',    Groups => { 2 => 'Location' } },
@@ -8618,10 +8648,10 @@ sub ProcessSampleDesc($$$)
     my $dirLen = $$dirInfo{DirLen} || (length($$dataPt) - $pos);
     return 0 if $pos + 8 > $dirLen;
 
-    my $num = Get32u($dataPt, 4);   # get number of sample descriptions in table
+    my $num = Get32u($dataPt, 4);   # get number of sample entries in table
     $pos += 8;
     my $i;
-    for ($i=0; $i<$num; ++$i) {     # loop through sample descriptions
+    for ($i=0; $i<$num; ++$i) {     # loop through sample entries
         last if $pos + 8 > $dirLen;
         my $size = Get32u($dataPt, $pos);
         last if $pos + $size > $dirLen;

data/bin/lib/Image/ExifTool/QuickTimeStream.pl

@@ -165,10 +165,17 @@ my %insvLimit = (
             ProcessProc => \&Process_mebx,
         },
     },
-    gpmd => {
-        Name => 'gpmd',
+    gpmd => [{
+        Name => 'gpmd_GoPro',
+        Condition => '$$valPt !~ /^\0\0\xf2\xe1\xf0\xeeTT/',
         SubDirectory => { TagTable => 'Image::ExifTool::GoPro::GPMF' },
-    },
+    },{
+        Name => 'gpmd_Rove', # Rove Stealth 4K encrypted text
+        SubDirectory => {
+            TagTable => 'Image::ExifTool::QuickTime::Stream',
+            ProcessProc => \&Process_text,
+        },
+    }],
     fdsc => {
         Name => 'fdsc',
         Condition => '$$valPt =~ /^GPRO/',
@@ -837,15 +844,21 @@ sub HandleTextTags($$$)
 
 #------------------------------------------------------------------------------
 # Process subtitle 'text'
-# Inputs: 0) ExifTool ref, 1) tag table ref, 2) data ref
+# Inputs: 0) ExifTool ref, 1) data ref or dirInfo ref, 2) tag table ref
 sub Process_text($$$)
 {
-    my ($et, $tagTbl, $buffPt) = @_;
+    my ($et, $dataPt, $tagTbl) = @_;
     my %tags;
 
     return if $$et{NoMoreTextDecoding};
 
-    while ($$buffPt =~ /\$(\w+)([^\$]*)/g) {
+    if (ref $dataPt eq 'HASH') {
+        my $dirName = $$dataPt{DirName};
+        $dataPt = $$dataPt{DataPt};
+        $et->VerboseDir($dirName, undef, length($$dataPt));
+    }
+
+    while ($$dataPt =~ /\$(\w+)([^\$]*)/g) {
         my ($tag, $dat) = ($1, $2);
         if ($tag =~ /^[A-Z]{2}RMC$/ and $dat =~ /^,(\d{2})(\d{2})(\d+(?:\.\d*)),A?,(\d*?)(\d{1,2}\.\d+),([NS]),(\d*?)(\d{1,2}\.\d+),([EW]),(\d*\.?\d*),(\d*\.?\d*),(\d{2})(\d{2})(\d+)/) {
             my $time = "$1:$2:$3";
@@ -936,31 +949,31 @@ sub Process_text($$$)
     #   0110: 31 30 38 30 30 30 58 00 58 00 58 00 58 00 58 00 [108000X.X.X.X.X.]
     #   0120: 58 00 58 00 58 00 58 00 00 00 00 00 00 00 00 00 [X.X.X.X.........]
     #   0130: 00 00 00 00 00 00 00                            [.......]
-    if ($$buffPt =~ /^\0\0(..\xaa\xaa|\xf2\xe1\xf0\xee)/s and length $$buffPt >= 282) {
-        my $val = pack('C*', map { $_ ^ 0xaa } unpack('C*', substr($$buffPt, 8, 14)));
+    if ($$dataPt =~ /^\0\0(..\xaa\xaa|\xf2\xe1\xf0\xee)/s and length $$dataPt >= 282) {
+        my $val = pack('C*', map { $_ ^ 0xaa } unpack('C*', substr($$dataPt, 8, 14)));
         if ($val =~ /^(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})$/) {
             $tags{GPSDateTime} = "$1:$2:$3 $4:$5:$6";
-            $val = pack('C*', map { $_ ^ 0xaa } unpack('C*', substr($$buffPt, 38, 9)));
+            $val = pack('C*', map { $_ ^ 0xaa } unpack('C*', substr($$dataPt, 38, 9)));
             if ($val =~ /^([NS])(\d{2})(\d+$)$/) {
                 $tags{GPSLatitude} = ($2 + $3 / 600000) * ($1 eq 'S' ? -1 : 1);
             }
-            $val = pack('C*', map { $_ ^ 0xaa } unpack('C*', substr($$buffPt, 47, 10)));
+            $val = pack('C*', map { $_ ^ 0xaa } unpack('C*', substr($$dataPt, 47, 10)));
             if ($val =~ /^([EW])(\d{3})(\d+$)$/) {
                 $tags{GPSLongitude} = ($2 + $3 / 600000) * ($1 eq 'W' ? -1 : 1);
             }
-            $val = pack('C*', map { $_ ^ 0xaa } unpack('C*', substr($$buffPt, 0x39, 5)));
+            $val = pack('C*', map { $_ ^ 0xaa } unpack('C*', substr($$dataPt, 0x39, 5)));
             $tags{GPSAltitude} = $val + 0 if $val =~ /^[-+]\d+$/;
-            $val = pack('C*', map { $_ ^ 0xaa } unpack('C*', substr($$buffPt, 0x3e, 3)));
+            $val = pack('C*', map { $_ ^ 0xaa } unpack('C*', substr($$dataPt, 0x3e, 3)));
             if ($val =~ /^\d+$/) {
                 $tags{GPSSpeed} = $val + 0;
                 $tags{GPSSpeedRef} = 'K';
             }
-            if ($$buffPt =~ /^\0\0..\xaa\xaa/s) { # (BlueSkySea)
-                $val = pack('C*', map { $_ ^ 0xaa } unpack('C*', substr($$buffPt, 0xad, 12)));
+            if ($$dataPt =~ /^\0\0..\xaa\xaa/s) { # (BlueSkySea)
+                $val = pack('C*', map { $_ ^ 0xaa } unpack('C*', substr($$dataPt, 0xad, 12)));
                 # the first X,Y,Z accelerometer readings from the AccelerometerData
                 if ($val =~ /^([-+]\d{3})([-+]\d{3})([-+]\d{3})$/) {
                     $tags{Accelerometer} = "$1 $2 $3";
-                    $val = pack('C*', map { $_ ^ 0xaa } unpack('C*', substr($$buffPt, 0xba, 96)));
+                    $val = pack('C*', map { $_ ^ 0xaa } unpack('C*', substr($$dataPt, 0xba, 96)));
                     my $order = GetByteOrder();
                     SetByteOrder('II');
                     $val = ReadValue(\$val, 0, 'float');
@@ -969,7 +982,7 @@ sub Process_text($$$)
                 }
             } else { # (Ambarella)
                 my @acc;
-                $val = pack('C*', map { $_ ^ 0xaa } unpack('C*', substr($$buffPt, 0x41, 195)));
+                $val = pack('C*', map { $_ ^ 0xaa } unpack('C*', substr($$dataPt, 0x41, 195)));
                 push @acc, $1, $2, $3 while $val =~ /\G([-+]\d{3})([-+]\d{3})([-+]\d{3})/g;
                 $tags{Accelerometer} = "@acc" if @acc;
             }
@@ -980,36 +993,36 @@ sub Process_text($$$)
     # check for DJI telemetry data, eg:
     # "F/3.5, SS 1000, ISO 100, EV 0, GPS (8.6499, 53.1665, 18), D 24.26m,
     #  H 6.00m, H.S 2.10m/s, V.S 0.00m/s \n"
-    if ($$buffPt =~ /GPS \(([-+]?\d*\.\d+),\s*([-+]?\d*\.\d+)/) {
+    if ($$dataPt =~ /GPS \(([-+]?\d*\.\d+),\s*([-+]?\d*\.\d+)/) {
         $$et{CreateDateAtEnd} = 1;  # set flag indicating the file creation date is at the end
         $tags{GPSLatitude} = $2;
         $tags{GPSLongitude} = $1;
-        $tags{GPSAltitude} = $1 if $$buffPt =~ /,\s*H\s+([-+]?\d+\.?\d*)m/;
-        if ($$buffPt =~ /,\s*H.S\s+([-+]?\d+\.?\d*)/) {
+        $tags{GPSAltitude} = $1 if $$dataPt =~ /,\s*H\s+([-+]?\d+\.?\d*)m/;
+        if ($$dataPt =~ /,\s*H.S\s+([-+]?\d+\.?\d*)/) {
             $tags{GPSSpeed} = $1 * $mpsToKph;
             $tags{GPSSpeedRef} = 'K';
         }
-        $tags{Distance} = $1 * $mpsToKph if $$buffPt =~ /,\s*D\s+(\d+\.?\d*)m/;
-        $tags{VerticalSpeed} = $1 if $$buffPt =~ /,\s*V.S\s+([-+]?\d+\.?\d*)/;
-        $tags{FNumber} = $1 if $$buffPt =~ /\bF\/(\d+\.?\d*)/;
-        $tags{ExposureTime} = 1 / $1 if $$buffPt =~ /\bSS\s+(\d+\.?\d*)/;
-        $tags{ExposureCompensation} = ($1 / ($2 || 1)) if $$buffPt =~ /\bEV\s+([-+]?\d+\.?\d*)(\/\d+)?/;
-        $tags{ISO} = $1 if $$buffPt =~ /\bISO\s+(\d+\.?\d*)/;
+        $tags{Distance} = $1 * $mpsToKph if $$dataPt =~ /,\s*D\s+(\d+\.?\d*)m/;
+        $tags{VerticalSpeed} = $1 if $$dataPt =~ /,\s*V.S\s+([-+]?\d+\.?\d*)/;
+        $tags{FNumber} = $1 if $$dataPt =~ /\bF\/(\d+\.?\d*)/;
+        $tags{ExposureTime} = 1 / $1 if $$dataPt =~ /\bSS\s+(\d+\.?\d*)/;
+        $tags{ExposureCompensation} = ($1 / ($2 || 1)) if $$dataPt =~ /\bEV\s+([-+]?\d+\.?\d*)(\/\d+)?/;
+        $tags{ISO} = $1 if $$dataPt =~ /\bISO\s+(\d+\.?\d*)/;
         HandleTextTags($et, $tagTbl, \%tags);
         return;
     }
 
     # check for Mini 0806 dashcam GPS, eg:
     # "A,270519,201555.000,3356.8925,N,08420.2071,W,000.0,331.0M,+01.84,-09.80,-00.61;\n"
-    if ($$buffPt =~ /^A,(\d{2})(\d{2})(\d{2}),(\d{2})(\d{2})(\d{2}(\.\d+)?)/) {
+    if ($$dataPt =~ /^A,(\d{2})(\d{2})(\d{2}),(\d{2})(\d{2})(\d{2}(\.\d+)?)/) {
         $tags{GPSDateTime} = "20$3:$2:$1 $4:$5:$6Z";
-        if ($$buffPt =~ /^A,.*?,.*?,(\d{2})(\d+\.\d+),([NS])/) {
+        if ($$dataPt =~ /^A,.*?,.*?,(\d{2})(\d+\.\d+),([NS])/) {
             $tags{GPSLatitude} = ($1 + $2/60) * ($3 eq 'S' ? -1 : 1);
         }
-        if ($$buffPt =~ /^A,.*?,.*?,.*?,.*?,(\d{3})(\d+\.\d+),([EW])/) {
+        if ($$dataPt =~ /^A,.*?,.*?,.*?,.*?,(\d{3})(\d+\.\d+),([EW])/) {
             $tags{GPSLongitude} = ($1 + $2/60) * ($3 eq 'W' ? -1 : 1);
         }
-        my @a = split ',', $$buffPt;
+        my @a = split ',', $$dataPt;
         $tags{GPSAltitude} = $a[8] if $a[8] and $a[8] =~ s/M$//;
         $tags{GPSSpeed} = $a[7] if $a[7] and $a[7] =~ /^\d+\.\d+$/; # (NC)
         $tags{Accelerometer} = "$a[9] $a[10] $a[11]" if $a[11] and $a[11] =~ s/;\s*$//;
@@ -1022,10 +1035,10 @@ sub Process_text($$$)
     # decoded:
     # "X0000.2340Y-000.0720Z0000.9900G0001.0400$GPRMC,082138,A,5330.6683,N,00641.9749,W,012.5,87.86,050213,002.1,A"
     # (note: "002.1" is magnetic variation and is not decoded; it should have ",E" or ",W" afterward for direction)
-    if ($$buffPt =~ /\*[0-9A-F]{2}~$/) {
+    if ($$dataPt =~ /\*[0-9A-F]{2}~$/) {
         # (ref https://reverseengineering.stackexchange.com/questions/11582/how-to-reverse-engineer-dash-cam-metadata)
         my @decode = unpack 'C*', '-I8XQWRVNZOYPUTA0B1C2SJ9K.L,M$D3E4F5G6H7';
-        my @chars = unpack 'C*', substr($$buffPt, 0, -4);
+        my @chars = unpack 'C*', substr($$dataPt, 0, -4);
         foreach (@chars) {
             my $n = $_ - 43;
             $_ = $decode[$n] if $n >= 0 and defined $decode[$n];
@@ -1034,14 +1047,14 @@ sub Process_text($$$)
         if ($buff =~ /X(.*?)Y(.*?)Z(.*?)G(.*?)\$/) {
             # yup. the decoding worked out
             $tags{Accelerometer} = "$1 $2 $3 $4";
-            $$buffPt = $buff;   # (process GPRMC below)
+            $$dataPt = $buff;   # (process GPRMC below)
         }
     }
 
     # check for Thinkware format (and other NMEA RMC), eg:
     # "gsensori,4,512,-67,-12,100;GNRMC,161313.00,A,4529.87489,N,07337.01215,W,6.225,35.34,310819,,,A*52..;
     #  CAR,0,0,0,0.0,0,0,0,0,0,0,0,0"
-    if ($$buffPt =~ /[A-Z]{2}RMC,(\d{2})(\d{2})(\d+(\.\d*)?),A?,(\d*?)(\d{1,2}\.\d+),([NS]),(\d*?)(\d{1,2}\.\d+),([EW]),(\d*\.?\d*),(\d*\.?\d*),(\d{2})(\d{2})(\d+)/ and
+    if ($$dataPt =~ /[A-Z]{2}RMC,(\d{2})(\d{2})(\d+(\.\d*)?),A?,(\d*?)(\d{1,2}\.\d+),([NS]),(\d*?)(\d{1,2}\.\d+),([EW]),(\d*\.?\d*),(\d*\.?\d*),(\d{2})(\d{2})(\d+)/ and
         # do some basic sanity checks on the date
         $13 <= 31 and $14 <= 12 and $15 <= 99)
     {
@@ -1058,8 +1071,8 @@ sub Process_text($$$)
             $tags{GPSTrackRef} = 'T';
         }
     }
-    $tags{GSensor} = $1 if $$buffPt =~ /\bgsensori,(.*?)(;|$)/;
-    $tags{Car} = $1 if $$buffPt =~ /\bCAR,(.*?)(;|$)/;
+    $tags{GSensor} = $1 if $$dataPt =~ /\bgsensori,(.*?)(;|$)/;
+    $tags{Car} = $1 if $$dataPt =~ /\bCAR,(.*?)(;|$)/;
 
     if (%tags) {
         HandleTextTags($et, $tagTbl, \%tags);
@@ -1233,7 +1246,7 @@ sub ProcessSamples($)
                     $et->HandleTag($tagTbl, Text => $buff); # just store any other text
                 }
             }
-            Process_text($et, $tagTbl, \$buff);
+            Process_text($et, \$buff, $tagTbl);
 
         } elsif ($processByMetaFormat{$type}) {
 
@@ -1254,7 +1267,7 @@ sub ProcessSamples($)
                     # "X0000.0000Y0000.0000Z0000.0000G0000.0000$GPRMC,000125,V,,,,,000.0,,280908,002.1,N*71~, 794021  \x0a"
                     FoundSomething($et, $tagTbl, $time[$i], $dur[$i]);
                     $et->HandleTag($tagTbl, Accelerometer => "$1 $2 $3 $4") if $buff =~ /X(.*?)Y(.*?)Z(.*?)G(.*?)\$/;
-                    Process_text($et, $tagTbl, \$buff);
+                    Process_text($et, \$buff, $tagTbl);
                 }
             } elsif ($verbose) {
                 $et->VPrint(0, "Unknown $type format ($metaFormat)");

data/bin/lib/Image/ExifTool/README

@@ -387,8 +387,11 @@ numerical, and generated automatically otherwise.
                   'Flattened' - [reserved] used internally to mark Struct tags
                   which have been processed to generate flattened equivalents.
 
-                  'GotGroups' - [reserved] flag used internally to indicate that
-                  the Groups hash has been initialized for this tag.
+                  'NotFlat' - [XMP tags only] Flag indicates that this tag ID
+                  does not represent a flattened tag.  Used to avoid a conflict
+                  if the tag ID would be the same as a generated ID for a
+                  flattened tag.  The result is that the flattened tag will not
+                  be accessible.
 
                   'Hidden' - set to hide tag from the TagName documentation.
                   Also suppresses verbose output of a BinaryData tag.

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

@@ -15,7 +15,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.01';
+$VERSION = '1.02';
 
 # Radiance tags
 %Image::ExifTool::Radiance::Main = (
@@ -42,6 +42,7 @@ $VERSION = '1.01';
         },
     },
     _command  => 'Command',
+    _comment  => 'Comment',
     software  => 'Software',
     view      => 'View',
    'format'   => 'Format', # <-- this is the one that caused the conflict when uppercase
@@ -74,8 +75,12 @@ sub ProcessHDR($$)
     while ($raf->ReadLine($buff)) {
         chomp $buff;
         last unless length($buff) > 0 and length($buff) < 4096;
+        if ($buff =~ s/^#\s*//) {
+            $et->HandleTag($tagTablePtr, '_comment', $buff) if length $buff;
+            next;
+        }
         unless ($buff =~ /^(.*)?\s*=\s*(.*)/) {
-            $et->HandleTag($tagTablePtr, '_command', $buff);
+            $et->HandleTag($tagTablePtr, '_command', $buff) if length $buff;
             next;
         }
         # use lower-case tag names to avoid conflicts with reserved tag table entries