exiftool_vendored 12.25.0 → 12.32.0

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

@@ -50,7 +50,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 require Exporter;
 
-$VERSION = '3.41';
+$VERSION = '3.44';
 @ISA = qw(Exporter);
 @EXPORT_OK = qw(EscapeXML UnescapeXML);
 
@@ -155,7 +155,7 @@ my %xmpNS = (
     DICOM     => 'http://ns.adobe.com/DICOM/',
    'drone-dji'=> 'http://www.dji.com/drone-dji/1.0/',
     svg       => 'http://www.w3.org/2000/svg',
-    et        => 'http://ns.exiftool.ca/1.0/',
+    et        => 'http://ns.exiftool.org/1.0/',
 #
 # namespaces defined in XMP2.pl:
 #
@@ -195,7 +195,7 @@ my %xmpNS = (
 );
 
 # build reverse namespace lookup
-my %uri2ns = ( 'http://ns.exiftool.org/1.0/' => 'et' ); # (allow exiftool.org as well as exiftool.ca)
+my %uri2ns = ( 'http://ns.exiftool.ca/1.0/' => 'et' ); # (allow exiftool.ca as well as exiftool.org)
 {
     my $ns;
     foreach $ns (keys %nsURI) {
@@ -2017,6 +2017,11 @@ my %sPantryItem = (
         Groups => { 2 => 'Location' },
         Writable => 'integer',
         PrintConv => {
+            OTHER => sub {
+                my ($val, $inv) = @_;
+                return undef unless $inv and $val =~ /^([-+0-9])/;
+                return($1 eq '-' ? 1 : 0);
+            },
             0 => 'Above Sea Level',
             1 => 'Below Sea Level',
         },
@@ -3258,8 +3263,14 @@ NoLoop:
             }
         }
         # generate a default tagInfo hash if necessary
-        $tagInfo or $tagInfo = { Name => $name, IsDefault => 1, Priority => 0 };
-
+        unless ($tagInfo) {
+            # shorten tag name if necessary
+            if ($$et{ShortenXmpTags}) {
+                my $shorten = $$et{ShortenXmpTags};
+                $name = &$shorten($name);
+            }
+            $tagInfo = { Name => $name, IsDefault => 1, Priority => 0 };
+        }
         # add tag Namespace entry for tags in variable-namespace tables
         $$tagInfo{Namespace} = $xns if $xns;
         if ($$et{curURI}{$ns} and $$et{curURI}{$ns} =~ m{^http://ns.exiftool.(?:ca|org)/(.*?)/(.*?)/}) {
@@ -3778,6 +3789,7 @@ sub ParseXMPElement($$$;$$$$)
                 # (unless we already extracted shorthand values from this element)
                 if (length $val or not $shorthand) {
                     my $lastProp = $$propList[-1];
+                    $lastProp = '' unless defined $lastProp;
                     if (defined $nodeID) {
                         SaveBlankInfo($blankInfo, $propList, $val);
                     } elsif ($lastProp eq 'rdf:type' and $wasEmpty) {

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

@@ -539,7 +539,8 @@ my %sImageRegion = ( # new in 1.5
     NOTES => q{
         This table contains tags defined by the IPTC Extension schema version 1.5. 
         The actual namespace prefix is "Iptc4xmpExt", but ExifTool shortens this for
-        the family 1 group name. (see L<http://www.iptc.org/IPTC4XMP/>)
+        the family 1 group name. (see
+        L<http://www.iptc.org/standards/photo-metadata/iptc-standard/>)
     },
     AboutCvTerm => {
         Struct => \%sCVTermDetails,

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

@@ -32,7 +32,9 @@ sub SerializeStruct($;$)
     my ($key, $val, @vals, $rtnVal);
 
     if (ref $obj eq 'HASH') {
-        foreach $key (sort keys %$obj) {
+        # support hashes with ordered keys
+        my @keys = $$obj{_ordered_keys_} ? @{$$obj{_ordered_keys_}} : sort keys %$obj;
+        foreach $key (@keys) {
             push @vals, $key . '=' . SerializeStruct($$obj{$key}, '}');
         }
         $rtnVal = '{' . join(',', @vals) . '}';

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

@@ -14,7 +14,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.00';
+$VERSION = '1.01';
 
 %Image::ExifTool::ZISRAW::Main = (
     PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
@@ -41,6 +41,123 @@ $VERSION = '1.00';
     },
 );
 
+#------------------------------------------------------------------------------
+# Shorten obscenely long CZI tag names
+# Inputs: Tag name
+# Returns: Shortened tag name
+sub ShortenTagNames($)
+{
+    local $_;
+    $_ = shift;
+    s/^HardwareSetting//;
+    s/^DevicesDevice/Device/;
+    s/LightPathNode//g;
+    s/Successors//g;
+    s/ExperimentExperiment/Experiment/g;
+    s/ObjectivesObjective/Objective/;
+    s/ChannelsChannel/Channel/;
+    s/TubeLensesTubeLens/TubeLens/;
+    s/^ExperimentHardwareSettingsPoolHardwareSetting/HardwareSetting/;
+    s/SharpnessMeasureSetSharpnessMeasure/Sharpness/;
+    s/FocusSetupAutofocusSetup/Autofocus/;
+    s/TracksTrack/Track/;
+    s/ChannelRefsChannelRef/ChannelRef/;
+    s/ChangerChanger/Changer/;
+    s/ElementsChangerElement/Changer/;
+    s/ChangerElements/Changer/;
+    s/ContrastChangerContrast/Contrast/;
+    s/KeyFunctionsKeyFunction/KeyFunction/;
+    s/ManagerContrastManager(Contrast)?/ManagerContrast/;
+    s/ObjectiveChangerObjective/ObjectiveChanger/;
+    s/ManagerLightManager/ManagerLight/;
+    s/WavelengthAreasWavelengthArea/WavelengthArea/;
+    s/ReflectorChangerReflector/ReflectorChanger/;
+    s/^StageStageAxesStageAxis/StageAxis/;
+    s/ShutterChangerShutter/ShutterChanger/;
+    s/OnOffChangerOnOff/OnOffChanger/;
+    s/UnsharpMaskStateUnsharpMask/UnsharpMask/;
+    s/Acquisition/Acq/;
+    s/Continuous/Cont/;
+    s/Resolution/Res/;
+    s/Experiment/Expt/g;
+    s/Threshold/Thresh/;
+    s/Reference/Ref/;
+    s/Magnification/Mag/;
+    s/Original/Orig/;
+    s/FocusSetupFocusStrategySetup/Focus/;
+    s/ParametersParameter/Parameter/;
+    s/IntervalInfo/Interval/;
+    s/ExptBlocksAcqBlock/AcqBlock/;
+    s/MicroscopesMicroscope/Microscope/;
+    s/TimeSeriesInterval/TimeSeries/;
+    s/Interval(.*Interval)/$1/;
+    s/SingleTileRegionsSingleTileRegion/SingleTileRegion/;
+    s/AcquisitionMode//;
+    s/DetectorsDetector/Detector/;
+    s/Setup//;
+    s/Setting//;
+    s/TrackTrack/Track/;
+    s/AnalogOutMaximumsAnalogOutMaximum/AnalogOutMaximum/;
+    s/AnalogOutMinimumsAnalogOutMinimum/AnalogOutMinimum/;
+    s/DigitalOutLabelsDigitalOutLabelLabel/DigitalOutLabelLabel/;
+    s/(VivaTomeOpticalSectionInformation)+VivaTomeOpticalSectionInformation/VivaTomeOpticalSectionInformation/;
+    s/FocusDefiniteFocus/FocusDefinite/;
+    s/ChangerChanger/Changer/;
+    s/Calibration/Cal/;
+    s/LightSwitchChangerRLTLSwitch/LightSwitchChangerRLTL/;
+    s/Parameters//;
+    s/Fluorescence/Fluor/;
+    s/CameraGeometryCameraGeometry/CameraGeometry/;
+    s/CameraCamera/Camera/;
+    s/DetectorsCamera/Camera/;
+    s/FilterChangerLeftChangerEmissionFilter/LeftChangerEmissionFilter/;
+    s/SwitchingStatesSwitchingState/SwitchingState/;
+    s/Information/Info/;
+    s/SubDimensions?//g;
+    s/Setups?//;
+    s/Parameters?//;
+    s/Calculate/Calc/;
+    s/Visibility/Vis/;
+    s/Orientation/Orient/;
+    s/ListItems/Items/;
+    s/Increment/Incr/;
+    s/Parameter/Param/;
+    s/(ParfocalParcentralValues)+ParfocalParcentralValue/Parcentral/;
+    s/ParcentralParcentral/Parcentral/;
+    s/CorrFocusCorrection/FocusCorr/;
+    s/(ApoTomeDepthInfo)+Element/ApoTomeDepth/;
+    s/(ApoTomeClickStopInfo)+Element/ApoTomeClickStop/;
+    s/DepthDepth/Depth/;
+    s/(Devices?)+Device/Device/;
+    s/(BeamPathNode)+/BeamPathNode/;
+    s/BeamPathsBeamPath/BeamPath/g;
+    s/BeamPathBeamPath/BeamPath/g;
+    s/Configuration/Config/;
+    s/StageAxesStageAxis/StageAxis/;
+    s/RangesRange/Range/;
+    s/DataGridDatasGridData(Grid)?/DataGrid/;
+    s/DataMicroscopeDatasMicroscopeData(Microscope)?/DataMicroscope/;
+    s/DataWegaDatasWegaData/DataWega/;
+    s/ClickStopPositionsClickStopPosition/ClickStopPosition/;
+    s/LightSourcess?LightSource(Settings)?(LightSource)?/LightSource/;
+    s/FilterSetsFilterSet/FilterSet/;
+    s/EmissionFiltersEmissionFilter/EmissionFilter/;
+    s/ExcitationFiltersExcitationFilter/ExcitationFilter/;
+    s/FiltersFilter/Filter/;
+    s/DichroicsDichroic/Dichronic/;
+    s/WavelengthsWavelength/Wavelength/;
+    s/MultiTrackSetup/MultiTrack/;
+    s/TrackTrack/Track/;
+    s/DataGrabberSetup/DataGrabber/;
+    s/CameraFrameSetup/CameraFrame/;
+    s/TimeSeries(TimeSeries|Setups)/TimeSeries/;
+    s/FocusFocus/Focus/;
+    s/FocusAutofocus/Autofocus/;
+    s/Focus(Hardware|Software)(Autofocus)+/Autofocus$1/;
+    s/AutofocusAutofocus/Autofocus/;
+    return $_;
+}
+
 #------------------------------------------------------------------------------
 # Extract metadata from a ZISRAW (CZI) image
 # Inputs: 0) ExifTool object reference, 1) dirInfo reference
@@ -76,7 +193,9 @@ sub ProcessCZI($$)
     $tagTablePtr = GetTagTable('Image::ExifTool::XMP::XML');
     $dirInfo{DirLen} = length $buff;
     # shorten tag names somewhat by removing 'ImageDocumentMetadata' prefix from all
-    $$et{XmpIgnoreProps} = [ 'ImageDocument', 'Metadata' ];
+    $$et{XmpIgnoreProps} = [ 'ImageDocument', 'Metadata', 'Information' ];
+    $$et{ShortenXmpTags} = \&ShortenTagNames;
+
     $et->ProcessDirectory(\%dirInfo, $tagTablePtr);
 
     return 1;

data/bin/lib/Image/ExifTool.pm

@@ -26,9 +26,10 @@ use vars qw($VERSION $RELEASE @ISA @EXPORT_OK %EXPORT_TAGS $AUTOLOAD @fileTypes
             $psAPP13hdr $psAPP13old @loadAllTables %UserDefined $evalWarning
             %noWriteFile %magicNumber @langs $defaultLang %langName %charsetName
             %mimeType $swapBytes $swapWords $currentByteOrder %unpackStd
-            %jpegMarker %specialTags %fileTypeLookup $testLen $exePath);
+            %jpegMarker %specialTags %fileTypeLookup $testLen $exePath
+            %static_vars);
 
-$VERSION = '12.25';
+$VERSION = '12.32';
 $RELEASE = '';
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (
@@ -138,18 +139,18 @@ sub ReadValue($$$;$$$);
 @loadAllTables = qw(
     PhotoMechanic Exif GeoTiff CanonRaw KyoceraRaw Lytro MinoltaRaw PanasonicRaw
     SigmaRaw JPEG GIMP Jpeg2000 GIF BMP BMP::OS2 BMP::Extra BPG BPG::Extensions
-    PICT PNG MNG FLIF DjVu DPX OpenEXR ZISRAW MRC MRC::FEI12 MIFF PCX PGF PSP
-    PhotoCD Radiance PDF PostScript Photoshop::Header Photoshop::Layers
-    Photoshop::ImageData FujiFilm::RAF FujiFilm::IFD Samsung::Trailer Sony::SRF2
-    Sony::SR2SubIFD Sony::PMP ITC ID3 ID3::Lyrics3 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 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 EXE::PEString EXE::MachO EXE::PEF
-    EXE::ELF EXE::AR EXE::CHM LNK Font VCard Text VCard::VCalendar RSRC Rawzor
-    ZIP ZIP::GZIP ZIP::RAR RTF OOXML iWork ISO FLIR::AFF FLIR::FPF MacOS
-    MacOS::MDItem FlashPix::DocTable
+    PICT PNG MNG FLIF DjVu DPX OpenEXR ZISRAW MRC LIF MRC::FEI12 MIFF PCX PGF
+    PSP PhotoCD Radiance Other::PFM PDF PostScript Photoshop::Header
+    Photoshop::Layers Photoshop::ImageData FujiFilm::RAF FujiFilm::IFD
+    Samsung::Trailer Sony::SRF2 Sony::SR2SubIFD Sony::PMP ITC ID3 ID3::Lyrics3
+    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 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 EXE::PEString
+    EXE::MachO EXE::PEF EXE::ELF EXE::AR EXE::CHM LNK Font VCard Text
+    VCard::VCalendar RSRC Rawzor ZIP ZIP::GZIP ZIP::RAR RTF OOXML iWork ISO
+    FLIR::AFF FLIR::FPF MacOS MacOS::MDItem FlashPix::DocTable
 );
 
 # alphabetical list of current Lang modules
@@ -190,7 +191,7 @@ $defaultLang = 'en';    # default language
                 HTML VRD RTF FITS XCF DSS QTIF FPX PICT ZIP GZIP PLIST RAR 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
-                MRC JXL MOI ISO ALIAS JSON MP3 DICOM PCD TXT);
+                PFM2 MRC LIF JXL MOI ISO ALIAS JSON MP3 DICOM PCD 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
@@ -354,6 +355,7 @@ my %createTypes = map { $_ => 1 } qw(XMP ICC MIE VRD DR4 EXIF EXV);
     JPF  =>  'JP2',
     JPG =>   'JPEG',
     JPM  => ['JP2',  'JPEG 2000 compound image'],
+    JPS  => ['JPEG', 'JPEG Stereo image'],
     JPX  => ['JP2',  'JPEG 2000 with extensions'],
     JSON => ['JSON', 'JavaScript Object Notation'],
     JXL  => ['JXL',  'JPEG XL'],
@@ -365,6 +367,7 @@ my %createTypes = map { $_ => 1 } qw(XMP ICC MIE VRD DR4 EXIF EXV);
     LA   => ['RIFF', 'Lossless Audio'],
     LFP  => ['LFP',  'Lytro Light Field Picture'],
     LFR  =>  'LFP', # (Light Field RAW)
+    LIF  => ['LIF',  'Leica Image File'],
     LNK  => ['LNK',  'Windows shortcut'],
     LRI  => ['LRI',  'Light RAW'],
     LRV  => ['MOV',  'Low-Resolution Video'],
@@ -434,7 +437,7 @@ my %createTypes = map { $_ => 1 } qw(XMP ICC MIE VRD DR4 EXIF EXV);
     PEF  => ['TIFF', 'Pentax (RAW) Electronic Format'],
     PFA  => ['Font', 'PostScript Font ASCII'],
     PFB  => ['Font', 'PostScript Font Binary'],
-    PFM  => ['Font', 'Printer Font Metrics'],
+    PFM  => [['Font','PFM2'], 'Printer Font Metrics'], # (description is overridden for Portable FloatMap images)
     PGF  => ['PGF',  'Progressive Graphics File'],
     PGM  => ['PPM',  'Portable Gray Map'],
     PHP  => ['PHP',  'PHP Hypertext Preprocessor'],
@@ -605,7 +608,7 @@ my %fileDescription = (
     DJVU => 'image/vnd.djvu',
     DNG  => 'image/x-adobe-dng',
     DOC  => 'application/msword',
-    DOCM => 'application/vnd.ms-word.document.macroEnabled',
+    DOCM => 'application/vnd.ms-word.document.macroEnabled.12',
     DOCX => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
     DOT  => 'application/msword',
     DOTM => 'application/vnd.ms-word.template.macroEnabledTemplate',
@@ -654,6 +657,7 @@ my %fileDescription = (
     JP2  => 'image/jp2',
     JPEG => 'image/jpeg',
     JPM  => 'image/jpm',
+    JPS  => 'image/x-jps',
     JPX  => 'image/jpx',
     JSON => 'application/json',
     JXL  => 'image/jxl', #PH (NC)
@@ -662,6 +666,7 @@ my %fileDescription = (
     KDC  => 'image/x-kodak-kdc',
     KEY  => 'application/x-iwork-keynote-sffkey',
     LFP  => 'image/x-lytro-lfp', #PH (NC)
+    LIF  => 'image/x-lif',
     LNK  => 'application/octet-stream',
     LRI  => 'image/x-light-lri',
     M2T  => 'video/mpeg',
@@ -717,16 +722,16 @@ my %fileDescription = (
     PMP  => 'image/x-sony-pmp', #PH (NC)
     PNG  => 'image/png',
     POT  => 'application/vnd.ms-powerpoint',
-    POTM => 'application/vnd.ms-powerpoint.template.macroEnabled',
+    POTM => 'application/vnd.ms-powerpoint.template.macroEnabled.12',
     POTX => 'application/vnd.openxmlformats-officedocument.presentationml.template',
-    PPAM => 'application/vnd.ms-powerpoint.addin.macroEnabled',
+    PPAM => 'application/vnd.ms-powerpoint.addin.macroEnabled.12',
     PPAX => 'application/vnd.openxmlformats-officedocument.presentationml.addin', # (NC, PH invented)
     PPM  => 'image/x-portable-pixmap',
     PPS  => 'application/vnd.ms-powerpoint',
-    PPSM => 'application/vnd.ms-powerpoint.slideshow.macroEnabled',
+    PPSM => 'application/vnd.ms-powerpoint.slideshow.macroEnabled.12',
     PPSX => 'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
     PPT  => 'application/vnd.ms-powerpoint',
-    PPTM => 'application/vnd.ms-powerpoint.presentation.macroEnabled',
+    PPTM => 'application/vnd.ms-powerpoint.presentation.macroEnabled.12',
     PPTX => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
     PS   => 'application/postscript',
     PSD  => 'application/vnd.adobe.photoshop',
@@ -773,13 +778,13 @@ my %fileDescription = (
     X3F  => 'image/x-sigma-x3f',
     XCF  => 'image/x-xcf',
     XLA  => 'application/vnd.ms-excel',
-    XLAM => 'application/vnd.ms-excel.addin.macroEnabled',
+    XLAM => 'application/vnd.ms-excel.addin.macroEnabled.12',
     XLS  => 'application/vnd.ms-excel',
-    XLSB => 'application/vnd.ms-excel.sheet.binary.macroEnabled',
-    XLSM => 'application/vnd.ms-excel.sheet.macroEnabled',
+    XLSB => 'application/vnd.ms-excel.sheet.binary.macroEnabled.12',
+    XLSM => 'application/vnd.ms-excel.sheet.macroEnabled.12',
     XLSX => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
     XLT  => 'application/vnd.ms-excel',
-    XLTM => 'application/vnd.ms-excel.template.macroEnabled',
+    XLTM => 'application/vnd.ms-excel.template.macroEnabled.12',
     XLTX => 'application/vnd.openxmlformats-officedocument.spreadsheetml.template',
     XML  => 'application/xml',
     XMP  => 'application/rdf+xml',
@@ -832,6 +837,7 @@ my %moduleName = (
     ORF  => 'Olympus',
     PDB  => 'Palm',
     PCD  => 'PhotoCD',
+    PFM2 => 'Other',
     PHP  => 0,
     PMP  => 'Sony',
     PS   => 'PostScript',
@@ -911,6 +917,7 @@ $testLen = 1024;    # number of bytes to read when testing for magic number
     JSON => '(\xef\xbb\xbf)?\s*(\[\s*)?\{\s*"[^"]*"\s*:',
     JXL  => '\xff\x0a|\0\0\0\x0cJXL \x0d\x0a......ftypjxl ',
     LFP  => '\x89LFP\x0d\x0a\x1a\x0a',
+    LIF  => '\x70\0{3}.{4}\x2a.{4}<\0',
     LNK  => '.{4}\x01\x14\x02\0{5}\xc0\0{6}\x46',
     LRI  => 'LELR \0',
     M2TS => '(....)?\x47',
@@ -927,10 +934,11 @@ $testLen = 1024;    # number of bytes to read when testing for magic number
     MXF  => '\x06\x0e\x2b\x34\x02\x05\x01\x01\x0d\x01\x02', # (not tested if extension recognized)
     OGG  => '(OggS|ID3)',
     ORF  => '(II|MM)',
-    PDB  => '.{60}(\.pdfADBE|TEXtREAd|BVokBDIC|DB99DBOS|PNRdPPrs|DataPPrs|vIMGView|PmDBPmDB|InfoINDB|ToGoToGo|SDocSilX|JbDbJBas|JfDbJFil|DATALSdb|Mdb1Mdb1|BOOKMOBI|DataPlkr|DataSprd|SM01SMem|TEXtTlDc|InfoTlIf|DataTlMl|DataTlPt|dataTDBP|TdatTide|ToRaTRPW|zTXTGPlm|BDOCWrdS)',
   # PCD  =>  signature is at byte 2048
     PCX  => '\x0a[\0-\x05]\x01[\x01\x02\x04\x08].{64}[\0-\x02]',
+    PDB  => '.{60}(\.pdfADBE|TEXtREAd|BVokBDIC|DB99DBOS|PNRdPPrs|DataPPrs|vIMGView|PmDBPmDB|InfoINDB|ToGoToGo|SDocSilX|JbDbJBas|JfDbJFil|DATALSdb|Mdb1Mdb1|BOOKMOBI|DataPlkr|DataSprd|SM01SMem|TEXtTlDc|InfoTlIf|DataTlMl|DataTlPt|dataTDBP|TdatTide|ToRaTRPW|zTXTGPlm|BDOCWrdS)',
     PDF  => '\s*%PDF-\d+\.\d+',
+    PFM  => 'P[Ff]\x0a\d+ \d+\x0a[-+0-9.]+\x0a',
     PGF  => 'PGF',
     PHP  => '<\?php\s',
     PICT => '(.{10}|.{522})(\x11\x01|\x00\x11)',
@@ -1932,6 +1940,8 @@ my %systemTagsNotes = (
             return \$img;
         },
     },
+    # Apple may add "AMPF" to the end of the JFIF record,
+    # possibly indicating the existence of MPF images (ref forum12677)
 );
 
 # Composite tags (accumulation of all Composite tag tables)
@@ -2084,12 +2094,15 @@ sub Options($$;@)
                 $$options{$param} = $newVal;
                 delete $$self{CUR_LANG};
             # make sure the language is available
-            } elsif (eval "require Image::ExifTool::Lang::$newVal") {
-                my $xlat = "Image::ExifTool::Lang::${newVal}::Translate";
-                no strict 'refs';
-                if (%$xlat) {
-                    $$self{CUR_LANG} = \%$xlat;
-                    $$options{$param} = $newVal;
+            } else {
+                my %langs = map { $_ => 1 } @langs;
+                if ($langs{$newVal} and eval "require Image::ExifTool::Lang::$newVal") {
+                    my $xlat = "Image::ExifTool::Lang::${newVal}::Translate";
+                    no strict 'refs';
+                    if (%$xlat) {
+                        $$self{CUR_LANG} = \%$xlat;
+                        $$options{$param} = $newVal;
+                    }
                 }
             } # else don't change Lang
         } elsif ($param eq 'Exclude' and defined $newVal) {
@@ -3304,8 +3317,9 @@ sub GetTagID($$)
     my ($self, $tag) = @_;
     my $tagInfo = $$self{TAG_INFO}{$tag};
     return '' unless $tagInfo and defined $$tagInfo{TagID};
-    return ($$tagInfo{TagID}, $$tagInfo{LangCode}) if wantarray;
-    return $$tagInfo{TagID};
+    my $id = $$tagInfo{KeysID} || $$tagInfo{TagID};
+    return ($id, $$tagInfo{LangCode}) if wantarray;
+    return $id;
 }
 
 #------------------------------------------------------------------------------
@@ -3421,7 +3435,7 @@ sub GetGroup($$;$)
         }
         # generate tag ID group names unless obviously not needed
         unless ($noID) {
-            my $id = $$tagInfo{TagID};
+            my $id = $$tagInfo{KeysID} || $$tagInfo{TagID};
             if (not defined $id) {
                 $id = '';   # (just to be safe)
             } elsif ($id =~ /^\d+$/) {
@@ -3776,7 +3790,15 @@ sub GetFileType(;$$)
     # return description if specified
     # (allow input $file to be a FileType for this purpose)
     if ($desc) {
-        $desc = $fileType ? $$fileType[1] : $fileDescription{$file};
+        if ($fileType) {
+            if ($static_vars{OverrideFileDescription} and $static_vars{OverrideFileDescription}{$fileExt}) {
+                $desc = $static_vars{OverrideFileDescription}{$fileExt};
+            } else {
+                $desc = $$fileType[1];
+            }
+        } else {
+            $desc = $fileDescription{$file};
+        }
         $desc .= ", $subType" if $subType;
         return $desc;
     } elsif ($fileType and (not defined $desc or $desc ne '0')) {
@@ -3841,6 +3863,7 @@ sub Init($)
     foreach (keys %$self) {
         /[a-z]/ and delete $$self{$_};
     }
+    undef %static_vars;             # clear all static variables
     delete $$self{FOUND_TAGS};      # list of found tags
     delete $$self{EXIF_DATA};       # the EXIF data block
     delete $$self{EXIF_POS};        # EXIF position in file
@@ -4098,7 +4121,9 @@ sub Exists($$)
         return 0 unless $wh;
         eval { Win32API::File::CloseHandle($wh) };
     } else {
-        return -e $file;
+        # (named pipes already exist, but we pretend that they don't
+        #  so we will be able to write them, so test with for pipe -p)
+        return(-e $file and not -p $file);
     }
     return 1;
 }
@@ -6182,6 +6207,7 @@ sub ProcessJPEG($$)
         my $marker = $nextMarker;
         my $segDataPt = $nextSegDataPt;
         my $segPos = $nextSegPos;
+        my $skipped;
         undef $nextMarker;
         undef $nextSegDataPt;
 #
@@ -6191,11 +6217,13 @@ sub ProcessJPEG($$)
             # read up to next marker (JPEG markers begin with 0xff)
             my $buff;
             $raf->ReadLine($buff) or last;
+            $skipped = length($buff) - 1;
             # JPEG markers can be padded with unlimited 0xff's
             for (;;) {
                 $raf->Read($ch, 1) or last Marker;
                 $nextMarker = ord($ch);
                 last unless $nextMarker == 0xff;
+                ++$skipped;
             }
             # read segment data if it exists
             if (not defined $markerLenBytes{$nextMarker}) {
@@ -6222,6 +6250,14 @@ sub ProcessJPEG($$)
         # set some useful variables for the current segment
         my $markerName = JpegMarkerName($marker);
         $$path[$pn] = $markerName;
+        # issue warning if we skipped some garbage
+        if ($skipped and not $foundSOS) {
+            $self->Warn("Skipped unknown $skipped bytes after JPEG $markerName segment", 1);
+            if ($htmlDump) {
+                $self->HDump($nextSegPos-4-$skipped, $skipped, "[unknown $skipped bytes]", undef, 0x08);
+                $dumpEnd = $nextSegPos - 4;
+            }
+        }
 #
 # parse the current segment
 #
@@ -6761,6 +6797,12 @@ sub ProcessJPEG($$)
                 # extract the Stim information (it is in standard TIFF format)
                 my $tagTablePtr = GetTagTable('Image::ExifTool::Stim::Main');
                 $self->ProcessTIFF(\%dirInfo, $tagTablePtr);
+            } elsif ($$segDataPt =~ /^_JPSJPS_/) {
+                $dumpType = 'JPS';
+                $self->OverrideFileType('JPS') if $$self{FILE_TYPE} eq 'JPEG';
+                SetByteOrder('MM');
+                my $tagTablePtr = GetTagTable('Image::ExifTool::JPEG::JPS');
+                $self->ProcessDirectory(\%dirInfo, $tagTablePtr);
             } elsif ($$self{Make} eq 'DJI') {
                 $dumpType = 'DJI ThermalData';
                 # add this data to the combined data if it exists