exiftool_vendored 9.46.0 → 9.49.0

data/bin/{Image-ExifTool-9.46 → Image-ExifTool-9.49}/html/metafiles.html

@@ -43,16 +43,16 @@ exiftool, and the method you choose depends on your circumstances and
 preferences. Below are a number of example commands which write an output XMP
 file from information in a source file of any type.</p>
 
-<p class=a>1. Copy same-named tags from all information types to preferred locations in XMP:</p>
+<p class=a><a name="EX1">1.</a> Copy same-named tags from all information types to preferred locations in XMP:</p>
 <p class=b>(<code><i>SRC</i>.<i>EXT</i></code> is the source file name and
 extension, and <code><i>DST</i></code> is the destination file name)</p>
 <pre>exiftool -tagsfromfile <i>SRC</i>.<i>EXT</i> <i>DST</i>.xmp</pre>
 
-<p class=a>2. Rewrite source file to destination XMP file:</p>
+<p class=a><a name="EX2">2.</a> Rewrite source file to destination XMP file:</p>
 <p class=b>(same effect as above, but the command will exit with an error if the output XMP file already exists)</p>
 <pre>exiftool <i>SRC</i>.<i>EXT</i> -o <i>DST</i>.xmp</pre>
 
-<p class=a>3. Copy XMP, preserving original locations:</p>
+<p class=a><a name="EX3">3.</a> Copy XMP, preserving original locations:</p>
 <p class=b>(ie. copies XMP tags only to the same namespaces in the destination file)</p>
 <pre>exiftool -tagsfromfile <i>SRC</i>.<i>EXT</i> -all:all <i>DST</i>.xmp</pre>
 <p class=c>Advanced: Notice that <code>-all:all</code> is used above instead of
@@ -60,32 +60,32 @@ extension, and <code><i>DST</i></code> is the destination file name)</p>
 is an XMP file).  This is because <code>-all:all</code> preserves the family 1 group
 (ie. XMP namespace) while <code>-xmp:all</code> would copy tags to the preferred XMP
 namespace, which may be different for XMP tags that exist in multiple namespaces.
-To get the best of both worlds, <code>"-xmp:all>all:all"</code> may be used to
+To get the best of both worlds, <code>"-all:all&lt;xmp:all"</code> may be used to
 avoid the inefficiencies of assigning tags which aren't copied, while still
 preserving the family 1 group.</p>
 
-<p class=a>4. Rewrite source to XMP file, preserving locations:</p>
+<p class=a><a name="EX4">4.</a> Rewrite source to XMP file, preserving locations:</p>
 <p class=b>(same effect as above, but the command will fail if the XMP file already exists)</p>
 <pre>exiftool <i>SRC</i>.<i>EXT</i> -o <i>DST</i>.xmp -all:all</pre>
 
-<p class=a>5. Generate XMP from EXIF and IPTC using standard tag name mappings:</p>
+<p class=a><a name="EX5">5.</a> Generate XMP from EXIF and IPTC using standard tag name mappings:</p>
 <p class=b> (the <code>.args</code> files are available in the full ExifTool distribution)</p>
 <pre>exiftool -tagsfromfile <i>SRC</i>.<i>EXT</i> -@ exif2xmp.args -@ iptc2xmp.args <i>DST</i>.xmp</pre>
 
-<p class=a>6. Copy XMP as a block to an XMP file:</p>
+<p class=a><a name="EX6">6.</a> Copy XMP as a block to an XMP file:</p>
 <p class=b>(writing as a block is the only way to transfer unknown or non-writable XMP tags)</p>
 <pre>exiftool -tagsfromfile <i>SRC</i>.<i>EXT</i> -xmp <i>DST</i>.xmp</pre>
 <p class=c>Note that this will not deal with extended XMP segments in JPEG
 images if they exist.</p>
 
-<p>7. Extract XMP as a block and write to output XMP file: <span class=lt>(same effect as above)</span></p>
+<p><a name="EX7">7.</a> Extract XMP as a block and write to output XMP file: <span class=lt>(same effect as above)</span></p>
 <pre>exiftool -xmp -b <i>SRC</i>.<i>EXT</i> > <i>DST</i>.xmp</pre>
 <p class=c>As with the previous command, this command will not copy extended XMP
 segments in JPEG images, but in this case the <code>-a</code> option may be
 added to also extract extended XMP blocks.  However, the result would be a
 non-standard XMP file that ExifTool could read but other utilities may not.</p>
 
-<p class=a>8. Extract XMP as a block to an output text file with .xmp extension:</p>
+<p class=a><a name="EX8">8.</a> Extract XMP as a block to an output text file with .xmp extension:</p>
 <p class=b>(same effect as above, but the destination file name will be the same
 as the source file, and this command will fail if the XMP file exists while the
 previous command will overwrite an existing file)</p>
@@ -93,10 +93,10 @@ previous command will overwrite an existing file)</p>
 <p class=c>The advantage of this command is that it may be applied to multiple
 source files or entire directories.</p>
 
-<p>9. Restore all XMP tags from an XMP sidecar file to XMP in a JPG image:</p>
+<p><a name="EX9">9.</a> Restore all XMP tags from an XMP sidecar file to XMP in a JPG image:</p>
 <pre>exiftool -tagsfromfile <i>SRC</i>.xmp -all:all <i>DST</i>.jpg</pre>
 
-<p class=a>10. Restore XMP as a block from an XMP sidecar file to a JPG image:</p>
+<p class=a><a name="EX10">10.</a> Restore XMP as a block from an XMP sidecar file to a JPG image:</p>
 <p class=b>(same effect as above except that any non-writable XMP tags would be
 copied by this command, and the 2 kB of padding recommended by the XMP
 specification is not added when copying as a block)</p>
@@ -104,43 +104,70 @@ specification is not added when copying as a block)</p>
 
 <h4>Batch Processing</h4>
 
-<p>When batch-generating sidecar files from many images, the <code>-o</code>
-form of the command is easier to use:</p>
+<p>Multiple files may be processed in a single command by specifying multiple
+file and/or directory names on the command line.  The examples below demonstrate
+how to process all files with a specific extension in an entire directory tree.</p>
 
+<p class=a><a name="EX11">11.</a> Create XMP sidecar files for all files with extension EXT in a
+directory tree:</p>
+<p class=b>(when batch-generating sidecar files from many images, the <code>-o</code>
+form of the command is easier to use, but can not be used to modify
+existing XMP files)</p>
 <pre>exiftool -ext <i>EXT</i> -o %d%f.xmp -r <i>DIR</i></pre>
-
-<p>where <code><i>DIR</i></code> is the name of the directory containing the
-images.  Multiple <code>-ext</code> options may be used to process different
-file types in a single command.</p>
-
-<p>However, this technique can not be used to add information to XMP
-sidecar files that already exist.  For this, the <code>-tagsFromFile</code>
-form must be used:</p>
-
+<p class=c>where <code><i>DIR</i></code> is the name of the directory containing
+the images.  The <code>-r</code> option causes sub-directories to be recursively
+processed.  Multiple <code>-ext</code> options may be used to process different
+file types in a single command.  With this command, same-named tags from any type
+of metadata will be written to the preferred XMP namespace in the output XMP
+file.  To copy only XMP tags, <code>-xmp:all</code> may be added to the command.
+(See example 14 for more about this.)</p>
+
+<p class=a><a name="EX12">12.</a> Copy tags to sidecar files that already exist:</p>
+<p class=b>(same as above, but copies only to existing XMP files)</p>
 <pre>exiftool -ext xmp -tagsfromfile %d%f.<i>EXT</i> -r <i>DIR</i></pre>
-
-<p>But note that this command searches for the XMP files instead of the image
-files, so it will not generate new XMP sidecar files if some images don't
-have them.  For this, the advanced (ie. tricky and confusing to use)
-<code>-srcfile</code> option comes in handy:</p>
-
+<p class=c>This command will add tags from the source files to information that
+already exists in the XMP files, but note that this command searches for the XMP
+files instead of the image files, so it will not generate new XMP sidecar files
+if some images don't have them.  For this, the advanced (ie. tricky and
+confusing to use) <code>-srcfile</code> option comes in handy:</p>
+
+<p class=a><a name="EX13">13.</a> Copy tags to sidecar files, generating new files if necessary:</p>
+<p class=b>(same as above, but also creates new XMP files if they don't exist)</p>
 <pre>exiftool -ext <i>EXT</i> -tagsfromfile @ -srcfile %d%f.xmp -r <i>DIR</i></pre>
-
-<p>The <code>-srcfile</code> option also allows multiple files to be specified,
-in which case the first existing file is processed.  This feature allows a
-sidecar file to be used only if it already exists. For example, this command
-writes to a sidecar XMP file if it exists, or the original file otherwise:</p>
-
+<p class=c>Note that as with the previous two commands, this command will
+commute metadata from other groups to the preferred location in XMP.</p>
+
+<p class=a><a name="EX14">14.</a> Copy only XMP tags to the same namespace in sidecar files:</p>
+<p class=b>(same as above, but copies only XMP and preserves specific tag locations)</p>
+<pre>exiftool -ext <i>EXT</i> -tagsfromfile @ "-all:all&lt;xmp:all" -srcfile %d%f.xmp -r <i>DIR</i></pre>
+<p class=c>In this command, if "<code>-xmp:all</code>" was used instead of
+<code>"-all:all&lt;xmp:all"</code>, then all XMP tags would have been copied to
+their preferred namespaces in the sidecar file.  But by writing to the
+destination group of "<code>all</code>", the specific location (ie. XMP
+namespace) of each tag is preserved.</p>
+
+<p class=a><a name="EX15">15.</a> Copy XMP from sidecar files back to the same locations in the source files:</p>
+<p class=b>(the inverse of the previous command)</p>
+<pre>exiftool -ext <i>EXT</i> -tagsfromfile %d%f.xmp -all:all -r <i>DIR</i></pre>
+<p class=c>Here,
+<code>-all:all</code> copies all metadata (in this case only XMP, since the
+sidecar XMP file contains no other types) to the same specific locations in the
+target files (extension <code><i>EXT</i></code>).</p>
+
+<p class=a><a name="EX16">16.</a> Write a tag to XMP sidecar if it exists, or the original file otherwise:</p>
 <pre>exiftool -ext <i>EXT</i> -artist="Phil" -srcfile %d%f.xmp -srcfile @ <i>DIR</i></pre>
+<p class=c>When multiple <code>-srcfile</code> options are used, the first
+existing file is processed.  If none of the specified source files exists, then
+the first one in the list is created (however, this won't happen with this
+example since one of the specified source files is "<code>@</code>", which
+represents the original file name).</p>
 
-<p>Any of these commands may be used to process sidecar files stored in a
-directory other than that of the original images by specifying a directory name
-instead of "<code>%d</code>" in the filename format string.  For example,</p>
-
+<p class=a><a name="EX17">17.</a> Create XMP sidecar file in another directory:</p>
 <pre>exiftool -ext <i>EXT</i> -o <i>DSTDIR</i>/%f.xmp -r <i>SRCDIR</i></pre>
-
-<p>will output XMP files to <code><i>DSTDIR</i></code> with information
-from images in <code><i>SRCDIR</i></code>.</p>
+<p class=c>By specifying a directory name instead of <code>%d</code>, this
+command writes XMP files to <code><i>DSTDIR</i></code> instead of the original
+source directory. The same technique may be used in any of the above commands to
+write XMP to a sidecar file in a different directory.</p>
 
 <h4>Via the API</h4>
 
@@ -215,19 +242,20 @@ exiftool -o out.exif -exif <i>SRCFILE</i></pre>
 tag in each of the above commands (the "<code>-exif</code>" argument) that
 causes the EXIF information to be extracted as a block.  JPEG, PNG, JP2, MIE and
 MIFF files all support storage of EXIF data blocks in this format, although
-exiftool does not current write MIFF images.</p>
+exiftool does not currently write MIFF images.</p>
 
 <p>Tags may also be copied individually to and from an EXIF file, but remember
-that this will not copy "unsafe" tags unless they are specified explicitly. This
-technique must be used when creating an EXIF sidecar file if the source file
-does not contain EXIF:</p>
+that this will not copy "unsafe" tags unless they are specified explicitly.  The
+following command creates an EXIF file from the metadata in a source file:</p>
 
 <pre>exiftool -o out.exif -all -unsafe <i>SRCFILE</i>
 </pre>
 
-<p>or for all files in a directory:</p>
+<p>This technique works for any type of source file, provided the file contains
+at least one tag with the same name as an EXIF tag.  Below is an example of how
+to apply this to all files in a directory:</p>
 
-<pre>exiftool -o %f.exif -all -unsafe <i>DIR</i>
+<pre>exiftool -o %d%f.exif -all -unsafe <i>DIR</i>
 </pre>
 
 <hr>
@@ -268,7 +296,7 @@ which may be useful if disk space is at a premium.</p>
 
 <hr>
 <i>Created Nov 12, 2008</i><br>
-<i>Last revised Dec 23, 2013</i>
+<i>Last revised Jan 29, 2014</i>
 <p class='lf'><a href="index.html">&lt;-- Back to ExifTool home page</a></p>
 </body>
 </html>

data/bin/{Image-ExifTool-9.46 → Image-ExifTool-9.49}/lib/Image/ExifTool.pm

@@ -27,7 +27,7 @@ use vars qw($VERSION $RELEASE @ISA @EXPORT_OK %EXPORT_TAGS $AUTOLOAD @fileTypes
             %mimeType $swapBytes $swapWords $currentByteOrder %unpackStd
             %jpegMarker %specialTags);
 
-$VERSION = '9.46';
+$VERSION = '9.49';
 $RELEASE = '';
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (
@@ -1668,7 +1668,7 @@ sub ExtractInfo($;@)
                 # extract file name from pipe if necessary
                 $realname =~ /\|$/ and $realname =~ s/^.*?"(.*?)".*/$1/s;
                 my ($dir, $name);
-                if (eval 'require File::Basename') {
+                if (eval { require File::Basename }) {
                     $dir = File::Basename::dirname($realname);
                     $name = File::Basename::basename($realname);
                 } else {
@@ -2959,7 +2959,7 @@ sub ParseArguments($;@)
                 # convert image data from UTF-8 to character stream if necessary
                 # (patches RHEL 3 UTF8 LANG problem)
                 if (ref $arg eq 'SCALAR' and $] >= 5.006 and
-                    (eval 'require Encode; Encode::is_utf8($$arg)' or $@))
+                    (eval { require Encode; Encode::is_utf8($$arg) } or $@))
                 {
                     # repack by hand if Encode isn't available
                     my $buff = $@ ? pack('C*',unpack('U0C*',$$arg)) : Encode::encode('utf8',$$arg);
@@ -4205,7 +4205,7 @@ sub ConvertDateTime($$)
         # - date/time values separated by colon instead of space (Polariod, Sanyo, Sharp, Vivitar)
         # - single-digit seconds with leading space (HP scanners)
         my @a = reverse ($date =~ /\d+/g);  # be very flexible about date/time format
-        if (@a and $a[-1] >= 1000 and $a[-1] < 3000 and eval 'require POSIX') {
+        if (@a and $a[-1] >= 1000 and $a[-1] < 3000 and eval { require POSIX }) {
             shift @a while @a > 6;      # remove superfluous entries
             unshift @a, 1 while @a < 3; # add month and day if necessary
             unshift @a, 0 while @a < 6; # add h,m,s if necessary
@@ -4214,11 +4214,11 @@ sub ConvertDateTime($$)
             # parse %z and %s ourself (to handle time zones properly)
             if ($fmt =~ /%[sz]/) {
                 # use system time zone unless otherwise specified
-                $tz = TimeZoneString(\@a, TimeLocal(@a)) if not $tz and eval 'require Time::Local';
+                $tz = TimeZoneString(\@a, TimeLocal(@a)) if not $tz and eval { require Time::Local };
                 # remove colon, setting to UTC if time zone is not numeric
                 $tz = ($tz and $tz=~/^([-+]\d{2}):(\d{2})$/) ? "$1$2" : '+0000';
                 $fmt =~ s/(^|[^%])((%%)*)%z/$1$2$tz/g;      # convert '%z' format codes
-                if ($fmt =~ /%s/ and eval 'require Time::Local') {
+                if ($fmt =~ /%s/ and eval { require Time::Local }) {
                     # calculate seconds since the Epoch, UTC
                     my $s = Time::Local::timegm(@a) - 60 * ($tz - int($tz/100) * 40);
                     $fmt =~ s/(^|[^%])((%%)*)%s/$1$2$s/g;   # convert '%s' format codes
@@ -4343,7 +4343,7 @@ sub GetUnixTime($;$)
     my ($timeStr, $isLocal) = @_;
     return 0 if $timeStr eq '0000:00:00 00:00:00';
     my @tm = ($timeStr =~ /^(\d+):(\d+):(\d+)\s+(\d+):(\d+):(\d+)/);
-    return undef unless @tm == 6 and eval 'require Time::Local';
+    return undef unless @tm == 6 and eval { require Time::Local };
     my $tzsec = 0;
     # use specified timezone offset (if given) instead of local system time
     # if we are converting a local time value
@@ -4611,6 +4611,21 @@ sub JpegMarkerName($)
     return $markerName;
 }
 
+#------------------------------------------------------------------------------
+# Adjust directory start position
+# Inputs: 0) dirInfo ref, 1) start offset
+#         2) Base for offsets (relative to DataPos, defaults to absolute Base of 0)
+sub DirStart($$;$)
+{
+    my ($dirInfo, $start, $base) = @_;
+    $$dirInfo{DirStart} = $start;
+    $$dirInfo{DirLen} -= $start;
+    if (defined $base) {
+        $$dirInfo{Base} = $$dirInfo{DataPos} + $base;
+        $$dirInfo{DataPos} = -$base;    # (relative to Base!)
+    }
+}
+
 #------------------------------------------------------------------------------
 # Extract EXIF information from a jpg image
 # Inputs: 0) ExifTool object reference, 1) dirInfo ref with RAF set
@@ -4880,15 +4895,20 @@ sub ProcessJPEG($$)
                 HexDump($segDataPt, undef, %dumpParms, %extraParms);
             }
         }
+        # prepare dirInfo hash for processing this information
+        my %dirInfo = (
+            Parent   => $markerName,
+            DataPt   => $segDataPt,
+            DataPos  => $segPos,
+            DataLen  => $length,
+            DirStart => 0,
+            DirLen   => $length,
+            Base     => 0,
+        );
         if ($marker == 0xe0) {              # APP0 (JFIF, JFXX, CIFF, AVI1, Ocad)
             if ($$segDataPt =~ /^JFIF\0/) {
                 $dumpType = 'JFIF';
-                my %dirInfo = (
-                    DataPt => $segDataPt,
-                    DataPos  => $segPos,
-                    DirStart => 5,
-                    DirLen => $length - 5,
-                );
+                DirStart(\%dirInfo, 5); # start at byte 5
                 SetByteOrder('MM');
                 my $tagTablePtr = GetTagTable('Image::ExifTool::JFIF::Main');
                 $self->ProcessDirectory(\%dirInfo, $tagTablePtr);
@@ -4911,12 +4931,7 @@ sub ProcessJPEG($$)
                 $dumpType = $1;
                 SetByteOrder('MM');
                 my $tagTablePtr = GetTagTable("Image::ExifTool::JPEG::$dumpType");
-                my %dirInfo = (
-                    DataPt   => $segDataPt,
-                    DataPos  => $segPos,
-                    DirStart => 4,
-                    DirLen   => $length - 4,
-                );
+                DirStart(\%dirInfo, 4);
                 $self->ProcessDirectory(\%dirInfo, $tagTablePtr);
             }
         } elsif ($marker == 0xe1) {         # APP1 (EXIF, XMP, QVCI)
@@ -4933,13 +4948,7 @@ sub ProcessJPEG($$)
                 } elsif ($$segDataPt !~ /^Exif\0/) {
                     $self->Warn('Incorrect EXIF segment identifier',1);
                 }
-                my %dirInfo = (
-                    Parent => $markerName,
-                    DataPt => $segDataPt,
-                    DataPos => -$hdrLen, # (remember: relative to Base!)
-                    DirStart => $hdrLen,
-                    Base => $segPos + $hdrLen,
-                );
+                DirStart(\%dirInfo, $hdrLen, $hdrLen);
                 if ($htmlDump) {
                     $self->HDump($segPos-4, 4, 'APP1 header', "Data size: $length bytes");
                     $self->HDump($segPos, $hdrLen, 'Exif header', 'APP1 data type: Exif');
@@ -5006,15 +5015,6 @@ sub ProcessJPEG($$)
             } elsif ($$segDataPt =~ /^QVCI\0/) {
                 $dumpType = 'QVCI';
                 my $tagTablePtr = GetTagTable('Image::ExifTool::Casio::QVCI');
-                my %dirInfo = (
-                    Base     => 0,
-                    DataPt   => $segDataPt,
-                    DataPos  => $segPos,
-                    DataLen  => $length,
-                    DirStart => 0,
-                    DirLen   => $length,
-                    Parent   => $markerName,
-                );
                 $self->ProcessDirectory(\%dirInfo, $tagTablePtr);
             } elsif ($$segDataPt =~ /^FLIR\0/ and $length >= 8) {
                 $dumpType = 'FLIR';
@@ -5064,16 +5064,8 @@ sub ProcessJPEG($$)
                     # (note: this non-standard XMP is ignored when writing)
                     my $start = ($$segDataPt =~ /^$xmpAPP1hdr/) ? length($xmpAPP1hdr) : 0;
                     my $tagTablePtr = GetTagTable('Image::ExifTool::XMP::Main');
-                    my %dirInfo = (
-                        Base     => 0,
-                        DataPt   => $segDataPt,
-                        DataPos  => $segPos,
-                        DataLen  => $length,
-                        DirStart => $start,
-                        DirLen   => $length - $start,
-                        DirName  => $start ? 'XMP' : 'XML',
-                        Parent   => $markerName,
-                    );
+                    DirStart(\%dirInfo, $start);
+                    $dirInfo{DirName} = $start ? 'XMP' : 'XML',
                     $processed = $self->ProcessDirectory(\%dirInfo, $tagTablePtr);
                     if ($processed and not $start) {
                         $self->Warn('Non-standard header for APP1 XMP segment');
@@ -5130,27 +5122,13 @@ sub ProcessJPEG($$)
                 next if $fast and $fast > 1;    # skip processing for very fast
                 $dumpType = 'FPXR';
                 my $tagTablePtr = GetTagTable('Image::ExifTool::FlashPix::Main');
-                my %dirInfo = (
-                    DataPt   => $segDataPt,
-                    DataPos  => $segPos,
-                    DataLen  => $length,
-                    DirStart => 0,
-                    DirLen   => $length,
-                    Parent   => $markerName,
-                    # set flag if this is the last FPXR segment
-                    LastFPXR => not ($nextMarker==$marker and $$nextSegDataPt=~/^FPXR\0/),
-                );
+                # set flag if this is the last FPXR segment
+                $dirInfo{LastFPXR} = not ($nextMarker==$marker and $$nextSegDataPt=~/^FPXR\0/),
                 $self->ProcessDirectory(\%dirInfo, $tagTablePtr);
             } elsif ($$segDataPt =~ /^MPF\0/) {
                 undef $dumpType;    # (will be dumped here)
-                my %dirInfo = (
-                    Parent => $markerName,
-                    DataPt => $segDataPt,
-                    DataPos => -4, # (relative to Base)
-                    DirStart => 4,
-                    Base => $segPos + 4,
-                    Multi => 1, # the MP Attribute IFD will be MPF1
-                );
+                DirStart(\%dirInfo, 4, 4);
+                $dirInfo{Multi} = 1;    # the MP Attribute IFD will be MPF1
                 if ($htmlDump) {
                     $self->HDump($segPos-4, 4, 'APP2 header', "Data size: $length bytes");
                     $self->HDump($segPos, 4, 'MPF header', 'APP2 data type: MPF');
@@ -5174,13 +5152,7 @@ sub ProcessJPEG($$)
         } elsif ($marker == 0xe3) {         # APP3 (Kodak "Meta", Stim)
             if ($$segDataPt =~ /^(Meta|META|Exif)\0\0/) {
                 undef $dumpType;    # (will be dumped here)
-                my %dirInfo = (
-                    Parent => $markerName,
-                    DataPt => $segDataPt,
-                    DataPos => -6, # (relative to Base)
-                    DirStart => 6,
-                    Base => $segPos + 6,
-                );
+                DirStart(\%dirInfo, 6, 6);
                 if ($htmlDump) {
                     $self->HDump($segPos-4, 10, 'APP3 Meta header');
                     $dumpEnd = $segPos + $length;
@@ -5189,13 +5161,7 @@ sub ProcessJPEG($$)
                 $self->ProcessTIFF(\%dirInfo, $tagTablePtr);
             } elsif ($$segDataPt =~ /^Stim\0/) {
                 undef $dumpType;    # (will be dumped here)
-                my %dirInfo = (
-                    Parent => $markerName,
-                    DataPt => $segDataPt,
-                    DataPos => -6, # (relative to Base)
-                    DirStart => 6,
-                    Base => $segPos + 6,
-                );
+                DirStart(\%dirInfo, 6, 6);
                 if ($htmlDump) {
                     $self->HDump($segPos-4, 4, 'APP3 header', "Data size: $length bytes");
                     $self->HDump($segPos, 5, 'Stim header', 'APP3 data type: Stim');
@@ -5235,16 +5201,8 @@ sub ProcessJPEG($$)
                 next if $fast and $fast > 1;    # skip processing for very fast
                 $dumpType = 'FPXR';
                 my $tagTablePtr = GetTagTable('Image::ExifTool::FlashPix::Main');
-                my %dirInfo = (
-                    DataPt   => $segDataPt,
-                    DataPos  => $segPos,
-                    DataLen  => $length,
-                    DirStart => 0,
-                    DirLen   => $length,
-                    Parent   => $markerName,
-                    # set flag if this is the last FPXR segment
-                    LastFPXR => not ($nextMarker==$marker and $$nextSegDataPt=~/^FPXR\0/),
-                );
+                # set flag if this is the last FPXR segment
+                $dirInfo{LastFPXR} = not ($nextMarker==$marker and $$nextSegDataPt=~/^FPXR\0/),
                 $self->ProcessDirectory(\%dirInfo, $tagTablePtr);
             } elsif ($preview) {
                 # continued Samsung S1060 preview from APP3
@@ -5259,13 +5217,7 @@ sub ProcessJPEG($$)
         } elsif ($marker == 0xe5) {         # APP5 (Ricoh "RMETA")
             if ($$segDataPt =~ /^RMETA\0/) {
                 $dumpType = 'Ricoh RMETA';
-                my %dirInfo = (
-                    Parent => $markerName,
-                    DataPt => $segDataPt,
-                    DataPos => -6, # (relative to Base)
-                    DirStart => 6,
-                    Base => $segPos + 6,
-                );
+                DirStart(\%dirInfo, 6, 6);
                 my $tagTablePtr = GetTagTable('Image::ExifTool::Ricoh::RMETA');
                 $self->ProcessDirectory(\%dirInfo, $tagTablePtr);
             } elsif ($preview) {
@@ -5277,13 +5229,7 @@ sub ProcessJPEG($$)
         } elsif ($marker == 0xe6) {         # APP6 (Toshiba EPPIM, NITF, HP_TDHD)
             if ($$segDataPt =~ /^EPPIM\0/) {
                 undef $dumpType;    # (will be dumped here)
-                my %dirInfo = (
-                    Parent => $markerName,
-                    DataPt => $segDataPt,
-                    DataPos => -6, # (relative to Base)
-                    DirStart => 6,
-                    Base => $segPos + 6,
-                );
+                DirStart(\%dirInfo, 6, 6);
                 if ($htmlDump) {
                     $self->HDump($segPos-4, 10, 'APP6 EPPIM header');
                     $dumpEnd = $segPos + $length;
@@ -5294,23 +5240,14 @@ sub ProcessJPEG($$)
                 $dumpType = 'NITF';
                 SetByteOrder('MM');
                 my $tagTablePtr = GetTagTable('Image::ExifTool::JPEG::NITF');
-                my %dirInfo = (
-                    DataPt   => $segDataPt,
-                    DataPos  => $segPos,
-                    DirStart => 5,
-                    DirLen   => $length - 5,
-                );
+                DirStart(\%dirInfo, 5);
                 $self->ProcessDirectory(\%dirInfo, $tagTablePtr);
             } elsif ($$segDataPt =~ /^TDHD\x01\0\0\0/ and $length > 12) {
                 # HP Photosmart R837 APP6 "TDHD" segment
                 $dumpType = 'TDHD';
                 my $tagTablePtr = GetTagTable('Image::ExifTool::HP::TDHD');
-                my %dirInfo = (
-                    DataPt   => $segDataPt,
-                    DataPos  => $segPos,
-                    DirStart => 12, # (ignore first TDHD element because size includes 12-byte tag header)
-                    DirLen   => $length - 12,
-                );
+                # (ignore first TDHD element because size includes 12-byte tag header)
+                DirStart(\%dirInfo, 12);
                 $self->ProcessDirectory(\%dirInfo, $tagTablePtr);
             }
         } elsif ($marker == 0xe7) {         # APP7 (Pentax, Qualcomm)
@@ -5320,15 +5257,8 @@ sub ProcessJPEG($$)
                 undef $dumpType; # (dump this ourself)
                 my $hdrLen = 10;
                 my $tagTablePtr = GetTagTable('Image::ExifTool::Pentax::Main');
-                my %dirInfo = (
-                    Parent   => $markerName,
-                    DataPt   => $segDataPt,
-                    DataLen  => $length,
-                    DataPos  => 0, # (remember: relative to Base!)
-                    DirStart => $hdrLen,
-                    Base     => $segPos,
-                    DirName  => 'Pentax APP7',
-                );
+                DirStart(\%dirInfo, $hdrLen, 0);
+                $dirInfo{DirName} = 'Pentax APP7';
                 if ($htmlDump) {
                     $self->HDump($segPos-4, 4, 'APP7 header', "Data size: $length bytes");
                     $self->HDump($segPos, $hdrLen, 'Pentax header', 'APP7 data type: Pentax');
@@ -5339,47 +5269,62 @@ sub ProcessJPEG($$)
                 # found in HP iPAQ_VoiceMessenger
                 $dumpType = 'Qualcomm';
                 my $tagTablePtr = GetTagTable('Image::ExifTool::Qualcomm::Main');
-                my %dirInfo = (
-                    DataPt   => $segDataPt,
-                    DataPos  => $segPos,
-                    DirStart => 27, # (skip header)
-                    DirLen   => $length - 27,
-                    DirName  => 'Qualcomm',
-                );
+                DirStart(\%dirInfo, 27);
+                $dirInfo{DirName} = 'Qualcomm';
                 $self->ProcessDirectory(\%dirInfo, $tagTablePtr);
             }
         } elsif ($marker == 0xe8) {         # APP8 (SPIFF)
             # my sample SPIFF has 32 bytes of data, but spec states 30
             if ($$segDataPt =~ /^SPIFF\0/ and $length == 32) {
                 $dumpType = 'SPIFF';
-                my %dirInfo = (
-                    DataPt   => $segDataPt,
-                    DataPos  => $segPos,
-                    DirStart => 6,
-                    DirLen   => $length - 6,
-                );
+                DirStart(\%dirInfo, 6);
                 my $tagTablePtr = GetTagTable('Image::ExifTool::JPEG::SPIFF');
                 $self->ProcessDirectory(\%dirInfo, $tagTablePtr);
             }
+        } elsif ($marker == 0xe9) {         # APP9 (Media Jukebox)
+            if ($$segDataPt =~ /^Media Jukebox\0/ and $length > 22) {
+                $dumpType = 'MediaJukebox';
+                # (start parsing after the "<MJMD>")
+                DirStart(\%dirInfo, 22);
+                $dirInfo{DirName} = 'MediaJukebox';
+                require Image::ExifTool::XMP;
+                my $tagTablePtr = GetTagTable('Image::ExifTool::JPEG::MediaJukebox');
+                $self->ProcessDirectory(\%dirInfo, $tagTablePtr, \&Image::ExifTool::XMP::ProcessXMP);
+            }
         } elsif ($marker == 0xea) {         # APP10 (PhotoStudio Unicode comments)
             if ($$segDataPt =~ /^UNICODE\0/) {
                 $dumpType = 'PhotoStudio';
                 my $comment = $self->Decode(substr($$segDataPt,8), 'UCS2', 'MM');
                 $self->FoundTag('Comment', $comment);
             }
+        } elsif ($marker == 0xeb) {         # APP11 (JPEG-HDR)
+            if ($$segDataPt =~ /^HDR_RI /) {
+                $dumpType = 'JPEG-HDR';
+                my $dataPt = $segDataPt;
+                if (defined $combinedSegData) {
+                    if ($$segDataPt =~ /~\0/g) {
+                        $combinedSegData .= substr($$segDataPt,pos($$segDataPt));
+                    } else {
+                        $self->Warn('Invalid format for JPEG-HDR extended segment');
+                    }
+                    $dataPt = \$combinedSegData;
+                }
+                if ($nextMarker == $marker and $$nextSegDataPt =~ /^HDR_RI /) {
+                    $combinedSegData = $$segDataPt unless defined $combinedSegData;
+                } else {
+                    my $tagTablePtr = GetTagTable('Image::ExifTool::JPEG::HDR');
+                    my %dirInfo = ( DataPt => $dataPt );
+                    $self->ProcessDirectory(\%dirInfo, $tagTablePtr);
+                    undef $combinedSegData;
+                }
+            }
         } elsif ($marker == 0xec) {         # APP12 (Ducky, Picture Info)
             if ($$segDataPt =~ /^Ducky/) {
                 $dumpType = 'Ducky';
-                my %dirInfo = (
-                    DataPt   => $segDataPt,
-                    DataPos  => $segPos,
-                    DirStart => 5,
-                    DirLen   => $length - 5,
-                );
+                DirStart(\%dirInfo, 5);
                 my $tagTablePtr = GetTagTable('Image::ExifTool::APP12::Ducky');
                 $self->ProcessDirectory(\%dirInfo, $tagTablePtr);
             } else {
-                my %dirInfo = ( DataPt => $segDataPt );
                 my $tagTablePtr = GetTagTable('Image::ExifTool::APP12::PictureInfo');
                 $self->ProcessDirectory(\%dirInfo, $tagTablePtr) and $dumpType = 'Picture Info';
             }
@@ -5399,15 +5344,15 @@ sub ProcessJPEG($$)
                     $combinedSegData = $$segDataPt unless defined $combinedSegData;
                     # (will handle the Photoshop data the next time around)
                 } else {
-                    my $hdrlen = $isOld ? 27 : 14;
+                    my $hdrLen = $isOld ? 27 : 14;
                     # process APP13 Photoshop record
                     my $tagTablePtr = GetTagTable('Image::ExifTool::Photoshop::Main');
                     my %dirInfo = (
                         DataPt   => $dataPt,
                         DataPos  => $segPos,
                         DataLen  => length $$dataPt,
-                        DirStart => $hdrlen,    # directory starts after identifier
-                        DirLen   => length($$dataPt) - $hdrlen,
+                        DirStart => $hdrLen,    # directory starts after identifier
+                        DirLen   => length($$dataPt) - $hdrLen,
                         Parent   => $markerName,
                     );
                     $self->ProcessDirectory(\%dirInfo, $tagTablePtr);
@@ -5417,12 +5362,7 @@ sub ProcessJPEG($$)
                 $dumpType = 'Adobe_CM';
                 SetByteOrder('MM');
                 my $tagTablePtr = GetTagTable('Image::ExifTool::JPEG::AdobeCM');
-                my %dirInfo = (
-                    DataPt   => $segDataPt,
-                    DataPos  => $segPos,
-                    DirStart => 8,
-                    DirLen   => $length - 8,
-                );
+                DirStart(\%dirInfo, 8);
                 $self->ProcessDirectory(\%dirInfo, $tagTablePtr);
             }
         } elsif ($marker == 0xee) {         # APP14 (Adobe)
@@ -5437,12 +5377,7 @@ sub ProcessJPEG($$)
                 $dumpType = 'Adobe';
                 SetByteOrder('MM');
                 my $tagTablePtr = GetTagTable('Image::ExifTool::JPEG::Adobe');
-                my %dirInfo = (
-                    DataPt   => $segDataPt,
-                    DataPos  => $segPos,
-                    DirStart => 5,
-                    DirLen   => $length - 5,
-                );
+                DirStart(\%dirInfo, 5);
                 $self->ProcessDirectory(\%dirInfo, $tagTablePtr);
             }
         } elsif ($marker == 0xef) {         # APP15 (GraphicConverter)
@@ -5946,7 +5881,7 @@ sub GetTagTable($)
             $$table{LANG_INFO} = \&Image::ExifTool::XMP::GetLangInfo unless $$table{LANG_INFO};
         }
         # generate a tag prefix for unknown tags if necessary
-        unless ($$table{TAG_PREFIX}) {
+        unless (defined $$table{TAG_PREFIX}) {
             my $tagPrefix;
             if ($tableName =~ /Image::.*?::(.*)::Main/ || $tableName =~ /Image::.*?::(.*)/) {
                 ($tagPrefix = $1) =~ s/::/_/g;