exiftool_vendored 12.65.0 → 12.68.0

data/bin/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 26990 tags, with 16972 unique tag names.
+They contain a total of 27039 tags, with 16991 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
@@ -5557,7 +5557,7 @@ These tags belong to the ExifTool XMP-prism family 1 group.
 
 PRISM Rights Language 2.1 namespace tags.  These tags have been deprecated
 since the release of the PRISM Usage Rights 3.0. (see
-L<http://www.prismstandard.org/>)
+L<https://www.w3.org/submissions/2020/SUBM-prism-20200910/prism-image.html>)
 
 These tags belong to the ExifTool XMP-prl family 1 group.
 
@@ -6570,12 +6570,13 @@ GeoTiffAsciiParams.
 
 =head3 PLUS XMP Tags
 
-PLUS (Picture Licensing Universal System) License Data Format 1.2.1 XMP
+PLUS (Picture Licensing Universal System) License Data Format 2.0.1 XMP
 tags.  Note that all controlled-vocabulary tags in this table (ie. tags with
 a fixed set of values) have raw values which begin with
 "http://ns.useplus.org/ldf/vocab/", but to reduce clutter this prefix has
-been removed from the values shown below.  See L<http://ns.useplus.org/> for
-the complete specification.
+been removed from the values shown below, and from the values read and
+written with the -n option.  See L<http://ns.useplus.org/> for the complete
+specification.
 
 These tags belong to the ExifTool XMP-plus family 1 group.
 
@@ -6599,6 +6600,7 @@ These tags belong to the ExifTool XMP-plus family 1 group.
   Custom7                                       lang-alt+
   Custom8                                       lang-alt+
   Custom9                                       lang-alt+
+  DataMining                                    string
   EndUser                                       EndUser Struct+
   EndUserID                                     string_+
   EndUserName                                   string_+
@@ -7188,7 +7190,7 @@ Tags extracted from the maker notes of iPhone images.
   0x000c   FocusDistanceRange                   rational64s[2]
   0x000f   OISMode                              int32s
   0x0011   ContentIdentifier                    string
-  0x0014   ImageCaptureType?                    int32s
+  0x0014   ImageCaptureType                     int32s
   0x0015   ImageUniqueID                        string
   0x0017   LivePhotoVideoIndex                  yes
   0x0019   ImageProcessingFlags?                int32s
@@ -7479,6 +7481,7 @@ Unknown only to reduce the volume of the normal output.
            CanonCameraInfo1000D                 Canon CameraInfo1000D
            CanonCameraInfo1100D                 Canon CameraInfo600D
            CanonCameraInfo1200D                 Canon CameraInfo60D
+           CanonCameraInfoR6                    Canon CameraInfoR6
            CanonCameraInfoPowerShot             Canon CameraInfoPowerShot
            CanonCameraInfoPowerShot2            Canon CameraInfoPowerShot2
            CanonCameraInfoUnknown32             Canon CameraInfoUnknown32
@@ -7516,6 +7519,7 @@ Unknown only to reduce the volume of the normal output.
   0x0038   BatteryType                          undef
   0x003c   AFInfo3                              Canon AFInfo2
   0x0081   RawDataOffset                        no
+  0x0082   RawDataLength                        no
   0x0083   OriginalDecisionDataOffset           int32u*
   0x0090   CustomFunctions1D                    CanonCustom Functions1D
   0x0091   PersonalFunctions                    CanonCustom PersonalFuncs
@@ -8462,6 +8466,14 @@ CameraInfo tags for the EOS 1000D.
     615    PictureStyleInfo                     Canon PSInfo
    2359    LensModel                            string[64]
 
+=head3 Canon CameraInfoR6 Tags
+
+CameraInfo tags for the EOS R6.
+
+  Index1   Tag Name                             Writable
+  ------   --------                             --------
+   2801    ShutterCount                         int32u
+
 =head3 Canon CameraInfoPowerShot Tags
 
 CameraInfo tags for PowerShot models such as the A450, A460, A550, A560,
@@ -13764,6 +13776,7 @@ DiMAGE X and Xt.
   0x003d   BlackLevel                           int16u[4]
   0x003e   ImageSizeRAW                         yes
   0x003f   WhiteBalanceFineTune                 rational64s[2]
+  0x0044   JPGCompression                       yes
   0x0045   CropArea                             int16u[4]
   0x004e   NikonSettings                        NikonSettings
   0x004f   ColorTemperatureAuto                 int16u
@@ -14281,6 +14294,7 @@ firmware 1.00 and earlier.
      16    ImageArea                            int8u
     545    ISO2                                 int8u
     578    ShutterCount                         int32u
+  671.1    JPGCompression                       int8u & 0x40
     718    CustomSettingsD3S                    NikonCustom SettingsD3
 
 =head3 Nikon ShotInfoD300a Tags
@@ -14664,7 +14678,7 @@ These tags are extracted from encrypted data in images from the Z7II.
 
 =head3 Nikon MenuSettingsZ7II Tags
 
-These tags are used by the Z5, Z6, Z7, Z6II, Z7II, Z50 and Zfc.
+These tags are used by the Z5, Z6, Z7, Z6II, Z7II, Z50, Zfc and Zf.
 
   Index1   Tag Name                             Writable
   ------   --------                             --------
@@ -18310,7 +18324,7 @@ These tags are used in Panasonic/Leica cameras.
   0x006d   City                                 undef
   0x006f   Landmark                             undef
   0x0070   IntelligentResolution                int8u
-  0x0076   HDRShot                              int16u
+  0x0076   MergedImages                         int16u
   0x0077   BurstSpeed                           int16u
   0x0079   IntelligentD-Range                   int16u
   0x007c   ClearRetouch                         int16u
@@ -21400,7 +21414,7 @@ Valid from July 2020 for ILCE-1/7SM3, ILME-FX3.
 
 =head3 Sony Tag9050d Tags
 
-Valid for ILCE-6700/ZV-E1.
+Valid for ILCE-6700/7CM2/7CR/ZV-E1.
 
   Index1   Tag Name                             Writable
   ------   --------                             --------
@@ -21808,7 +21822,7 @@ E-mount models.
 
 =head3 Sony Tag9416 Tags
 
-Valid for the ILCE-1/6700/7M4/7RM5/7SM3, ILME-FX3/FX30, ZV-E1.
+Valid for the ILCE-1/6700/7CM2/7CR/7M4/7RM5/7SM3, ILME-FX3/FX30, ZV-E1.
 
   Index1   Tag Name                             Writable
   ------   --------                             --------
@@ -21820,7 +21834,9 @@ Valid for the ILCE-1/6700/7M4/7RM5/7SM3, ILME-FX3/FX30, ZV-E1.
      16    SonyFNumber2                         no
      18    SonyMaxApertureValue                 no
      29    SequenceImageNumber                  no
+     43    ReleaseMode2                         no
      53    ExposureProgram                      no
+     55    CreativeStyle                        no
      72    LensMount                            no
      73    LensFormat                           no
      74    LensMount                            no
@@ -25614,6 +25630,7 @@ These tags belong to the ExifTool XMP-photomech family 1 group.
   --------                                      --------
   ColorClass                                    integer
   CountryCode                                   string/
+  CreatorIdentity                               string
   EditStatus                                    string
   PMVersion                                     string
   Prefs                                         string
@@ -29103,6 +29120,7 @@ QuickTimeHandler option may be set to 0 to avoid this.
   'itnu'       iTunesU                          int8s
   'keyw'       Keyword                          string
   'ldes'       LongDescription                  string
+  'ownr'       Owner                            string
   'pcst'       Podcast                          int8s
   'perf'       Performer                        string
   'pgap'       PlayGap                          int8s
@@ -29131,6 +29149,7 @@ QuickTimeHandler option may be set to 0 to avoid this.
   'tvnn'       TVNetworkName                    string
   'tvsh'       TVShow                           string
   'tvsn'       TVSeason                         int32u
+  'xid '       ISRC                             string
   'yrrc'       Year                             string
   "\xa9ART"    Artist                           string
   "\xa9alb"    Album                            string
@@ -29288,6 +29307,7 @@ and are not currently writable.
       4    ColorPrimaries                       no
       6    TransferCharacteristics              no
       8    MatrixCoefficients                   no
+     10    VideoFullRangeFlag                   no
 
 =head3 QuickTime HEVCConfig Tags
 
@@ -37533,6 +37553,53 @@ L<https://fits.gsfc.nasa.gov/fits_standard.html> for the specification.
   'TIME-END'   ObservationTimeEnd               no
   'TIME-OBS'   ObservationTime                  no
 
+=head2 XISF Tags
+
+This table lists some standard Extensible Image Serialization Format (XISF)
+tags, but ExifTool will extract any other tags found.  See
+L<https://pixinsight.com/xisf/> for the specification.
+
+  Tag ID                Tag Name                Writable
+  ------                --------                --------
+  'Abstract'            Abstract                no
+  'AccessRights'        AccessRights            no
+  'Authors'             Authors                 no
+  'BibliographicReferences'
+                        BibliographicReferences no
+  'BriefDescription'    BriefDescription        no
+  'CompressionCodecs'   CompressionCodecs       no
+  'CompressionLevel'    CompressionLevel        no
+  'Contributors'        Contributors            no
+  'Copyright'           Copyright               no
+  'CreationTime'        CreateDate              no
+  'CreatorApplication'  CreatorApplication      no
+  'CreatorModule'       CreatorModule           no
+  'CreatorOS'           CreatorOS               no
+  'Description'         Description             no
+  'ImageBounds'         ImageBounds             no
+  'ImageColorSpace'     ColorSpace              no
+  'ImageData'           ImageData               no
+  'ImageGeometry'       ImageGeometry           no
+  'ImageICCProfile'     ICC_Profile             no
+  'ImageICCProfileLocation' ICCProfileLocation  no
+  'ImageId'             ImageID                 no
+  'ImageImageType'      ImageType               no
+  'ImageLocation'       ImageLocation           no
+  'ImageOffset'         ImagePixelOffset        no
+  'ImageOrientation'    Orientation             no
+  'ImagePixelStorage'   ImagePixelStorage       no
+  'ImageResolutionHorizontal' XResolution       no
+  'ImageResolutionUnit' ResolutionUnit          no
+  'ImageResolutionVertical' YResolution         no
+  'ImageSampleFormat'   ImageSampleFormat       no
+  'ImageUuid'           UUID                    no
+  'Keywords'            Keywords                no
+  'Languages'           Languages               no
+  'License'             License                 no
+  'OriginalCreationTime' DateTimeOriginal       no
+  'RelatedResources'    RelatedResources        no
+  'Title'               Title                   no
+
 =head2 HTML Tags
 
 Meta information extracted from the header of HTML and XHTML files.  This is
@@ -38864,6 +38931,7 @@ FileName.
   MaxVal                     File               no
   NewGUID                    ExifTool           no
   Now                        ExifTool           no
+  NumPlanes                  File               no
   OtherImage                 File               no
   PageCount                  File               no
   PreviewImage               File               yes

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

@@ -96,6 +96,8 @@ my %ctboID = (
     "\xbe\x7a\xcf\xcb\x97\xa9\x42\xe8\x9c\x71\x99\x94\x91\xe3\xaf\xac" => 1, # XMP
     "\xea\xf4\x2b\x5e\x1c\x98\x4b\x88\xb9\xfb\xb7\xdc\x40\x6e\x4d\x16" => 2, # PreviewImage
     # ID 3 is used for 'mdat' atom (not a uuid)
+    # (haven't seen ID 4 yet)
+    "\x57\x66\xb8\x29\xbb\x6a\x47\xc5\xbc\xfb\x8b\x9f\x22\x60\xd0\x6d" => 5, # something to do with burst-roll image
 );
 
 # mark UserData tags that don't have ItemList counterparts as Preferred

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

@@ -1320,6 +1320,7 @@ sub SetNewValuesFromFile($$;@)
         Unknown         => $$options{Unknown},
         UserParam       => $$options{UserParam},
         Validate        => $$options{Validate},
+        WindowsWideFile => $$options{WindowsWideFile},
         XAttrTags       => $$options{XAttrTags},
         XMPAutoConv     => $$options{XMPAutoConv},
     );

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

@@ -0,0 +1,185 @@
+#------------------------------------------------------------------------------
+# File:         XISF.pm
+#
+# Description:  Read Extensible Image Serialization Format metadata
+#
+# Revisions:    2023-10-10 - P. Harvey Created
+#
+# References:   1) https://pixinsight.com/doc/docs/XISF-1.0-spec/XISF-1.0-spec.html
+#------------------------------------------------------------------------------
+
+package Image::ExifTool::XISF;
+
+use strict;
+use vars qw($VERSION);
+use Image::ExifTool qw(:DataAccess :Utils);
+use Image::ExifTool::XMP;
+
+$VERSION = '1.00';
+
+# XISF tags (ref 1)
+%Image::ExifTool::XISF::Main = (
+    GROUPS => { 0 => 'XML', 1 => 'XML', 2 => 'Image' },
+    VARS => { LONG_TAGS => 1 },
+    NOTES => q{
+        This table lists some standard Extensible Image Serialization Format (XISF)
+        tags, but ExifTool will extract any other tags found.  See
+        L<https://pixinsight.com/xisf/> for the specification.
+    },
+    ImageGeometry   => { },
+    ImageSampleFormat => { },
+    ImageBounds     => { },
+    ImageImageType  => { Name => 'ImageType' },
+    ImageColorSpace => { Name => 'ColorSpace' },
+    ImageLocation   => { },
+    ImageResolutionHorizontal => 'XResolution',
+    ImageResolutionVertical => 'YResolution',
+    ImageResolutionUnit => 'ResolutionUnit',
+    ImageICCProfile => {
+        Name => 'ICC_Profile',
+        ValueConv => 'Image::ExifTool::XMP::DecodeBase64($val)',
+        Binary => 1,
+    },
+    ImageICCProfileLocation => { Name => 'ICCProfileLocation' },
+    ImagePixelStorage => { },
+    ImageOffset      => { Name => 'ImagePixelOffset' },
+    ImageOrientation => { Name => 'Orientation' },
+    ImageId          => { Name => 'ImageID' },
+    ImageUuid        => { Name => 'UUID' },
+    ImageData        => { Binary => 1 },
+    'CreationTime' => {
+        Name => 'CreateDate',
+        Shift => 'Time',
+        Groups => { 2 => 'Time' },
+        ValueConv => 'Image::ExifTool::XMP::ConvertXMPDate($val)',
+        PrintConv => '$self->ConvertDateTime($val)',
+    },
+    CreatorApplication => { },
+    Abstract        => { },
+    AccessRights    => { },
+    Authors         => { Groups => { 2 => 'Author' } },
+    BibliographicReferences => { },
+    BriefDescription => { },
+    CompressionLevel => { },
+    CompressionCodecs => { },
+    Contributors    => { Groups => { 2 => 'Author' } },
+    Copyright       => { Groups => { 2 => 'Author' } },
+    CreatorModule   => { },
+    CreatorOS       => { },
+    Description     => { },
+    Keywords        => { },
+    Languages       => { },
+    License         => { },
+    OriginalCreationTime => {
+        Name => 'DateTimeOriginal',
+        Description => 'Date/Time Original',
+        Shift => 'Time',
+        Groups => { 2 => 'Time' },
+        ValueConv => 'Image::ExifTool::XMP::ConvertXMPDate($val)',
+        PrintConv => '$self->ConvertDateTime($val)',
+    },
+    RelatedResources => { },
+    Title            => { },
+);
+
+#------------------------------------------------------------------------------
+# Handle properties in XISF metadata structures
+# Inputs: 0) attribute list ref, 1) attr hash ref,
+#         2) property name ref, 3) property value ref
+# Returns: true if value was changed
+sub HandleXISFAttrs($$$$)
+{
+    my ($attrList, $attrs, $prop, $valPt) = @_;
+    return 0 unless defined $$attrs{id};
+    my ($changed, $a);
+    # use "id" as the tag name, "value" as the value, and ignore "type"
+    $$prop = $$attrs{id};
+    $$prop =~ s/^XISF://;   # remove XISF namespace
+    if (defined $$attrs{value}) {
+        $$valPt = $$attrs{value};
+        $changed = 1;
+    }
+    my @attrs = @$attrList;
+    @$attrList = ( );
+    foreach $a (@attrs) {
+        if ($a eq 'id' or $a eq 'value' or $a eq 'type') {
+            delete $$attrs{$a};
+        } else {
+            push @$attrList, $a;
+        }
+    }
+    return $changed;
+}
+
+#------------------------------------------------------------------------------
+# Read information in a XISF document
+# Inputs: 0) ExifTool ref, 1) dirInfo ref
+# Returns: 1 on success, 0 if this wasn't a valid XISF file
+sub ProcessXISF($$)
+{
+    my ($et, $dirInfo) = @_;
+    my $raf = $$dirInfo{RAF};
+    my $buff;
+
+    return 0 unless $raf->Read($buff, 16) == 16 and $buff =~ /^XISF0100/;
+    $et->SetFileType();
+    SetByteOrder('II');
+    my $tagTablePtr = GetTagTable('Image::ExifTool::XISF::Main');
+    my $hdrLen = Get32u(\$buff, 8);
+    $raf->Read($buff, $hdrLen) == $hdrLen or $et->Warn('Error reading XISF header'), return 1;
+    $et->FoundTag(XML => $buff);
+    my %dirInfo = (
+        DataPt => \$buff,
+        IgnoreProp => { xisf => 1, Metadata => 1, Property => 1 },
+        XMPParseOpts => { AttrProc => \&HandleXISFAttrs },
+    );
+    Image::ExifTool::XMP::ProcessXMP($et, \%dirInfo, $tagTablePtr);
+    my $geo = $$et{VALUE}{ImageGeometry};
+    if ($geo) {
+        my ($w, $h, $n) = split /:/, $geo;
+        $et->FoundTag(ImageWidth => $w);
+        $et->FoundTag(ImageHeight => $h);
+        $et->FoundTag(NumPlanes => $n);
+    }
+    return 1;
+}
+
+1;  # end
+
+__END__
+
+=head1 NAME
+
+Image::ExifTool::XISF - Read Extensible Image Serialization Format metadata
+
+=head1 SYNOPSIS
+
+This module is used by Image::ExifTool
+
+=head1 DESCRIPTION
+
+This module contains definitions required by Image::ExifTool to read meta
+information from XISF (Extensible Image Serialization Format) images.
+
+=head1 AUTHOR
+
+Copyright 2003-2023, Phil Harvey (philharvey66 at gmail.com)
+
+This library is free software; you can redistribute it and/or modify it
+under the same terms as Perl itself.
+
+=head1 REFERENCES
+
+=over 4
+
+=item L<https://pixinsight.com/doc/docs/XISF-1.0-spec/XISF-1.0-spec.html>
+
+=back
+
+=head1 SEE ALSO
+
+L<Image::ExifTool::TagNames/XISF Tags>,
+L<Image::ExifTool(3pm)|Image::ExifTool>
+
+=cut
+

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

@@ -1063,7 +1063,7 @@ my %prismPublicationDate = (
     NOTES => q{
         PRISM Rights Language 2.1 namespace tags.  These tags have been deprecated
         since the release of the PRISM Usage Rights 3.0. (see
-        L<http://www.prismstandard.org/>)
+        L<https://www.w3.org/submissions/2020/SUBM-prism-20200910/prism-image.html>)
     },
     geography       => { List => 'Bag' },
     industry        => { List => 'Bag' },

data/bin/lib/Image/ExifTool.pm

@@ -29,15 +29,15 @@ use vars qw($VERSION $RELEASE @ISA @EXPORT_OK %EXPORT_TAGS $AUTOLOAD @fileTypes
             %jpegMarker %specialTags %fileTypeLookup $testLen $exeDir
             %static_vars);
 
-$VERSION = '12.65';
+$VERSION = '12.68';
 $RELEASE = '';
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (
     # all public non-object-oriented functions:
     Public => [qw(
-        ImageInfo GetTagName GetShortcuts GetAllTags GetWritableTags
-        GetAllGroups GetDeleteGroups GetFileType CanWrite CanCreate
-        AddUserDefinedTags
+        ImageInfo AvailableOptions GetTagName GetShortcuts GetAllTags
+        GetWritableTags GetAllGroups GetDeleteGroups GetFileType CanWrite
+        CanCreate AddUserDefinedTags
     )],
     # exports not part of the public API, but used by ExifTool modules:
     DataAccess => [qw(
@@ -149,8 +149,8 @@ sub ReadValue($$$;$$$);
     FLAC Ogg Vorbis APE APE::NewHeader APE::OldHeader Audible MPC MPEG::Audio
     MPEG::Video MPEG::Xing M2TS QuickTime QuickTime::ImageFile QuickTime::Stream
     QuickTime::Tags360Fly Matroska Matroska::StdTag MOI MXF DV Flash Flash::FLV
-    Real::Media Real::Audio Real::Metafile Red RIFF AIFF ASF WTV DICOM FITS MIE
-    JSON HTML XMP::SVG Palm Palm::MOBI Palm::EXTH Torrent EXE EXE::PEVersion
+    Real::Media Real::Audio Real::Metafile Red RIFF AIFF ASF WTV DICOM FITS XISF
+    MIE JSON HTML XMP::SVG Palm Palm::MOBI Palm::EXTH Torrent EXE EXE::PEVersion
     EXE::PEString EXE::MachO EXE::PEF EXE::ELF EXE::AR EXE::CHM LNK Font VCard
     Text VCard::VCalendar VCard::VNote RSRC Rawzor ZIP ZIP::GZIP ZIP::RAR
     ZIP::RAR5 RTF OOXML iWork ISO FLIR::AFF FLIR::FPF MacOS MacOS::MDItem
@@ -193,10 +193,11 @@ $defaultLang = 'en';    # default language
 @fileTypes = qw(JPEG EXV CRW DR4 TIFF GIF MRW RAF X3F JP2 PNG MIE MIFF PS PDF
                 PSD XMP BMP WPG BPG PPM RIFF AIFF ASF MOV MPEG Real SWF PSP FLV
                 OGG FLAC APE MPC MKV MXF DV PMP IND PGF ICC ITC FLIR FLIF FPF
-                LFP HTML VRD RTF FITS XCF DSS QTIF FPX PICT ZIP GZIP PLIST RAR
-                7Z BZ2 CZI TAR EXE EXR HDR CHM LNK WMF AVC DEX DPX RAW Font RSRC
-                M2TS MacOS PHP PCX DCX DWF DWG DXF WTV Torrent VCard LRI R3D AA
-                PDB PFM2 MRC LIF JXL MOI ISO ALIAS JSON MP3 DICOM PCD ICO TXT);
+                LFP HTML VRD RTF FITS XISF XCF DSS QTIF FPX PICT ZIP GZIP PLIST
+                RAR 7Z BZ2 CZI TAR EXE EXR HDR CHM LNK WMF AVC DEX DPX RAW Font
+                RSRC M2TS MacOS PHP PCX DCX DWF DWG DXF WTV Torrent VCard LRI
+                R3D AA PDB PFM2 MRC LIF JXL MOI ISO ALIAS JSON MP3 DICOM PCD ICO
+                TXT);
 
 # file types that we can write (edit)
 my @writeTypes = qw(JPEG TIFF GIF CRW MRW ORF RAF RAW PNG MIE PSD XMP PPM EPS
@@ -545,6 +546,7 @@ my %createTypes = map { $_ => 1 } qw(XMP ICC MIE VRD DR4 EXIF EXV);
     X3F  => ['X3F',  'Sigma RAW format'],
     XCF  => ['XCF',  'GIMP native image format'],
     XHTML=> ['HTML', 'Extensible HyperText Markup Language'],
+    XISF => ['XISF', 'Extensible Image Serialization Format'],
     XLA  => ['FPX',  'Microsoft Excel Add-in'],
     XLAM => [['ZIP','FPX'], 'Office Open XML Spreadsheet Add-in Macro-enabled'],
     XLS  => ['FPX',  'Microsoft Excel Spreadsheet'],
@@ -798,6 +800,7 @@ my %fileDescription = (
     WTV  => 'video/x-ms-wtv',
     X3F  => 'image/x-sigma-x3f',
     XCF  => 'image/x-xcf',
+    XISF => 'image/x-xisf',
     XLA  => 'application/vnd.ms-excel',
     XLAM => 'application/vnd.ms-excel.addin.macroEnabled.12',
     XLS  => 'application/vnd.ms-excel',
@@ -994,6 +997,7 @@ $testLen = 1024;    # number of bytes to read when testing for magic number
     WTV  => '\xb7\xd8\x00\x20\x37\x49\xda\x11\xa6\x4e\x00\x07\xe9\x5e\xad\x8d',
     X3F  => 'FOVb',
     XCF  => 'gimp xcf ',
+    XISF => 'XISF0100',
     XMP  => '\0{0,3}(\xfe\xff|\xff\xfe|\xef\xbb\xbf)?\0{0,3}\s*<',
     ZIP  => 'PK\x03\x04',
 );
@@ -1133,6 +1137,7 @@ my @availableOptions = (
     [ 'UserParam',        { },    'user parameters for additional user-defined tag values' ],
     [ 'Validate',         undef,  'perform additional validation' ],
     [ 'Verbose',          0,      'print verbose messages (0-5, higher # = more verbose)' ],
+    [ 'WindowsWideFile',  undef,  'force the use of Windows wide-character file routines' ], # (see forum15208)
     [ 'WriteMode',        'wcg',  'enable all write modes by default' ],
     [ 'XAttrTags',        undef,  'extract MacOS extended attribute tags' ],
     [ 'XMPAutoConv',      1,      'automatic conversion of unknown XMP tag values' ],
@@ -1580,6 +1585,7 @@ my %systemTagsNotes = (
     ImageHeight => { Notes => 'the height of the image in number of pixels' },
     XResolution => { Notes => 'the horizontal pixel resolution' },
     YResolution => { Notes => 'the vertical pixel resolution' },
+    NumPlanes   => { Notes => 'number of color planes' },
     MaxVal      => { Notes => 'maximum pixel value in PPM or PGM image' },
     EXIF => {
         Notes => q{
@@ -1843,7 +1849,7 @@ my %systemTagsNotes = (
     Geotime => {
         Writable => 1,
         WriteOnly => 1,
-        AllowGroup => '(exif|gps|xmp|xmp-exif)',
+        AllowGroup => '(exif|gps|xmp|xmp-exif|quicktime|keys|itemlist|userdata)',
         Notes => q{
             this write-only tag is used to define a date/time for interpolating a
             position in the GPS track specified by the Geotag tag.  Writing this tag
@@ -4305,6 +4311,7 @@ sub EncodeFileName($$;$)
 {
     my ($self, $file, $force) = @_;
     my $enc = $$self{OPTIONS}{CharsetFileName};
+    $force = 1 if $$self{OPTIONS}{WindowsWideFile};
     if ($enc) {
         if ($file =~ /[\x80-\xff]/ or $force) {
             # encode for use in Windows Unicode functions if necessary
@@ -4740,13 +4747,16 @@ sub CopyAltInfo($$$)
 # Notes: index lists are returned in increasing order
 sub SetFoundTags($)
 {
+    local $_;
     my $self = shift;
     my $options = $$self{OPTIONS};
     my $reqTags = $$self{REQUESTED_TAGS} || [ ];
     my $duplicates = $$options{Duplicates};
     my $exclude = $$options{Exclude};
     my $fileOrder = $$self{FILE_ORDER};
-    my @groupOptions = sort grep /^Group/, keys %$options;
+    my @groupOptions;
+    # ignore empty group options
+    $$options{$_} and push @groupOptions, $_ foreach sort grep /^Group/, keys %$options;
     my $doDups = $duplicates || $exclude || @groupOptions;
     my ($tag, $rtnTags, @byValue, @wildTags);
 
@@ -4911,7 +4921,6 @@ sub SetFoundTags($)
                 $groupList = [ $$options{$groupOpt} ];
             }
             foreach (@$groupList) {
-                next unless defined $_;
                 # groups have priority in order they were specified
                 ++$wantOrder;
                 my ($groupName, $want);
@@ -7936,6 +7945,9 @@ sub DoProcessTIFF($$;$)
         }
         if ($$self{TIFF_TYPE} eq 'TIFF') {
             $self->FoundTag(PageCount => $$self{PageCount}) if $$self{MultiPage};
+        } elsif ($$self{TIFF_TYPE} eq 'NRW' and $$self{VALUE}{NEFLinearizationTable}) {
+            # fix NEF type if misidentified as NRW
+            $self->OverrideFileType($$self{TIFF_TYPE} = 'NEF');
         }
         if ($$self{ImageDataHash} and $$self{A100DataOffset} and $raf->Seek($$self{A100DataOffset},0)) {
             $self->ImageDataHash($raf, undef, 'A100');

data/bin/lib/Image/ExifTool.pod

@@ -102,11 +102,11 @@ supported by ExifTool (r = read, w = write, c = create):
   DCP   r/w   | ICO   r     | MPG   r     | PSB   r/w   | WV    r
   DCR   r     | ICS   r     | MPO   r/w   | PSD   r/w   | X3F   r/w
   DFONT r     | IDML  r     | MQV   r/w   | PSP   r     | XCF   r
-  DIVX  r     | IIQ   r/w   | MRC   r     | QTIF  r/w   | XLS   r
-  DJVU  r     | IND   r/w   | MRW   r/w   | R3D   r     | XLSX  r
-  DLL   r     | INSP  r/w   | MXF   r     | RA    r     | XMP   r/w/c
-  DNG   r/w   | INSV  r     | NEF   r/w   | RAF   r/w   | ZIP   r
-  DOC   r     | INX   r     | NKSC  r/w   | RAM   r     |
+  DIVX  r     | IIQ   r/w   | MRC   r     | QTIF  r/w   | XISF  r
+  DJVU  r     | IND   r/w   | MRW   r/w   | R3D   r     | XLS   r
+  DLL   r     | INSP  r/w   | MXF   r     | RA    r     | XLSX  r
+  DNG   r/w   | INSV  r     | NEF   r/w   | RAF   r/w   | XMP   r/w/c
+  DOC   r     | INX   r     | NKSC  r/w   | RAM   r     | ZIP   r
   DOCX  r     | ISO   r     | NRW   r/w   | RAR   r     |
 
   Meta Information
@@ -391,12 +391,14 @@ ExifTool may be returned:
 Get/set ExifTool options.  This function can be called to set the default
 options for an ExifTool object.  Options set this way are in effect for
 all function calls but may be overridden by options passed as arguments
-to some functions.  Option names are not case sensitive.
+to some functions.  Option names are not case sensitive, but option values
+are.
 
 The default option values may be changed by defining a
 %Image::ExifTool::UserDefined::Options hash.  See the ExifTool_config file
-in the full ExifTool distribution for examples.  A default of undef has the
-same behaviour as a value of 0 for numerical options.
+in the full ExifTool distribution for examples.  Unless otherwise noted, a
+default of undef has the same effect as a value of 0 for options with
+numerical values.
 
     # exclude the 'OwnerName' tag from returned information
     $exifTool->Options(Exclude => 'OwnerName');
@@ -1081,6 +1083,14 @@ details about the tags.  Level 3 adds a hex dump of the tag data, but with
 limits on the number of bytes dumped.  Levels 4 and 5 remove the dump limit
 on tag values and JPEG segment data respectively.
 
+=item WindowsWideFile
+
+Force the use of wide-character Windows I/O functions when the 
+L</CharsetFileName> option is used.  This may be necessary when files are on
+a network drive and the current directory name contains Unicode characters.
+By default, the wide-character functions are used only if the specified file
+path contains Unicode characters.
+
 =item WriteMode
 
 Set tag write/create mode.  Value is a string of one or more characters from
@@ -1155,7 +1165,7 @@ ExtractEmbedded, FastScan, FixBase, HtmlDump, HtmlDumpBase,
 IgnoreMinorErrors, IgnoreTags, Lang, LargeFileSupport, MakerNotes,
 MDItemTags, NoPDFList, Password, QuickTimeUTC (enforced 1904 time zero),
 RequestAll, RequestTags, SaveFormat, SavePath, ScanForXMP, Struct, TextOut,
-Unknown, Verbose, XAttrTags and XMPAutoConv.
+Unknown, Verbose, WindowsWideFile, XAttrTags and XMPAutoConv.
 
 =item Return Value:
 
@@ -1294,7 +1304,7 @@ The following ExifTool options are effective in the call to L</WriteInfo>:
 
 ByteOrder, Charset, CharsetEXIF, CharsetFileName, CharsetIPTC, Compact,
 Compress, FixBase, IgnoreMinorErrors, NoMultiExif, NoPDFList, Password,
-QuickTimeHandler, QuickTimePad, Verbose and WriteMode.
+QuickTimeHandler, QuickTimePad, Verbose, WindowsWideFile and WriteMode.
 
 =head2 GetTagList