diff options
Diffstat (limited to 'lib/Image')
182 files changed, 378 insertions, 213 deletions
diff --git a/lib/Image/ExifTool.pm b/lib/Image/ExifTool.pm index ed58334e..876fe7ef 100644 --- a/lib/Image/ExifTool.pm +++ b/lib/Image/ExifTool.pm @@ -8,7 +8,7 @@ # Revisions: Nov. 12/2003 - P. Harvey Created # (See html/history.html for revision history) # -# Legal: Copyright (c) 2003-2020, Phil Harvey (philharvey66 at gmail.com) +# Legal: Copyright (c) 2003-2021, 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. #------------------------------------------------------------------------------ @@ -28,7 +28,7 @@ use vars qw($VERSION $RELEASE @ISA @EXPORT_OK %EXPORT_TAGS $AUTOLOAD @fileTypes %mimeType $swapBytes $swapWords $currentByteOrder %unpackStd %jpegMarker %specialTags %fileTypeLookup $testLen $exePath); -$VERSION = '12.13'; +$VERSION = '12.14'; $RELEASE = ''; @ISA = qw(Exporter); %EXPORT_TAGS = ( @@ -3395,7 +3395,11 @@ sub GetGroup($$;$) my @grps; # create list of group names (without identical adjacent groups if simplifying) foreach (@families) { - my $grp = $groups[$_] or next; + my $grp = $groups[$_]; + unless ($grp) { + next if $simplify; + $grp = ''; + } push @grps, $grp unless $simplify and @grps and $grp eq $grps[-1]; } # remove leading "Main:" if simplifying diff --git a/lib/Image/ExifTool.pod b/lib/Image/ExifTool.pod index 1e73b2f0..aa3e4507 100644 --- a/lib/Image/ExifTool.pod +++ b/lib/Image/ExifTool.pod @@ -5,7 +5,7 @@ # # URL: https://exiftool.org/ # -# Legal: Copyright (c) 2003-2020, Phil Harvey (philharvey66 at gmail.com) +# Legal: Copyright (c) 2003-2021, 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. #------------------------------------------------------------------------------ @@ -2711,7 +2711,7 @@ specified by the L</Charset> option. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey +Copyright 2003-2021, Phil Harvey This library is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff --git a/lib/Image/ExifTool/AES.pm b/lib/Image/ExifTool/AES.pm index 4754a2b7..46813a58 100644 --- a/lib/Image/ExifTool/AES.pm +++ b/lib/Image/ExifTool/AES.pm @@ -477,7 +477,7 @@ main purpose of encryption, so this really can't be considered a bug. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/AFCP.pm b/lib/Image/ExifTool/AFCP.pm index 58d3a52a..ba2928e6 100644 --- a/lib/Image/ExifTool/AFCP.pm +++ b/lib/Image/ExifTool/AFCP.pm @@ -259,7 +259,7 @@ scanning for AFCP information. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/AIFF.pm b/lib/Image/ExifTool/AIFF.pm index 32c0cc18..febb4248 100644 --- a/lib/Image/ExifTool/AIFF.pm +++ b/lib/Image/ExifTool/AIFF.pm @@ -287,7 +287,7 @@ information from AIFF (Audio Interchange File Format) audio files. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/APE.pm b/lib/Image/ExifTool/APE.pm index b1289af8..68097240 100644 --- a/lib/Image/ExifTool/APE.pm +++ b/lib/Image/ExifTool/APE.pm @@ -263,7 +263,7 @@ Currently doesn't parse MAC header unless it is at the start of the file. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/APP12.pm b/lib/Image/ExifTool/APP12.pm index 6059a90a..c55db655 100644 --- a/lib/Image/ExifTool/APP12.pm +++ b/lib/Image/ExifTool/APP12.pm @@ -305,7 +305,7 @@ APP12 meta information. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/ASF.pm b/lib/Image/ExifTool/ASF.pm index a836d14d..d7f1ece2 100644 --- a/lib/Image/ExifTool/ASF.pm +++ b/lib/Image/ExifTool/ASF.pm @@ -876,7 +876,7 @@ Windows Media Audio (WMA) and Windows Media Video (WMV) files. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Apple.pm b/lib/Image/ExifTool/Apple.pm index f6da77f3..f1030df8 100644 --- a/lib/Image/ExifTool/Apple.pm +++ b/lib/Image/ExifTool/Apple.pm @@ -148,7 +148,7 @@ Apple maker notes in EXIF information. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Audible.pm b/lib/Image/ExifTool/Audible.pm index 8bd2e4ae..730936f4 100644 --- a/lib/Image/ExifTool/Audible.pm +++ b/lib/Image/ExifTool/Audible.pm @@ -291,7 +291,7 @@ information from Audible audio books. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/BMP.pm b/lib/Image/ExifTool/BMP.pm index 5b546667..c7d8855a 100644 --- a/lib/Image/ExifTool/BMP.pm +++ b/lib/Image/ExifTool/BMP.pm @@ -335,7 +335,7 @@ This module contains definitions required by Image::ExifTool to read BMP =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/BPG.pm b/lib/Image/ExifTool/BPG.pm index 1edbd756..675c4994 100644 --- a/lib/Image/ExifTool/BPG.pm +++ b/lib/Image/ExifTool/BPG.pm @@ -231,7 +231,7 @@ This module contains definitions required by Image::ExifTool to read BPG =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/BZZ.pm b/lib/Image/ExifTool/BZZ.pm index b0edcfa0..3b0d0f95 100644 --- a/lib/Image/ExifTool/BZZ.pm +++ b/lib/Image/ExifTool/BZZ.pm @@ -445,7 +445,7 @@ compression ability). =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, Phil Harvey (philharvey66 at gmail.com) Copyright 2002, Leon Bottou and Yann Le Cun Copyright 2001, AT&T Copyright 1999-2001, LizardTech Inc. diff --git a/lib/Image/ExifTool/BigTIFF.pm b/lib/Image/ExifTool/BigTIFF.pm index 215c27e9..4a1baeb0 100644 --- a/lib/Image/ExifTool/BigTIFF.pm +++ b/lib/Image/ExifTool/BigTIFF.pm @@ -275,7 +275,7 @@ information in BigTIFF images. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/BuildTagLookup.pm b/lib/Image/ExifTool/BuildTagLookup.pm index f413e896..446496cb 100644 --- a/lib/Image/ExifTool/BuildTagLookup.pm +++ b/lib/Image/ExifTool/BuildTagLookup.pm @@ -35,7 +35,7 @@ use Image::ExifTool::Sony; use Image::ExifTool::Validate; use Image::ExifTool::MacOS; -$VERSION = '3.40'; +$VERSION = '3.41'; @ISA = qw(Exporter); sub NumbersFirst($$); @@ -633,7 +633,8 @@ overlapping EXIF, IPTC and XMP tags to be reconciled when reading, and synchronized when writing. The MWG Composite tags below are designed to aid in the implementation of these recommendations. As well, the MWG defines new XMP tags which are listed in the subsequent tables below. See -L<http://www.metadataworkinggroup.org/> for the official MWG specification. +L<https://web.archive.org/web/20181006115950/http://www.metadataworkinggroup.org/specs/> +for the official MWG specification. }, MacOS => q{ On MacOS systems, the there are additional MDItem and XAttr Finder tags that @@ -656,7 +657,7 @@ L<Image::ExifTool::BuildTagLookup|Image::ExifTool::BuildTagLookup>. ~head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. @@ -2731,7 +2732,7 @@ Returned list of writable pseudo tags. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Canon.pm b/lib/Image/ExifTool/Canon.pm index ffce4bb2..65e2fcf2 100644 --- a/lib/Image/ExifTool/Canon.pm +++ b/lib/Image/ExifTool/Canon.pm @@ -9874,7 +9874,7 @@ Canon maker notes in EXIF information. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/CanonCustom.pm b/lib/Image/ExifTool/CanonCustom.pm index fdddea8a..b0b5274c 100644 --- a/lib/Image/ExifTool/CanonCustom.pm +++ b/lib/Image/ExifTool/CanonCustom.pm @@ -2845,7 +2845,7 @@ Image::ExifTool to read this information. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/CanonRaw.pm b/lib/Image/ExifTool/CanonRaw.pm index 1375ead8..ad491f91 100644 --- a/lib/Image/ExifTool/CanonRaw.pm +++ b/lib/Image/ExifTool/CanonRaw.pm @@ -877,7 +877,7 @@ tags.) =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/CanonVRD.pm b/lib/Image/ExifTool/CanonVRD.pm index a40ed3f4..b3d72ba5 100644 --- a/lib/Image/ExifTool/CanonVRD.pm +++ b/lib/Image/ExifTool/CanonVRD.pm @@ -2264,7 +2264,7 @@ files, and as a trailer in JPEG, CRW, CR2 and TIFF images. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/CaptureOne.pm b/lib/Image/ExifTool/CaptureOne.pm index 3e7e5895..fdfd37fd 100644 --- a/lib/Image/ExifTool/CaptureOne.pm +++ b/lib/Image/ExifTool/CaptureOne.pm @@ -221,7 +221,7 @@ settings files (COS). =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Casio.pm b/lib/Image/ExifTool/Casio.pm index 6cb921e7..f9e73b53 100644 --- a/lib/Image/ExifTool/Casio.pm +++ b/lib/Image/ExifTool/Casio.pm @@ -2034,7 +2034,7 @@ Casio maker notes in EXIF information. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Charset.pm b/lib/Image/ExifTool/Charset.pm index e6311cb3..d3b7ded7 100644 --- a/lib/Image/ExifTool/Charset.pm +++ b/lib/Image/ExifTool/Charset.pm @@ -420,7 +420,7 @@ when decoding certain types of information. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/DICOM.pm b/lib/Image/ExifTool/DICOM.pm index 2a788385..24a42e4e 100644 --- a/lib/Image/ExifTool/DICOM.pm +++ b/lib/Image/ExifTool/DICOM.pm @@ -3853,7 +3853,7 @@ No translation of special characters sets is done. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/DJI.pm b/lib/Image/ExifTool/DJI.pm index 5596fe29..39b6147a 100644 --- a/lib/Image/ExifTool/DJI.pm +++ b/lib/Image/ExifTool/DJI.pm @@ -125,7 +125,7 @@ the maker notes in images from some DJI Phantom drones. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/DNG.pm b/lib/Image/ExifTool/DNG.pm index 70348bbe..73e8db64 100644 --- a/lib/Image/ExifTool/DNG.pm +++ b/lib/Image/ExifTool/DNG.pm @@ -820,7 +820,7 @@ information in DNG (Digital Negative) images. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/DPX.pm b/lib/Image/ExifTool/DPX.pm index a6614fbe..77e6598b 100644 --- a/lib/Image/ExifTool/DPX.pm +++ b/lib/Image/ExifTool/DPX.pm @@ -214,7 +214,7 @@ metadata from DPX (Digital Picture Exchange) images. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/DV.pm b/lib/Image/ExifTool/DV.pm index 0b95c80e..3f96b1a7 100644 --- a/lib/Image/ExifTool/DV.pm +++ b/lib/Image/ExifTool/DV.pm @@ -291,7 +291,7 @@ information from DV (raw Digital Video) files. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/DarwinCore.pm b/lib/Image/ExifTool/DarwinCore.pm index d02b6d40..7f04b2ef 100644 --- a/lib/Image/ExifTool/DarwinCore.pm +++ b/lib/Image/ExifTool/DarwinCore.pm @@ -360,7 +360,7 @@ This file contains tag definitions for the Darwin Core XMP namespace. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/DjVu.pm b/lib/Image/ExifTool/DjVu.pm index 4c493091..c284d104 100644 --- a/lib/Image/ExifTool/DjVu.pm +++ b/lib/Image/ExifTool/DjVu.pm @@ -352,7 +352,7 @@ Image::ExifTool::AIFF. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/EXE.pm b/lib/Image/ExifTool/EXE.pm index d2de85c7..eb9aa69c 100644 --- a/lib/Image/ExifTool/EXE.pm +++ b/lib/Image/ExifTool/EXE.pm @@ -1398,7 +1398,7 @@ library files. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Exif.pm b/lib/Image/ExifTool/Exif.pm index 300b1386..d28e6d11 100644 --- a/lib/Image/ExifTool/Exif.pm +++ b/lib/Image/ExifTool/Exif.pm @@ -1377,6 +1377,12 @@ my %opcodeInfo = ( Count => 6, Priority => 0, }, + # 0x220 - int32u: 0 (IFD0, Xaiomi Redmi models) + # 0x221 - int32u: 0 (IFD0, Xaiomi Redmi models) + # 0x222 - int32u: 0 (IFD0, Xaiomi Redmi models) + # 0x223 - int32u: 0 (IFD0, Xaiomi Redmi models) + # 0x224 - int32u: 0,1 (IFD0, Xaiomi Redmi models) + # 0x225 - string: "" (IFD0, Xaiomi Redmi models) 0x22f => 'StripRowCounts', 0x2bc => { Name => 'ApplicationNotes', # (writable directory!) @@ -1998,6 +2004,7 @@ my %opcodeInfo = ( 0x885d => 'FaxSubAddress', #9 0x885e => 'FaxRecvTime', #9 0x8871 => 'FedexEDR', #exifprobe (NC) + # 0x8889 - string: "portrait" (ExifIFD, Xiaomi POCO F1) 0x888a => { #PH Name => 'LeafSubIFD', Format => 'int32u', # Leaf incorrectly uses 'undef' format! @@ -2008,6 +2015,10 @@ my %opcodeInfo = ( Start => '$val', }, }, + # 0x8891 - int16u: 35 (ExifIFD, Xiaomi POCO F1) + # 0x8894 - int16u: 0 (ExifIFD, Xiaomi POCO F1) + # 0x8895 - int16u: 0 (ExifIFD, Xiaomi POCO F1) + # 0x889a - int16u: 0 (ExifIFD, Xiaomi POCO F1) # 0x89ab - seen "11 100 130 16 0 0 0 0" in IFD0 of TIFF image from IR scanner (forum8470) 0x9000 => { Name => 'ExifVersion', @@ -2368,6 +2379,8 @@ my %opcodeInfo = ( Name => 'CameraElevationAngle', Writable => 'rational64s', }, + # 0x9999 - string: camera settings (ExifIFD, Xiaomi POCO F1) + # 0x9aaa - int8u[2176]: ? (ExifIFD, Xiaomi POCO F1) 0x9c9b => { Name => 'XPTitle', Format => 'undef', @@ -6591,7 +6604,7 @@ EXIF and TIFF meta information. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/FITS.pm b/lib/Image/ExifTool/FITS.pm index d5eca932..71e737e4 100644 --- a/lib/Image/ExifTool/FITS.pm +++ b/lib/Image/ExifTool/FITS.pm @@ -126,7 +126,7 @@ information from FITS (Flexible Image Transport System) images. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/FLAC.pm b/lib/Image/ExifTool/FLAC.pm index 6c0359e6..69352011 100644 --- a/lib/Image/ExifTool/FLAC.pm +++ b/lib/Image/ExifTool/FLAC.pm @@ -284,7 +284,7 @@ information from Free Lossless Audio Codec (FLAC) audio files. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/FLIF.pm b/lib/Image/ExifTool/FLIF.pm index c65e7ef9..9060f189 100644 --- a/lib/Image/ExifTool/FLIF.pm +++ b/lib/Image/ExifTool/FLIF.pm @@ -329,7 +329,7 @@ meta information in FLIF (Free Lossless Image Format) images. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/FLIR.pm b/lib/Image/ExifTool/FLIR.pm index 519109fc..46d9ca8e 100644 --- a/lib/Image/ExifTool/FLIR.pm +++ b/lib/Image/ExifTool/FLIR.pm @@ -1594,7 +1594,7 @@ Systems Inc. thermal image files (FFF, FPF and JPEG format). =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Fixup.pm b/lib/Image/ExifTool/Fixup.pm index 318088ea..873413a8 100644 --- a/lib/Image/ExifTool/Fixup.pm +++ b/lib/Image/ExifTool/Fixup.pm @@ -354,7 +354,7 @@ linear list when ApplyFixups() is called. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Flash.pm b/lib/Image/ExifTool/Flash.pm index e351e325..c98c28cc 100644 --- a/lib/Image/ExifTool/Flash.pm +++ b/lib/Image/ExifTool/Flash.pm @@ -721,7 +721,7 @@ will add AMF3 support. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/FlashPix.pm b/lib/Image/ExifTool/FlashPix.pm index db8f1c1f..76132d73 100644 --- a/lib/Image/ExifTool/FlashPix.pm +++ b/lib/Image/ExifTool/FlashPix.pm @@ -2370,7 +2370,7 @@ JPEG images. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Font.pm b/lib/Image/ExifTool/Font.pm index 062fb3c2..2a5d2cb1 100644 --- a/lib/Image/ExifTool/Font.pm +++ b/lib/Image/ExifTool/Font.pm @@ -622,7 +622,7 @@ extracted from these formats. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/FotoStation.pm b/lib/Image/ExifTool/FotoStation.pm index 75c7fc30..8883772e 100644 --- a/lib/Image/ExifTool/FotoStation.pm +++ b/lib/Image/ExifTool/FotoStation.pm @@ -243,7 +243,7 @@ write information from the FotoWare FotoStation trailer. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/FujiFilm.pm b/lib/Image/ExifTool/FujiFilm.pm index d4a3e0e8..2122d2de 100644 --- a/lib/Image/ExifTool/FujiFilm.pm +++ b/lib/Image/ExifTool/FujiFilm.pm @@ -1658,7 +1658,7 @@ FujiFilm maker notes in EXIF information, and to read/write FujiFilm RAW =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/GE.pm b/lib/Image/ExifTool/GE.pm index d321dd17..9a48bb95 100644 --- a/lib/Image/ExifTool/GE.pm +++ b/lib/Image/ExifTool/GE.pm @@ -68,7 +68,7 @@ General Imaging maker notes. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/GIF.pm b/lib/Image/ExifTool/GIF.pm index 2838f1f1..c6f62022 100644 --- a/lib/Image/ExifTool/GIF.pm +++ b/lib/Image/ExifTool/GIF.pm @@ -537,7 +537,7 @@ write GIF meta information. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/GIMP.pm b/lib/Image/ExifTool/GIMP.pm index 9c70d7fc..caf0089e 100644 --- a/lib/Image/ExifTool/GIMP.pm +++ b/lib/Image/ExifTool/GIMP.pm @@ -270,7 +270,7 @@ GIMP software. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/GPS.pm b/lib/Image/ExifTool/GPS.pm index 313e056d..f14914c7 100644 --- a/lib/Image/ExifTool/GPS.pm +++ b/lib/Image/ExifTool/GPS.pm @@ -564,7 +564,7 @@ GPS (Global Positioning System) meta information in EXIF data. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/GeoTiff.pm b/lib/Image/ExifTool/GeoTiff.pm index ef67d9e9..08304c25 100644 --- a/lib/Image/ExifTool/GeoTiff.pm +++ b/lib/Image/ExifTool/GeoTiff.pm @@ -2242,7 +2242,7 @@ coordinates. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Geotag.pm b/lib/Image/ExifTool/Geotag.pm index c919502a..3763e778 100644 --- a/lib/Image/ExifTool/Geotag.pm +++ b/lib/Image/ExifTool/Geotag.pm @@ -1412,7 +1412,7 @@ user-defined tag GPSRoll, must be active. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/GoPro.pm b/lib/Image/ExifTool/GoPro.pm index b5074a96..8f8f6efc 100644 --- a/lib/Image/ExifTool/GoPro.pm +++ b/lib/Image/ExifTool/GoPro.pm @@ -718,7 +718,7 @@ metadata from GoPro MP4 videos. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/H264.pm b/lib/Image/ExifTool/H264.pm index da663133..cf144281 100644 --- a/lib/Image/ExifTool/H264.pm +++ b/lib/Image/ExifTool/H264.pm @@ -1108,7 +1108,7 @@ information from H.264 video streams. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/HP.pm b/lib/Image/ExifTool/HP.pm index 6ef602a8..1f8eb8a8 100644 --- a/lib/Image/ExifTool/HP.pm +++ b/lib/Image/ExifTool/HP.pm @@ -250,7 +250,7 @@ Hewlett-Packard maker notes. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/HTML.pm b/lib/Image/ExifTool/HTML.pm index 1f75e20e..6a93bc74 100644 --- a/lib/Image/ExifTool/HTML.pm +++ b/lib/Image/ExifTool/HTML.pm @@ -555,7 +555,7 @@ meta information from HTML documents. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/HtmlDump.pm b/lib/Image/ExifTool/HtmlDump.pm index 69bf33c2..b8190968 100644 --- a/lib/Image/ExifTool/HtmlDump.pm +++ b/lib/Image/ExifTool/HtmlDump.pm @@ -917,7 +917,7 @@ page. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/ICC_Profile.pm b/lib/Image/ExifTool/ICC_Profile.pm index 1affb5bd..d8ae97e7 100644 --- a/lib/Image/ExifTool/ICC_Profile.pm +++ b/lib/Image/ExifTool/ICC_Profile.pm @@ -1264,7 +1264,7 @@ data created on one device into another device's native color space. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/ID3.pm b/lib/Image/ExifTool/ID3.pm index dc081cff..f051b770 100644 --- a/lib/Image/ExifTool/ID3.pm +++ b/lib/Image/ExifTool/ID3.pm @@ -1640,7 +1640,7 @@ other types of audio files. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/IPTC.pm b/lib/Image/ExifTool/IPTC.pm index e390355c..247cace1 100644 --- a/lib/Image/ExifTool/IPTC.pm +++ b/lib/Image/ExifTool/IPTC.pm @@ -1280,7 +1280,7 @@ image files. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/ISO.pm b/lib/Image/ExifTool/ISO.pm index eeb20aa5..4f48462e 100644 --- a/lib/Image/ExifTool/ISO.pm +++ b/lib/Image/ExifTool/ISO.pm @@ -184,7 +184,7 @@ information from ISO 9660 disk images. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/ITC.pm b/lib/Image/ExifTool/ITC.pm index 226250ec..4bd13f8c 100644 --- a/lib/Image/ExifTool/ITC.pm +++ b/lib/Image/ExifTool/ITC.pm @@ -191,7 +191,7 @@ information (including artwork images) from iTunes Cover Flow files. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Import.pm b/lib/Image/ExifTool/Import.pm index 6054d371..73047680 100644 --- a/lib/Image/ExifTool/Import.pm +++ b/lib/Image/ExifTool/Import.pm @@ -348,7 +348,7 @@ stored as hash lookups of tag name/value for each SourceFile. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/InDesign.pm b/lib/Image/ExifTool/InDesign.pm index cc1ad9d5..d948407d 100644 --- a/lib/Image/ExifTool/InDesign.pm +++ b/lib/Image/ExifTool/InDesign.pm @@ -258,7 +258,7 @@ them and the LargeFileSupport option is enabled. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/JPEG.pm b/lib/Image/ExifTool/JPEG.pm index 56af7c17..9fad77e6 100644 --- a/lib/Image/ExifTool/JPEG.pm +++ b/lib/Image/ExifTool/JPEG.pm @@ -622,7 +622,7 @@ segments are included in the Image::ExifTool module itself. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/JPEGDigest.pm b/lib/Image/ExifTool/JPEGDigest.pm index 947584d3..67bf7742 100644 --- a/lib/Image/ExifTool/JPEGDigest.pm +++ b/lib/Image/ExifTool/JPEGDigest.pm @@ -2590,7 +2590,7 @@ estimated JPEG quality if requested. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/JSON.pm b/lib/Image/ExifTool/JSON.pm index d45f5dd8..acc960d5 100644 --- a/lib/Image/ExifTool/JSON.pm +++ b/lib/Image/ExifTool/JSON.pm @@ -151,7 +151,7 @@ information from JSON files. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/JVC.pm b/lib/Image/ExifTool/JVC.pm index 60ae19ed..a0af9e7b 100644 --- a/lib/Image/ExifTool/JVC.pm +++ b/lib/Image/ExifTool/JVC.pm @@ -117,7 +117,7 @@ notes. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Jpeg2000.pm b/lib/Image/ExifTool/Jpeg2000.pm index 36e3e117..7197a0d4 100644 --- a/lib/Image/ExifTool/Jpeg2000.pm +++ b/lib/Image/ExifTool/Jpeg2000.pm @@ -16,7 +16,7 @@ use strict; use vars qw($VERSION); use Image::ExifTool qw(:DataAccess :Utils); -$VERSION = '1.26'; +$VERSION = '1.27'; sub ProcessJpeg2000Box($$$); @@ -186,7 +186,11 @@ my %j2cMarker = ( comp => 'Composition', copt => 'CompositionOptions', inst => 'InstructionSet', - asoc => 'Association', + asoc => { + Name => 'Association', + SubDirectory => { }, + }, + # (Association box may contain any other sub-box) nlst => 'NumberList', bfil => 'BinaryFilter', drep => 'DesiredReproductions', @@ -212,7 +216,8 @@ my %j2cMarker = ( written and copied. This is a List-type tag because multiple XML blocks may exist }, - SubDirectory => { TagTable => 'Image::ExifTool::XMP::Main' }, + # (note: extracting as a block was broken in 11.04, and finally fixed in 12.14) + SubDirectory => { TagTable => 'Image::ExifTool::XMP::XML' }, }, uuid => [ { @@ -874,7 +879,7 @@ files. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Kodak.pm b/lib/Image/ExifTool/Kodak.pm index 2a6f88b8..fec0014d 100644 --- a/lib/Image/ExifTool/Kodak.pm +++ b/lib/Image/ExifTool/Kodak.pm @@ -3252,7 +3252,7 @@ interpret Kodak maker notes EXIF meta information. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/KyoceraRaw.pm b/lib/Image/ExifTool/KyoceraRaw.pm index f4300520..39549042 100644 --- a/lib/Image/ExifTool/KyoceraRaw.pm +++ b/lib/Image/ExifTool/KyoceraRaw.pm @@ -152,7 +152,7 @@ meta information from Kyocera Contax N Digital RAW images. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/LNK.pm b/lib/Image/ExifTool/LNK.pm index 6f9fa96a..54f3f8fd 100644 --- a/lib/Image/ExifTool/LNK.pm +++ b/lib/Image/ExifTool/LNK.pm @@ -699,7 +699,7 @@ information MS Shell Link (Windows shortcut) files. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Lang/cs.pm b/lib/Image/ExifTool/Lang/cs.pm index 5773b2ef..7171e9c9 100644 --- a/lib/Image/ExifTool/Lang/cs.pm +++ b/lib/Image/ExifTool/Lang/cs.pm @@ -1570,7 +1570,7 @@ and values. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Lang/de.pm b/lib/Image/ExifTool/Lang/de.pm index 35d9b4f7..82498199 100644 --- a/lib/Image/ExifTool/Lang/de.pm +++ b/lib/Image/ExifTool/Lang/de.pm @@ -8702,7 +8702,7 @@ and values. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Lang/en_ca.pm b/lib/Image/ExifTool/Lang/en_ca.pm index cba7f0e0..911159d1 100644 --- a/lib/Image/ExifTool/Lang/en_ca.pm +++ b/lib/Image/ExifTool/Lang/en_ca.pm @@ -989,7 +989,7 @@ and values. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Lang/en_gb.pm b/lib/Image/ExifTool/Lang/en_gb.pm index ddf6d53a..833ac20b 100644 --- a/lib/Image/ExifTool/Lang/en_gb.pm +++ b/lib/Image/ExifTool/Lang/en_gb.pm @@ -1032,7 +1032,7 @@ and values. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Lang/es.pm b/lib/Image/ExifTool/Lang/es.pm index bca73ad6..da512d4e 100644 --- a/lib/Image/ExifTool/Lang/es.pm +++ b/lib/Image/ExifTool/Lang/es.pm @@ -4005,7 +4005,7 @@ and values. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Lang/fi.pm b/lib/Image/ExifTool/Lang/fi.pm index bfb57e86..3d4b97ff 100644 --- a/lib/Image/ExifTool/Lang/fi.pm +++ b/lib/Image/ExifTool/Lang/fi.pm @@ -2878,7 +2878,7 @@ and values. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Lang/fr.pm b/lib/Image/ExifTool/Lang/fr.pm index 34b7abc7..a7554338 100644 --- a/lib/Image/ExifTool/Lang/fr.pm +++ b/lib/Image/ExifTool/Lang/fr.pm @@ -4751,7 +4751,7 @@ and values. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Lang/it.pm b/lib/Image/ExifTool/Lang/it.pm index ec9bd8bb..01e2bdc5 100644 --- a/lib/Image/ExifTool/Lang/it.pm +++ b/lib/Image/ExifTool/Lang/it.pm @@ -7903,7 +7903,7 @@ and values. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Lang/ja.pm b/lib/Image/ExifTool/Lang/ja.pm index 0a6e2ecf..c6e7dd2f 100644 --- a/lib/Image/ExifTool/Lang/ja.pm +++ b/lib/Image/ExifTool/Lang/ja.pm @@ -5841,7 +5841,7 @@ and values. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Lang/ko.pm b/lib/Image/ExifTool/Lang/ko.pm index b7349a67..cfe92e03 100644 --- a/lib/Image/ExifTool/Lang/ko.pm +++ b/lib/Image/ExifTool/Lang/ko.pm @@ -2316,7 +2316,7 @@ and values. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Lang/nl.pm b/lib/Image/ExifTool/Lang/nl.pm index b8fd6b43..ddf5ec0b 100644 --- a/lib/Image/ExifTool/Lang/nl.pm +++ b/lib/Image/ExifTool/Lang/nl.pm @@ -3207,7 +3207,7 @@ and values. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Lang/pl.pm b/lib/Image/ExifTool/Lang/pl.pm index 342bffe6..cffd3ca5 100644 --- a/lib/Image/ExifTool/Lang/pl.pm +++ b/lib/Image/ExifTool/Lang/pl.pm @@ -1258,7 +1258,7 @@ and values. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Lang/ru.pm b/lib/Image/ExifTool/Lang/ru.pm index bcea992a..cdbf4cc1 100644 --- a/lib/Image/ExifTool/Lang/ru.pm +++ b/lib/Image/ExifTool/Lang/ru.pm @@ -5718,7 +5718,7 @@ and values. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Lang/sv.pm b/lib/Image/ExifTool/Lang/sv.pm index 66251e42..11c9cd87 100644 --- a/lib/Image/ExifTool/Lang/sv.pm +++ b/lib/Image/ExifTool/Lang/sv.pm @@ -620,7 +620,7 @@ and values. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Lang/tr.pm b/lib/Image/ExifTool/Lang/tr.pm index 2d689d14..d8e3fd5f 100644 --- a/lib/Image/ExifTool/Lang/tr.pm +++ b/lib/Image/ExifTool/Lang/tr.pm @@ -528,7 +528,7 @@ and values. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Lang/zh_cn.pm b/lib/Image/ExifTool/Lang/zh_cn.pm index 6efd69ad..1c4c16af 100644 --- a/lib/Image/ExifTool/Lang/zh_cn.pm +++ b/lib/Image/ExifTool/Lang/zh_cn.pm @@ -1313,7 +1313,7 @@ and values. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Lang/zh_tw.pm b/lib/Image/ExifTool/Lang/zh_tw.pm index 8f1f2297..82a88f95 100644 --- a/lib/Image/ExifTool/Lang/zh_tw.pm +++ b/lib/Image/ExifTool/Lang/zh_tw.pm @@ -784,7 +784,7 @@ and values. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Leaf.pm b/lib/Image/ExifTool/Leaf.pm index d7e588c6..e38c3fde 100644 --- a/lib/Image/ExifTool/Leaf.pm +++ b/lib/Image/ExifTool/Leaf.pm @@ -504,7 +504,7 @@ Capture. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Lytro.pm b/lib/Image/ExifTool/Lytro.pm index 69f33894..83f51d88 100644 --- a/lib/Image/ExifTool/Lytro.pm +++ b/lib/Image/ExifTool/Lytro.pm @@ -192,7 +192,7 @@ from Lytro Light Field Picture (LFP) files. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/M2TS.pm b/lib/Image/ExifTool/M2TS.pm index 4e6f37a7..e24beed9 100644 --- a/lib/Image/ExifTool/M2TS.pm +++ b/lib/Image/ExifTool/M2TS.pm @@ -714,7 +714,7 @@ video. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/MIE.pm b/lib/Image/ExifTool/MIE.pm index 45750878..da8321d1 100644 --- a/lib/Image/ExifTool/MIE.pm +++ b/lib/Image/ExifTool/MIE.pm @@ -2544,7 +2544,7 @@ tag name. For example: =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. The MIE format itself is also diff --git a/lib/Image/ExifTool/MIEUnits.pod b/lib/Image/ExifTool/MIEUnits.pod index 4c98233f..b70980e8 100644 --- a/lib/Image/ExifTool/MIEUnits.pod +++ b/lib/Image/ExifTool/MIEUnits.pod @@ -356,7 +356,7 @@ A few examples of combined units strings: =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/MIFF.pm b/lib/Image/ExifTool/MIFF.pm index ec010db5..dd8b0998 100644 --- a/lib/Image/ExifTool/MIFF.pm +++ b/lib/Image/ExifTool/MIFF.pm @@ -255,7 +255,7 @@ This module contains routines required by Image::ExifTool to read MIFF =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/MNG.pm b/lib/Image/ExifTool/MNG.pm index ca2e6cb5..aa947d42 100644 --- a/lib/Image/ExifTool/MNG.pm +++ b/lib/Image/ExifTool/MNG.pm @@ -661,7 +661,7 @@ This module contains definitions required by Image::ExifTool to read MNG =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/MOI.pm b/lib/Image/ExifTool/MOI.pm index c82cac70..563b4d44 100644 --- a/lib/Image/ExifTool/MOI.pm +++ b/lib/Image/ExifTool/MOI.pm @@ -137,7 +137,7 @@ information from MOI files. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/MPC.pm b/lib/Image/ExifTool/MPC.pm index 3b86d17e..815b2c40 100644 --- a/lib/Image/ExifTool/MPC.pm +++ b/lib/Image/ExifTool/MPC.pm @@ -134,7 +134,7 @@ information from Musepack (MPC) audio files. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/MPEG.pm b/lib/Image/ExifTool/MPEG.pm index 00b44fad..3dbbc2ae 100644 --- a/lib/Image/ExifTool/MPEG.pm +++ b/lib/Image/ExifTool/MPEG.pm @@ -704,7 +704,7 @@ based on unofficial sources which may be incomplete, inaccurate or outdated. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/MPF.pm b/lib/Image/ExifTool/MPF.pm index 269005aa..6ba11bf2 100644 --- a/lib/Image/ExifTool/MPF.pm +++ b/lib/Image/ExifTool/MPF.pm @@ -266,7 +266,7 @@ Format (MPF) information from JPEG images. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/MWG.pm b/lib/Image/ExifTool/MWG.pm index 899fb49c..86ca15fa 100644 --- a/lib/Image/ExifTool/MWG.pm +++ b/lib/Image/ExifTool/MWG.pm @@ -756,7 +756,7 @@ must be loaded explicitly as described above. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/MXF.pm b/lib/Image/ExifTool/MXF.pm index e52568c3..95dd7fe1 100644 --- a/lib/Image/ExifTool/MXF.pm +++ b/lib/Image/ExifTool/MXF.pm @@ -2987,7 +2987,7 @@ information from MXF (Material Exchange Format) files. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/MacOS.pm b/lib/Image/ExifTool/MacOS.pm index f8c62725..dc2f2e3c 100644 --- a/lib/Image/ExifTool/MacOS.pm +++ b/lib/Image/ExifTool/MacOS.pm @@ -721,7 +721,7 @@ Writable tags use "xattr", "setfile" or "osascript" for writing. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/MakerNotes.pm b/lib/Image/ExifTool/MakerNotes.pm index f1940884..90e4941c 100644 --- a/lib/Image/ExifTool/MakerNotes.pm +++ b/lib/Image/ExifTool/MakerNotes.pm @@ -1812,7 +1812,7 @@ maker notes in EXIF information. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Matroska.pm b/lib/Image/ExifTool/Matroska.pm index 56040f56..3b4129a9 100644 --- a/lib/Image/ExifTool/Matroska.pm +++ b/lib/Image/ExifTool/Matroska.pm @@ -914,7 +914,7 @@ information from Matroska multimedia files (MKA, MKV, MKS and WEBM). =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Microsoft.pm b/lib/Image/ExifTool/Microsoft.pm index 9b93c976..2e8bb7c0 100644 --- a/lib/Image/ExifTool/Microsoft.pm +++ b/lib/Image/ExifTool/Microsoft.pm @@ -884,7 +884,7 @@ Microsoft-specific EXIF and XMP tags. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Minolta.pm b/lib/Image/ExifTool/Minolta.pm index f6192e31..37fc2226 100644 --- a/lib/Image/ExifTool/Minolta.pm +++ b/lib/Image/ExifTool/Minolta.pm @@ -2928,7 +2928,7 @@ and write Minolta RAW (MRW) images. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/MinoltaRaw.pm b/lib/Image/ExifTool/MinoltaRaw.pm index 57cbffe4..61f88126 100644 --- a/lib/Image/ExifTool/MinoltaRaw.pm +++ b/lib/Image/ExifTool/MinoltaRaw.pm @@ -512,7 +512,7 @@ write Konica-Minolta RAW (MRW) images. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Motorola.pm b/lib/Image/ExifTool/Motorola.pm index 04bd371a..50a4a76f 100644 --- a/lib/Image/ExifTool/Motorola.pm +++ b/lib/Image/ExifTool/Motorola.pm @@ -159,7 +159,7 @@ cell phone images. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Nikon.pm b/lib/Image/ExifTool/Nikon.pm index a97ef738..c9f3ec07 100644 --- a/lib/Image/ExifTool/Nikon.pm +++ b/lib/Image/ExifTool/Nikon.pm @@ -9796,7 +9796,7 @@ Nikon maker notes in EXIF information. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/NikonCapture.pm b/lib/Image/ExifTool/NikonCapture.pm index a31930dd..8334c96e 100644 --- a/lib/Image/ExifTool/NikonCapture.pm +++ b/lib/Image/ExifTool/NikonCapture.pm @@ -918,7 +918,7 @@ the maker notes of NEF images. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/NikonCustom.pm b/lib/Image/ExifTool/NikonCustom.pm index f29bda73..5f533c67 100644 --- a/lib/Image/ExifTool/NikonCustom.pm +++ b/lib/Image/ExifTool/NikonCustom.pm @@ -9534,7 +9534,7 @@ this information. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Nintendo.pm b/lib/Image/ExifTool/Nintendo.pm index 3d1090d4..43f48800 100644 --- a/lib/Image/ExifTool/Nintendo.pm +++ b/lib/Image/ExifTool/Nintendo.pm @@ -107,7 +107,7 @@ interpret Nintendo maker notes EXIF meta information. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/OOXML.pm b/lib/Image/ExifTool/OOXML.pm index e1ec1271..42bbab66 100644 --- a/lib/Image/ExifTool/OOXML.pm +++ b/lib/Image/ExifTool/OOXML.pm @@ -395,7 +395,7 @@ archives of XML files. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Ogg.pm b/lib/Image/ExifTool/Ogg.pm index e81ef3ac..625682cb 100644 --- a/lib/Image/ExifTool/Ogg.pm +++ b/lib/Image/ExifTool/Ogg.pm @@ -214,7 +214,7 @@ information from Ogg bitstream container files. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Olympus.pm b/lib/Image/ExifTool/Olympus.pm index 9a978dde..00cf6b7c 100644 --- a/lib/Image/ExifTool/Olympus.pm +++ b/lib/Image/ExifTool/Olympus.pm @@ -4064,7 +4064,7 @@ Olympus or Epson maker notes in EXIF information. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/OpenEXR.pm b/lib/Image/ExifTool/OpenEXR.pm index 2d2d2b3e..425f1c9e 100644 --- a/lib/Image/ExifTool/OpenEXR.pm +++ b/lib/Image/ExifTool/OpenEXR.pm @@ -302,7 +302,7 @@ information from OpenEXR images. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Opus.pm b/lib/Image/ExifTool/Opus.pm index c5508e76..399a4fc5 100644 --- a/lib/Image/ExifTool/Opus.pm +++ b/lib/Image/ExifTool/Opus.pm @@ -69,7 +69,7 @@ information from Ogg Opus audio files. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/PCX.pm b/lib/Image/ExifTool/PCX.pm index 7e4d746a..9b233355 100644 --- a/lib/Image/ExifTool/PCX.pm +++ b/lib/Image/ExifTool/PCX.pm @@ -114,7 +114,7 @@ information from PC Paintbrush (PCX) files. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/PDF.pm b/lib/Image/ExifTool/PDF.pm index 1ca7fbec..978ce3cd 100644 --- a/lib/Image/ExifTool/PDF.pm +++ b/lib/Image/ExifTool/PDF.pm @@ -21,7 +21,7 @@ use vars qw($VERSION $AUTOLOAD $lastFetched); use Image::ExifTool qw(:DataAccess :Utils); require Exporter; -$VERSION = '1.50'; +$VERSION = '1.51'; sub FetchObject($$$$); sub ExtractObject($$;$$); @@ -2164,6 +2164,7 @@ sub ReadPDF($$) # set input record separator local $/ = $ws =~ /(\x0d\x0a|\x0d|\x0a)/ ? $1 : "\x0a"; my (%xref, @mainDicts, %loaded, $mainFree); + my ($xrefSize, $mainDictSize) = (0, 0); # initialize variables to capture when rewriting if ($capture) { $capture->{startxref} = $xr; @@ -2206,6 +2207,7 @@ XRef: $raf->Read($buff, 20) == 20 or return -6; $buff =~ /^\s*(\d{10}) (\d{5}) (f|n)/s or return -4; my $num = $start + $i; + $xrefSize = $num if $num > $xrefSize; # locate object to generate entry from stream if necessary # (must do this before we test $xref{$num}) LocateAnyObject(\%xref, $num) if $xref{dicts}; @@ -2242,6 +2244,8 @@ XRef: $et->Warn('Error loading secondary dictionary'); next; } + # keep track of total trailer dictionary Size + $mainDictSize = $$mainDict{Size} if $$mainDict{Size} and $$mainDict{Size} > $mainDictSize; if ($loadXRefStream) { # decode and save our XRef stream from PDF-1.5 file # (but parse it later as required to save time) @@ -2280,6 +2284,10 @@ XRef: # load previous xref table if it exists push @xrefOffsets, $$mainDict{Prev}, 'Prev' if $$mainDict{Prev}; } + if ($xrefSize > $mainDictSize) { + my $str = "Objects in xref table ($xrefSize) exceed trailer dictionary Size ($mainDictSize)"; + $capture ? $et->Error($str) : $et->Warn($str); + } # # extract encryption information if necessary # @@ -2381,7 +2389,7 @@ including AESV2 (AES-128) and AESV3 (AES-256). =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/PGF.pm b/lib/Image/ExifTool/PGF.pm index f56f1a7f..77462126 100644 --- a/lib/Image/ExifTool/PGF.pm +++ b/lib/Image/ExifTool/PGF.pm @@ -119,7 +119,7 @@ information from Progressive Graphics File (PGF) images. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/PICT.pm b/lib/Image/ExifTool/PICT.pm index 873ccb0a..ec05878f 100644 --- a/lib/Image/ExifTool/PICT.pm +++ b/lib/Image/ExifTool/PICT.pm @@ -1236,7 +1236,7 @@ Verbose or the Unknown option. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/PLIST.pm b/lib/Image/ExifTool/PLIST.pm index c014895c..09a7b861 100644 --- a/lib/Image/ExifTool/PLIST.pm +++ b/lib/Image/ExifTool/PLIST.pm @@ -438,7 +438,7 @@ This module decodes both the binary and XML-based PLIST format. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/PLUS.pm b/lib/Image/ExifTool/PLUS.pm index 4c60e641..0c5a8515 100644 --- a/lib/Image/ExifTool/PLUS.pm +++ b/lib/Image/ExifTool/PLUS.pm @@ -2586,7 +2586,7 @@ Definitions for PLUS (Picture Licensing Universal System) tags. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/PNG.pm b/lib/Image/ExifTool/PNG.pm index c40a55f9..a71dae2a 100644 --- a/lib/Image/ExifTool/PNG.pm +++ b/lib/Image/ExifTool/PNG.pm @@ -1531,7 +1531,7 @@ and JNG (JPEG Network Graphics) images. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/PPM.pm b/lib/Image/ExifTool/PPM.pm index 490f7ee5..1246b4e6 100644 --- a/lib/Image/ExifTool/PPM.pm +++ b/lib/Image/ExifTool/PPM.pm @@ -143,7 +143,7 @@ BitMap) images. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/PSP.pm b/lib/Image/ExifTool/PSP.pm index cd275a6f..ece86dc4 100644 --- a/lib/Image/ExifTool/PSP.pm +++ b/lib/Image/ExifTool/PSP.pm @@ -284,7 +284,7 @@ information from Paint Shop Pro images. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Palm.pm b/lib/Image/ExifTool/Palm.pm index 017aa414..3e78fdbe 100644 --- a/lib/Image/ExifTool/Palm.pm +++ b/lib/Image/ExifTool/Palm.pm @@ -379,7 +379,7 @@ KF7 and KF8 books (AZW and AZW3). =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Panasonic.pm b/lib/Image/ExifTool/Panasonic.pm index cd98e4ed..54554a40 100644 --- a/lib/Image/ExifTool/Panasonic.pm +++ b/lib/Image/ExifTool/Panasonic.pm @@ -2812,7 +2812,7 @@ Panasonic and Leica maker notes in EXIF information. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/PanasonicRaw.pm b/lib/Image/ExifTool/PanasonicRaw.pm index 67c318d2..edc4657f 100644 --- a/lib/Image/ExifTool/PanasonicRaw.pm +++ b/lib/Image/ExifTool/PanasonicRaw.pm @@ -888,7 +888,7 @@ write meta information in Panasonic/Leica RAW, RW2 and RWL images. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Parrot.pm b/lib/Image/ExifTool/Parrot.pm index d42cbc2a..c0790a7a 100644 --- a/lib/Image/ExifTool/Parrot.pm +++ b/lib/Image/ExifTool/Parrot.pm @@ -731,7 +731,7 @@ timed metadata from the 'mett' frame found in Parrot drone MP4 videos. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Pentax.pm b/lib/Image/ExifTool/Pentax.pm index 3abdbcce..a18b8a60 100644 --- a/lib/Image/ExifTool/Pentax.pm +++ b/lib/Image/ExifTool/Pentax.pm @@ -58,7 +58,7 @@ use Image::ExifTool::Exif; use Image::ExifTool::GPS; use Image::ExifTool::HP; -$VERSION = '3.35'; +$VERSION = '3.36'; sub CryptShutterCount($$); sub PrintFilter($$$); @@ -322,6 +322,7 @@ sub DecodeAFPoints($$$$;$); '8 21' => 'Sigma 17-50mm F2.8 EX DC OS HSM', #26 '8 22' => 'Sigma 85mm F1.4 EX DG HSM', #26 '8 23' => 'Sigma 70-200mm F2.8 APO EX DG OS HSM', #27 + '8 24' => 'Sigma 17-70mm F2.8-4 DC Macro OS HSM', #27 '8 25' => 'Sigma 17-50mm F2.8 EX DC HSM', #Exiv2 '8 27' => 'Sigma 18-200mm F3.5-6.3 II DC HSM', #27 '8 28' => 'Sigma 18-250mm F3.5-6.3 DC Macro HSM', #27 @@ -6290,7 +6291,7 @@ tags, and everyone who helped contribute to the LensType values. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/PhaseOne.pm b/lib/Image/ExifTool/PhaseOne.pm index ef9024d8..c95831ac 100644 --- a/lib/Image/ExifTool/PhaseOne.pm +++ b/lib/Image/ExifTool/PhaseOne.pm @@ -711,7 +711,7 @@ One maker notes. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/PhotoCD.pm b/lib/Image/ExifTool/PhotoCD.pm index 16d55822..a2f813dd 100644 --- a/lib/Image/ExifTool/PhotoCD.pm +++ b/lib/Image/ExifTool/PhotoCD.pm @@ -484,7 +484,7 @@ information from Kodak Photo CD Image Pac (PCD) files. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/PhotoMechanic.pm b/lib/Image/ExifTool/PhotoMechanic.pm index 9454471f..f2c41fb7 100644 --- a/lib/Image/ExifTool/PhotoMechanic.pm +++ b/lib/Image/ExifTool/PhotoMechanic.pm @@ -236,7 +236,7 @@ write information written by the Camera Bits Photo Mechanic software. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Photoshop.pm b/lib/Image/ExifTool/Photoshop.pm index cc1e7275..fe4dc2f1 100644 --- a/lib/Image/ExifTool/Photoshop.pm +++ b/lib/Image/ExifTool/Photoshop.pm @@ -1137,7 +1137,7 @@ be preserved when copying Photoshop information via user-defined tags. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/PostScript.pm b/lib/Image/ExifTool/PostScript.pm index 5380df29..3e3e6bb0 100644 --- a/lib/Image/ExifTool/PostScript.pm +++ b/lib/Image/ExifTool/PostScript.pm @@ -777,7 +777,7 @@ This code reads meta information from EPS (Encapsulated PostScript), PS =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/PrintIM.pm b/lib/Image/ExifTool/PrintIM.pm index fcf3cf95..025016ab 100644 --- a/lib/Image/ExifTool/PrintIM.pm +++ b/lib/Image/ExifTool/PrintIM.pm @@ -112,7 +112,7 @@ Print Image Matching meta information. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Qualcomm.pm b/lib/Image/ExifTool/Qualcomm.pm index ed327f6e..cb39da86 100644 --- a/lib/Image/ExifTool/Qualcomm.pm +++ b/lib/Image/ExifTool/Qualcomm.pm @@ -1331,7 +1331,7 @@ information from the APP7 Qualcomm segment in JPEG images. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/QuickTime.pm b/lib/Image/ExifTool/QuickTime.pm index ac8d07cc..c412a971 100644 --- a/lib/Image/ExifTool/QuickTime.pm +++ b/lib/Image/ExifTool/QuickTime.pm @@ -9500,7 +9500,7 @@ information from QuickTime and MP4 video, M4A audio, and HEIC image files. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/QuickTimeStream.pl b/lib/Image/ExifTool/QuickTimeStream.pl index ab6f9c30..027ddd22 100644 --- a/lib/Image/ExifTool/QuickTimeStream.pl +++ b/lib/Image/ExifTool/QuickTimeStream.pl @@ -1771,6 +1771,25 @@ ATCRec: for ($recPos = 0x30; $recPos + 52 < $dirLen; $recPos += 52) { $trk = GetFloat($dataPt, 0x58); } + } elsif ($$dataPt =~ /^.{60}A\0.{6}([NS])\0.{6}([EW])\0/s and $dirLen >= 112) { + + # header looks like this in my sample (unknown dashcam, "Anticlock 2 2020_1125_1455_007.MOV"): + # 0000: 00 00 80 00 66 72 65 65 47 50 53 20 68 00 00 00 [....freeGPS h...] + # 0010: 32 30 31 33 30 33 32 35 41 00 00 00 00 00 00 00 [20130325A.......] + # 0020: 41 70 72 20 20 36 20 32 30 31 36 2c 20 31 36 3a [Apr 6 2016, 16:] + # 0030: 0e 00 00 00 38 00 00 00 22 00 00 00 41 00 00 00 [....8..."...A...] + # 0040: 8a 63 24 45 53 00 00 00 9f e6 42 45 45 00 00 00 [.c$ES.....BEE...] + # 0050: 59 c0 04 3f 52 b8 42 41 14 00 00 00 0b 00 00 00 [Y..?R.BA........] + # 0060: 19 00 00 00 06 00 00 00 05 00 00 00 f6 ff ff ff [................] + # 0070: 03 00 00 00 04 00 00 00 00 00 00 00 00 00 00 00 [................] + ($latRef, $lonRef) = ($1, $2); + ($hr,$min,$sec,$yr,$mon,$day,@acc) = unpack('x48V3x28V6',$$dataPt); + map { $_ = $_ - 4294967296 if $_ >= 0x80000000; $_ /= 1000 } @acc; # (NC) + $lat = GetFloat($dataPt, 0x40); + $lon = GetFloat($dataPt, 0x48); + $spd = GetFloat($dataPt, 0x50); + $trk = GetFloat($dataPt, 0x54); + } else { # (look for binary GPS as stored by NextBase 512G, ref PH) @@ -1836,8 +1855,10 @@ ATCRec: for ($recPos = 0x30; $recPos + 52 < $dirLen; $recPos += 52) { $et->HandleTag($tagTbl, GPSDateTime => $time); $et->HandleTag($tagTbl, GPSLatitude => $lat * ($latRef eq 'S' ? -1 : 1)); $et->HandleTag($tagTbl, GPSLongitude => $lon * ($lonRef eq 'W' ? -1 : 1)); - $et->HandleTag($tagTbl, GPSSpeed => $spd); # (now in km/h) - $et->HandleTag($tagTbl, GPSSpeedRef => 'K'); + if (defined $spd) { + $et->HandleTag($tagTbl, GPSSpeed => $spd); # (now in km/h) + $et->HandleTag($tagTbl, GPSSpeedRef => 'K'); + } if (defined $trk) { $et->HandleTag($tagTbl, GPSTrack => $trk); $et->HandleTag($tagTbl, GPSTrackRef => 'T'); @@ -2649,7 +2670,7 @@ information like GPS tracks from MOV, MP4 and INSV media data. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/RIFF.pm b/lib/Image/ExifTool/RIFF.pm index 8790ce62..aaac9e2e 100644 --- a/lib/Image/ExifTool/RIFF.pm +++ b/lib/Image/ExifTool/RIFF.pm @@ -482,6 +482,15 @@ my %code2charset = ( Name => 'CharacterSet', SubDirectory => { TagTable => 'Image::ExifTool::RIFF::CSET' }, }, + # tx_ tags are generated based on the Codec used for the txts stream + tx_USER => { + Name => 'UserText', + SubDirectory => { TagTable => 'Image::ExifTool::RIFF::UserText' }, + }, + tx_Unknown => { # (untested) + Name => 'Text', + Notes => 'streamed text, extracted when the ExtractEmbedded option is used', + }, # # WebP-specific tags # @@ -995,6 +1004,12 @@ my %code2charset = ( Condition => '$$self{RIFFStreamType} eq "vids"', SubDirectory => { TagTable => 'Image::ExifTool::BMP::Main' }, }, + { + Name => 'TextFormat', + Condition => '$$self{RIFFStreamType} eq "txts"', + Hidden => 1, + RawConv => '$self->Options("ExtractEmbedded") or $self->WarnOnce("Use ExtractEmbedded option to extract timed text"); undef', + }, ], ); @@ -1025,7 +1040,7 @@ my %code2charset = ( 0 => { Name => 'StreamType', Format => 'string[4]', - RawConv => '$$self{RIFFStreamType} = $val', + RawConv => '$$self{RIFFStreamNum} = ($$self{RIFFStreamNum} || 0) + 1; $$self{RIFFStreamType} = $val', PrintConv => { auds => 'Audio', mids => 'MIDI', @@ -1038,16 +1053,19 @@ my %code2charset = ( { Name => 'AudioCodec', Condition => '$$self{RIFFStreamType} eq "auds"', + RawConv => '$$self{RIFFStreamCodec}[$$self{RIFFStreamNum}-1] = $val', Format => 'string[4]', }, { Name => 'VideoCodec', Condition => '$$self{RIFFStreamType} eq "vids"', + RawConv => '$$self{RIFFStreamCodec}[$$self{RIFFStreamNum}-1] = $val', Format => 'string[4]', }, { Name => 'Codec', Format => 'string[4]', + RawConv => '$$self{RIFFStreamCodec}[$$self{RIFFStreamNum}-1] = $val', }, ], # 2 => 'StreamFlags', @@ -1243,6 +1261,54 @@ my %code2charset = ( }, ); +# streamed USER txts written by some dashcam (ref PH) +%Image::ExifTool::RIFF::UserText = ( + PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData, + GROUPS => { 2 => 'Location' }, + NOTES => q{ + Tags decoded from the USER-format txts stream written by an unknown dashcam. + Extracted only if the ExtractEmbedded option is used. + }, + # 0 - int32u: 0 + # 4 - int32u: sample number (starting from unknown offset) + # 8 - int8u[4]: "0 x y z" ? (z mostly 5-8) + # 12 - int8u[4]: "0 x 1 0" ? (x incrementing once per second) + # 16 - int8u[4]: "0 32 0 x" ? + # 20 - int32u: 100-150(mostly), 250-300(once per second) + # 24 - int8u[4]: "0 x y 0" ? + 28 => { Name => 'GPSAltitude', Format => 'int32u', ValueConv => '$val / 10' }, # (NC) + # 32 - int32u: 0(mostly), 23(once per second) + # 36 - int32u: 1 + 40 => { Name => 'Accelerometer', Format => 'float[3]' }, + # 52 - int32u: 1 + 56 => { Name => 'GPSSpeed', Format => 'float' }, # km/h + 60 => { + Name => 'GPSLatitude', + Format => 'float', + # Note: these values are unsigned and I don't know where the hemisphere is stored, + # but my only sample is from the U.S., so assume a positive latitude (for now) + ValueConv => 'my $deg = int($val / 100); $deg + ($val - $deg * 100) / 60', + PrintConv => 'Image::ExifTool::GPS::ToDMS($self, $val, 1, "N")', + }, + 64 => { + Name => 'GPSLongitude', + Format => 'float', + # Note: these values are unsigned and I don't know where the hemisphere is stored, + # but my only sample is from the U.S., so assume a negative longitude (for now) + ValueConv => 'my $deg = int($val / 100); -($deg + ($val - $deg * 100) / 60)', + PrintConv => 'Image::ExifTool::GPS::ToDMS($self, $val, 1, "E")', + }, + 68 => { + Name => 'GPSDateTime', + Description => 'GPS Date/Time', + Groups => { 2 => 'Time' }, + Format => 'int32u', + ValueConv => 'ConvertUnixTime($val)', + # (likely local time, but clock seemed off by 3 hours in my sample) + PrintConv => '$self->ConvertDateTime($val)', + }, +); + # WebP alpha info (ref 14) %Image::ExifTool::RIFF::ALPH = ( PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData, @@ -1752,6 +1818,7 @@ sub ProcessRIFF($$) my ($buff, $buf2, $type, $mime, $err, $rf64); my $verbose = $et->Options('Verbose'); my $unknown = $et->Options('Unknown'); + my $ee = $et->Options('ExtractEmbedded'); # verify this is a valid RIFF file return 0 unless $raf->Read($buff, 12) == 12; @@ -1769,7 +1836,8 @@ sub ProcessRIFF($$) $mime = $riffMimeType{$type} if $type; $et->SetFileType($type, $mime); $$et{VALUE}{FileType} .= ' (RF64)' if $rf64; - $$et{RIFFStreamType} = ''; # initialize stream type + $$et{RIFFStreamType} = ''; # initialize stream type + $$et{RIFFStreamCodec} = []; # initialize codec array SetByteOrder('II'); my $tagTbl = GetTagTable('Image::ExifTool::RIFF::Main'); my $pos = 12; @@ -1808,14 +1876,20 @@ sub ProcessRIFF($$) # stop when we hit the audio data or AVI index or AVI movie data # --> no more because Adobe Bridge stores XMP after this!! # (so now we only do this on the FastScan option) - if (($tag eq 'data' or $tag eq 'idx1' or $tag eq 'LIST_movi') and - $et->Options('FastScan')) + if ($et->Options('FastScan') and ($tag eq 'data' or $tag eq 'idx1' or + ($tag eq 'LIST_movi' and not $ee))) { $et->VPrint(0, "(end of parsing)\n"); last; } # RIFF chunks are padded to an even number of bytes my $len2 = $len + ($len & 0x01); + # change name of stream txts data depending on the Codec + if ($ee and $tag =~ /^(\d{2})tx$/) { + $tag = 'tx_' . ($$et{RIFFStreamCodec}[$1] || 'Unknown'); + $tag = "tx_Unknown" unless defined $$tagTbl{$tag}; + $$et{DOC_NUM} = ++$$et{DOC_COUNT}; + } my $tagInfo = $$tagTbl{$tag}; if ($tagInfo or (($verbose or $unknown) and $tag !~ /^(data|idx1|LIST_movi|RIFF)$/)) { $raf->Read($buff, $len2) == $len2 or $err=1, last; @@ -1835,11 +1909,14 @@ sub ProcessRIFF($$) delete $$et{SET_GROUP0}; delete $$et{SET_GROUP1}; } + delete $$et{DOC_NUM} if $ee; } elsif ($tag eq 'RIFF') { # don't read into RIFF chunk (eg. concatenated video file) $raf->Read($buff, 4) == 4 or $err=1, last; # extract information from remaining file as an embedded file $$et{DOC_NUM} = ++$$et{DOC_COUNT} + } elsif ($tag eq 'LIST_movi' and $ee) { + next; # parse into movi chunk } else { if ($len > 0x7fffffff and not $et->Options('LargeFileSupport')) { $et->Warn("Stopped parsing at large $tag chunk (LargeFileSupport not set)"); @@ -1874,7 +1951,7 @@ including AVI videos, WAV audio files and WEBP images. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/RSRC.pm b/lib/Image/ExifTool/RSRC.pm index 4dd82604..6cdc830e 100644 --- a/lib/Image/ExifTool/RSRC.pm +++ b/lib/Image/ExifTool/RSRC.pm @@ -225,7 +225,7 @@ resource files. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/RTF.pm b/lib/Image/ExifTool/RTF.pm index ef6506f4..5de7932c 100644 --- a/lib/Image/ExifTool/RTF.pm +++ b/lib/Image/ExifTool/RTF.pm @@ -366,7 +366,7 @@ information from RTF (Rich Text Format) documents. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Radiance.pm b/lib/Image/ExifTool/Radiance.pm index 4717bd62..1fa470ec 100644 --- a/lib/Image/ExifTool/Radiance.pm +++ b/lib/Image/ExifTool/Radiance.pm @@ -125,7 +125,7 @@ images are a type of high dynamic-range image. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Rawzor.pm b/lib/Image/ExifTool/Rawzor.pm index 6c19b1b2..f7384eca 100644 --- a/lib/Image/ExifTool/Rawzor.pm +++ b/lib/Image/ExifTool/Rawzor.pm @@ -168,7 +168,7 @@ information from Rawzor compressed images. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Real.pm b/lib/Image/ExifTool/Real.pm index 19a78097..08a9e24f 100644 --- a/lib/Image/ExifTool/Real.pm +++ b/lib/Image/ExifTool/Real.pm @@ -715,7 +715,7 @@ little-endian, but the Real format is big-endian. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Reconyx.pm b/lib/Image/ExifTool/Reconyx.pm index 8f0b1d97..7873ef67 100644 --- a/lib/Image/ExifTool/Reconyx.pm +++ b/lib/Image/ExifTool/Reconyx.pm @@ -431,7 +431,7 @@ maker notes in images from Reconyx cameras. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Red.pm b/lib/Image/ExifTool/Red.pm index a0cd9eb0..50273458 100644 --- a/lib/Image/ExifTool/Red.pm +++ b/lib/Image/ExifTool/Red.pm @@ -303,7 +303,7 @@ from Redcode R3D version 1 and 2 video files. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Ricoh.pm b/lib/Image/ExifTool/Ricoh.pm index 42b51362..602586c0 100644 --- a/lib/Image/ExifTool/Ricoh.pm +++ b/lib/Image/ExifTool/Ricoh.pm @@ -1143,7 +1143,7 @@ interpret Ricoh maker notes EXIF meta information. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Samsung.pm b/lib/Image/ExifTool/Samsung.pm index a8acf852..65dd7083 100644 --- a/lib/Image/ExifTool/Samsung.pm +++ b/lib/Image/ExifTool/Samsung.pm @@ -1447,7 +1447,7 @@ Samsung maker notes in EXIF information. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Sanyo.pm b/lib/Image/ExifTool/Sanyo.pm index d594dcaa..978a1fef 100644 --- a/lib/Image/ExifTool/Sanyo.pm +++ b/lib/Image/ExifTool/Sanyo.pm @@ -419,7 +419,7 @@ Sanyo maker notes in EXIF information. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Scalado.pm b/lib/Image/ExifTool/Scalado.pm index 27e34869..f56b87ae 100644 --- a/lib/Image/ExifTool/Scalado.pm +++ b/lib/Image/ExifTool/Scalado.pm @@ -128,7 +128,7 @@ metadata from the JPEG APP4 SCALADO segment. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Shift.pl b/lib/Image/ExifTool/Shift.pl index 1bc5f905..48cee105 100644 --- a/lib/Image/ExifTool/Shift.pl +++ b/lib/Image/ExifTool/Shift.pl @@ -630,7 +630,7 @@ limited to the range 1970 to 2038 on 32-bit systems. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Shortcuts.pm b/lib/Image/ExifTool/Shortcuts.pm index 28480a50..92bae893 100644 --- a/lib/Image/ExifTool/Shortcuts.pm +++ b/lib/Image/ExifTool/Shortcuts.pm @@ -332,7 +332,7 @@ name prefix. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Sigma.pm b/lib/Image/ExifTool/Sigma.pm index feb036eb..27eb76fc 100644 --- a/lib/Image/ExifTool/Sigma.pm +++ b/lib/Image/ExifTool/Sigma.pm @@ -837,7 +837,7 @@ Sigma and Foveon maker notes in EXIF information. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/SigmaRaw.pm b/lib/Image/ExifTool/SigmaRaw.pm index 6c2cbf0c..d732a78f 100644 --- a/lib/Image/ExifTool/SigmaRaw.pm +++ b/lib/Image/ExifTool/SigmaRaw.pm @@ -650,7 +650,7 @@ Sigma and Foveon X3F images. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Sony.pm b/lib/Image/ExifTool/Sony.pm index 6153f1a4..14da6a88 100644 --- a/lib/Image/ExifTool/Sony.pm +++ b/lib/Image/ExifTool/Sony.pm @@ -11102,7 +11102,7 @@ Minolta. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/SonyIDC.pm b/lib/Image/ExifTool/SonyIDC.pm index 3b85413f..6cef4bb6 100644 --- a/lib/Image/ExifTool/SonyIDC.pm +++ b/lib/Image/ExifTool/SonyIDC.pm @@ -379,7 +379,7 @@ write Sony Image Data Converter version 3.0 metadata in ARW images. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Stim.pm b/lib/Image/ExifTool/Stim.pm index e203580c..70a26456 100644 --- a/lib/Image/ExifTool/Stim.pm +++ b/lib/Image/ExifTool/Stim.pm @@ -174,7 +174,7 @@ information. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/TagInfoXML.pm b/lib/Image/ExifTool/TagInfoXML.pm index ad6287ec..4cf40448 100644 --- a/lib/Image/ExifTool/TagInfoXML.pm +++ b/lib/Image/ExifTool/TagInfoXML.pm @@ -637,7 +637,7 @@ and values. ~head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. @@ -821,7 +821,7 @@ Number of modules updated, or negative on error. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/TagLookup.pm b/lib/Image/ExifTool/TagLookup.pm index e6b61c7c..acbb64ba 100644 --- a/lib/Image/ExifTool/TagLookup.pm +++ b/lib/Image/ExifTool/TagLookup.pm @@ -10834,6 +10834,7 @@ my %tagExists = ( 'userplaycountweekend' => 1, 'userselectgrouptitle' => 1, 'userservicerating' => 1, + 'usertext' => 1, 'userweburl' => 1, 'usingtransforms' => 1, 'usmparametershigh' => 1, @@ -11448,7 +11449,7 @@ Provides a fast, case insensitive lookup for tag names. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/TagNames.pod b/lib/Image/ExifTool/TagNames.pod index e60f059a..f86ff6a4 100644 --- a/lib/Image/ExifTool/TagNames.pod +++ b/lib/Image/ExifTool/TagNames.pod @@ -12,7 +12,7 @@ meta information extracted from or written to a file. =head1 TAG TABLES The tables listed below give the names of all tags recognized by ExifTool. -They contain a total of 23721 tags, with 15423 unique tag names. +They contain a total of 23727 tags, with 15422 unique tag names. 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 @@ -22942,7 +22942,7 @@ currently writes only EXIF, IPTC and XMP tags in these images. Tag ID Tag Name Writable ------ -------- -------- - 'asoc' Association no + 'asoc' Association Jpeg2000 'bfil' BinaryFilter no 'bpcc' BitsPerComponent no 'cdef' ComponentDefinition no @@ -22993,7 +22993,7 @@ currently writes only EXIF, IPTC and XMP tags in these images. UUID-GeoJP2 EXIF UUID-Photoshop Photoshop UUID-Unknown no - 'xml ' XML XMP + 'xml ' XML XMP XML =head3 Jpeg2000 ColorSpec Tags @@ -29452,6 +29452,8 @@ sub-documents, but the Duration is calculated for the full video. 'labl' Label RIFF Label 'list' ListType no 'olym' Olym Olympus WAV + 'tx_USER' UserText RIFF UserText + 'tx_Unknown' Text no =head3 RIFF ALPH Tags @@ -29753,6 +29755,20 @@ L<https://tech.ebu.ch/docs/tech/tech3306-2009.pdf> for the specification. 0 LabelID no 1 LabelText no +=head3 RIFF UserText Tags + +Tags decoded from the USER-format txts stream written by an unknown dashcam. +Extracted only if the ExtractEmbedded option is used. + + Index1 Tag Name Writable + ------ -------- -------- + 28 GPSAltitude no + 40 Accelerometer no + 56 GPSSpeed no + 60 GPSLatitude no + 64 GPSLongitude no + 68 GPSDateTime no + =head2 AIFF Tags Tags extracted from Audio Interchange File Format (AIFF) files. See @@ -35262,7 +35278,8 @@ overlapping EXIF, IPTC and XMP tags to be reconciled when reading, and synchronized when writing. The MWG Composite tags below are designed to aid in the implementation of these recommendations. As well, the MWG defines new XMP tags which are listed in the subsequent tables below. See -L<http://www.metadataworkinggroup.org/> for the official MWG specification. +L<https://web.archive.org/web/20181006115950/http://www.metadataworkinggroup.org/specs/> +for the official MWG specification. =head3 MWG Composite Tags @@ -35511,7 +35528,7 @@ L<Image::ExifTool::BuildTagLookup|Image::ExifTool::BuildTagLookup>. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Text.pm b/lib/Image/ExifTool/Text.pm index 6590c963..364cfaaa 100644 --- a/lib/Image/ExifTool/Text.pm +++ b/lib/Image/ExifTool/Text.pm @@ -223,7 +223,7 @@ characteristics of TXT and CSV files. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Theora.pm b/lib/Image/ExifTool/Theora.pm index f7e81cb2..91f71fc3 100644 --- a/lib/Image/ExifTool/Theora.pm +++ b/lib/Image/ExifTool/Theora.pm @@ -122,7 +122,7 @@ information from Theora video streams. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Torrent.pm b/lib/Image/ExifTool/Torrent.pm index 3ae1ff38..70d5003a 100644 --- a/lib/Image/ExifTool/Torrent.pm +++ b/lib/Image/ExifTool/Torrent.pm @@ -303,7 +303,7 @@ bencoded information from BitTorrent files. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Unknown.pm b/lib/Image/ExifTool/Unknown.pm index 57314857..8e550676 100644 --- a/lib/Image/ExifTool/Unknown.pm +++ b/lib/Image/ExifTool/Unknown.pm @@ -53,7 +53,7 @@ unknown manufacturers. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/VCard.pm b/lib/Image/ExifTool/VCard.pm index 8de1275d..42e7a75e 100644 --- a/lib/Image/ExifTool/VCard.pm +++ b/lib/Image/ExifTool/VCard.pm @@ -416,7 +416,7 @@ information from vCard VCF and iCalendar ICS files. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Validate.pm b/lib/Image/ExifTool/Validate.pm index b29f0049..a8eef8b2 100644 --- a/lib/Image/ExifTool/Validate.pm +++ b/lib/Image/ExifTool/Validate.pm @@ -659,7 +659,7 @@ ExifTool Validate option is enabled. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Vorbis.pm b/lib/Image/ExifTool/Vorbis.pm index a11c71a9..a31548b4 100644 --- a/lib/Image/ExifTool/Vorbis.pm +++ b/lib/Image/ExifTool/Vorbis.pm @@ -228,7 +228,7 @@ information from Ogg Vorbis audio headers. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/WTV.pm b/lib/Image/ExifTool/WTV.pm index d6223c7a..67ba26ac 100644 --- a/lib/Image/ExifTool/WTV.pm +++ b/lib/Image/ExifTool/WTV.pm @@ -297,7 +297,7 @@ This module contains definitions required by Image::ExifTool to read WTV =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/WriteCanonRaw.pl b/lib/Image/ExifTool/WriteCanonRaw.pl index bfbb79b1..0cc954a9 100644 --- a/lib/Image/ExifTool/WriteCanonRaw.pl +++ b/lib/Image/ExifTool/WriteCanonRaw.pl @@ -623,7 +623,7 @@ JPEG files, and would lead to far fewer problems with corrupted metadata. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/WriteExif.pl b/lib/Image/ExifTool/WriteExif.pl index 3dbaf562..00caa724 100644 --- a/lib/Image/ExifTool/WriteExif.pl +++ b/lib/Image/ExifTool/WriteExif.pl @@ -2563,7 +2563,7 @@ This file contains routines to write EXIF metadata. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/WriteIPTC.pl b/lib/Image/ExifTool/WriteIPTC.pl index f8930b31..4335b576 100644 --- a/lib/Image/ExifTool/WriteIPTC.pl +++ b/lib/Image/ExifTool/WriteIPTC.pl @@ -715,7 +715,7 @@ seldom-used routines. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/WritePDF.pl b/lib/Image/ExifTool/WritePDF.pl index 47699e35..6e51666a 100644 --- a/lib/Image/ExifTool/WritePDF.pl +++ b/lib/Image/ExifTool/WritePDF.pl @@ -749,7 +749,7 @@ C<PDF-update> pseudo group). =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/WritePNG.pl b/lib/Image/ExifTool/WritePNG.pl index 743477cd..f0cdb0ea 100644 --- a/lib/Image/ExifTool/WritePNG.pl +++ b/lib/Image/ExifTool/WritePNG.pl @@ -379,7 +379,7 @@ strings). =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/WritePhotoshop.pl b/lib/Image/ExifTool/WritePhotoshop.pl index fcaaf227..6098205b 100644 --- a/lib/Image/ExifTool/WritePhotoshop.pl +++ b/lib/Image/ExifTool/WritePhotoshop.pl @@ -257,7 +257,7 @@ default resource name, and applied if no appended name is provided. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/WritePostScript.pl b/lib/Image/ExifTool/WritePostScript.pl index 2815a0ab..ae2ef426 100644 --- a/lib/Image/ExifTool/WritePostScript.pl +++ b/lib/Image/ExifTool/WritePostScript.pl @@ -686,7 +686,7 @@ Thanks to Tim Kordick for his help testing the EPS writer. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/WriteQuickTime.pl b/lib/Image/ExifTool/WriteQuickTime.pl index 0a8178c0..92a8657f 100644 --- a/lib/Image/ExifTool/WriteQuickTime.pl +++ b/lib/Image/ExifTool/WriteQuickTime.pl @@ -1878,7 +1878,7 @@ QuickTime-based file formats like MOV and MP4. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/WriteXMP.pl b/lib/Image/ExifTool/WriteXMP.pl index 927bcdf8..be172ea0 100644 --- a/lib/Image/ExifTool/WriteXMP.pl +++ b/lib/Image/ExifTool/WriteXMP.pl @@ -1613,7 +1613,7 @@ This file contains routines to write XMP metadata. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/Writer.pl b/lib/Image/ExifTool/Writer.pl index b2ed2a1e..6179f898 100644 --- a/lib/Image/ExifTool/Writer.pl +++ b/lib/Image/ExifTool/Writer.pl @@ -4811,9 +4811,17 @@ TryLib: for ($lib=$strptimeLib; ; $lib='') { $ss = ':00'; } # construct properly formatted date/time string - if ($a[0]<=12 and $a[1]<=31 and $a[2]<=24 and $a[3]<=59) { - $rtnVal = "$yr:$a[0]:$a[1] $a[2]:$a[3]$ss$fs$tz"; + if ($a[0] < 1 or $a[0] > 12) { + warn "Month '$a[0]' out of range 1..12\n"; + return undef; + } + if ($a[1] < 1 or $a[1] > 31) { + warn "Day '$a[1]' out of range 1..31\n"; + return undef; } + $a[2] > 24 and warn("Hour '$a[2]' out of range 0..24\n"), return undef; + $a[3] > 59 and warn("Minutes '$a[3]' out of range 0..59\n"), return undef; + $rtnVal = "$yr:$a[0]:$a[1] $a[2]:$a[3]$ss$fs$tz"; } elsif ($dateOnly) { $rtnVal = join ':', $yr, @a; } @@ -6944,7 +6952,7 @@ used routines. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/XMP.pm b/lib/Image/ExifTool/XMP.pm index 1fa5bc55..0bef0629 100644 --- a/lib/Image/ExifTool/XMP.pm +++ b/lib/Image/ExifTool/XMP.pm @@ -50,7 +50,7 @@ use Image::ExifTool::Exif; use Image::ExifTool::GPS; require Exporter; -$VERSION = '3.36'; +$VERSION = '3.37'; @ISA = qw(Exporter); @EXPORT_OK = qw(EscapeXML UnescapeXML); @@ -3105,10 +3105,15 @@ sub FoundXMP($$$$;$) } } - if (not $ns and $$tagTablePtr{GROUPS}{0} ne 'XMP') { - # this is a simple XML table (no namespaces) + my $xmlGroups; + my $grp0 = $$tagTablePtr{GROUPS}{0}; + if (not $ns and $grp0 ne 'XMP') { $tagID = $tag; + } elsif ($grp0 eq 'XML' and not $table) { + # this is an XML table (no namespace lookup) + $tagID = "$ns:$tag"; } else { + $xmlGroups = 1 if $grp0 eq 'XML'; # look up this tag in the appropriate table $table or $table = 'Image::ExifTool::XMP::other'; $tagTablePtr = GetTagTable($table); @@ -3335,7 +3340,10 @@ NoLoop: $$et{TAG_EXTRA}{$key}{Struct} = \@structProps; $$et{IsStruct} = 1; } - if ($ns and not $$tagInfo{StaticGroup1}) { + if ($xmlGroups) { + $et->SetGroup($key, 'XML', 0); + $et->SetGroup($key, "XML-$ns", 1); + } elsif ($ns and not $$tagInfo{StaticGroup1}) { # set group1 dynamically according to the namespace $et->SetGroup($key, "$$tagTablePtr{GROUPS}{0}-$ns"); } @@ -4027,11 +4035,12 @@ sub ProcessXMP($$;$) $dirLen = $dataLen = length $$dataPt; } - # extract XMP as a block if specified + # extract XMP/XML as a block if specified my $blockName = $$dirInfo{BlockInfo} ? $$dirInfo{BlockInfo}{Name} : 'XMP'; if (($$et{REQ_TAG_LOOKUP}{lc $blockName} or ($$et{TAGS_FROM_FILE} and - not $$et{EXCL_TAG_LOOKUP}{lc $blockName})) and ($$et{FileType} eq 'XMP' or - ($$dirInfo{DirName} and $$dirInfo{DirName} eq 'XMP'))) + not $$et{EXCL_TAG_LOOKUP}{lc $blockName})) and + (($$et{FileType} eq 'XMP' and $blockName eq 'XMP') or + ($$dirInfo{DirName} and $$dirInfo{DirName} eq $blockName))) { $et->FoundTag($$dirInfo{BlockInfo} || 'XMP', substr($$dataPt, $dirStart, $dirLen)); } @@ -4193,7 +4202,7 @@ information. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/XMP2.pl b/lib/Image/ExifTool/XMP2.pl index 97c8e24a..ccab6369 100644 --- a/lib/Image/ExifTool/XMP2.pl +++ b/lib/Image/ExifTool/XMP2.pl @@ -2122,7 +2122,7 @@ This file contains definitions for less common XMP namespaces. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/XMPStruct.pl b/lib/Image/ExifTool/XMPStruct.pl index d9720c73..f3c65038 100644 --- a/lib/Image/ExifTool/XMPStruct.pl +++ b/lib/Image/ExifTool/XMPStruct.pl @@ -853,7 +853,7 @@ information. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/ZIP.pm b/lib/Image/ExifTool/ZIP.pm index b8284c2d..39555ee0 100644 --- a/lib/Image/ExifTool/ZIP.pm +++ b/lib/Image/ExifTool/ZIP.pm @@ -700,7 +700,7 @@ Electronic Publication (EPUB), and Sketch design files (SKETCH). =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/ZISRAW.pm b/lib/Image/ExifTool/ZISRAW.pm index d7665cce..23804eb9 100644 --- a/lib/Image/ExifTool/ZISRAW.pm +++ b/lib/Image/ExifTool/ZISRAW.pm @@ -101,7 +101,7 @@ metadata from Zeiss Integrated Software RAW (ZISRAW) CZI files. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. diff --git a/lib/Image/ExifTool/iWork.pm b/lib/Image/ExifTool/iWork.pm index aa381b6a..5639c42c 100644 --- a/lib/Image/ExifTool/iWork.pm +++ b/lib/Image/ExifTool/iWork.pm @@ -215,7 +215,7 @@ information from Apple iWork '09 XML+ZIP files. =head1 AUTHOR -Copyright 2003-2020, Phil Harvey (philharvey66 at gmail.com) +Copyright 2003-2021, 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. |