exiftool_vendored 13.21.0 → 13.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e09f4452fe21aa8e743a6060c2eab2bd13d43b65eceb0a3665f5c85d58db0103
-  data.tar.gz: 33e426b70e4a07102f6d60c61d1e162fbc5164198be900b9548f665e4a58f03a
+  metadata.gz: ad918781e3d8bd85a5482713e9f0007a5c6a49baf150bc89899989a38d2976b4
+  data.tar.gz: 6c73a902a729e31ca68eb9cfb10162cc9cb58e4f5530a8383c791bd00f358f93
 SHA512:
-  metadata.gz: 5195564935d181ce7d5338fe53be6b88918ddcef2042d41045dc6dae27046aac9fe4317e0e3d333882315339bf11f8811d00084fa9274e3c57388cafe8c179d4
-  data.tar.gz: a04e8fc3f16ba37322ba42c7e6ec9bd8b7662232975b0f7cf6ee9483cc78ce1e7b4e136df76f1e6b7f3682a3a17b2084a4ac1fc35e3d4bc38448129b0ac88a79
+  metadata.gz: 7140b651487bbf72d3977a7af1dff81162a4e11de366121a9fcfffd6ef767df7c91e5e84c4f184ee2f0691fd014f90bdf1ed24bb71262d9b2b10225e3ae59374
+  data.tar.gz: 607ce339d770ac81eb2bea3d1cf1a2029c3916bd717ebc300c20807ad7c443218c34ede0769f3329dea40fba4abdd1fedf6e7e18ae367c5fa6901a790f6048fd

data/bin/Changes

@@ -7,10 +7,22 @@ RSS feed: https://exiftool.org/rss.xml
 Note: The most recent production release is Version 13.10. (Other versions are
 considered development releases, and are not uploaded to MetaCPAN.)
 
+Mar. 1, 2025 - Version 13.22
+
+  - Improvements and additions to the new plot feature
+  - Decode a few more DJI timed metadata tags
+  - Extract GainMapImage from PNG images
+  - Reverted WebP FileType change of version 13.20
+  - Set $^W in the exiftool application to re-enable global warnings (they have
+    been disabled since version 12.92 due to the shebang change)
+  - Fixed possible incorrect IFD number in "No size tag" warning
+  - Fixed "File is empty" error when using -plot with -w to write the output
+    file into the same directory as the input files
+
 Feb. 20, 2025 - Version 13.21
 
   - Patched issue that could result in runtime warning for some video files
-  - Fixed a bug that could cause a compiler error when using the -plot option
+  - Fixed a bug with the new -plot option that could generate a compiler error
 
 Feb. 20, 2025 - Version 13.20
 

data/bin/MANIFEST

@@ -208,6 +208,7 @@ html/htmldump.html
 html/idiosyncracies.html
 html/index.html
 html/install.html
+html/markers.svg
 html/metafiles.html
 html/mistakes.html
 html/overview.png
@@ -216,6 +217,7 @@ html/plot1.svg
 html/plot2.svg
 html/plot3.svg
 html/plot4.svg
+html/plot5.svg
 html/standards.html
 html/struct.html
 html/style.css

data/bin/META.json

@@ -50,5 +50,5 @@
       }
    },
    "release_status" : "stable",
-   "version" : "13.21"
+   "version" : "13.22"
 }

data/bin/META.yml

@@ -31,4 +31,4 @@ recommends:
   Time::HiRes: '0'
 requires:
   perl: '5.004'
-version: '13.21'
+version: '13.22'

data/bin/README

@@ -109,8 +109,8 @@ your home directory, then you would type the following commands in a
 terminal window to extract and run ExifTool:
 
   cd ~/Desktop
-  gzip -dc Image-ExifTool-13.21.tar.gz | tar -xf -
-  cd Image-ExifTool-13.21
+  gzip -dc Image-ExifTool-13.22.tar.gz | tar -xf -
+  cd Image-ExifTool-13.22
   ./exiftool t/images/ExifTool.jpg
 
 Note:  These commands extract meta information from one of the test images. 

data/bin/exiftool

@@ -11,7 +11,9 @@ use strict;
 use warnings;
 require 5.004;
 
-my $version = '13.21';
+my $version = '13.22';
+
+$^W = 1;    # enable global warnings
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exePath;
@@ -1551,10 +1553,11 @@ if ($textOut2) {
         undef $textOut2;
         next;
     }
+    # make sure we can write the output text file before processing all input files
     CreateDirectory($textOut2);  # create directory if necessary
     if ($mt->Open(\*OUTFILE, $textOut2, '>')) {
-        $tmpText = $textOut2;   # delete if command aborted
-        $textOut2 = \*OUTFILE;
+        close(\*OUTFILE);
+        unlink($textOut2);  # (this was just a test)
     } else {
         Error("Error creating $textOut2\n");
         undef $textOut2;
@@ -1968,27 +1971,36 @@ if ($textOut) {
 } else {
     print $sectTrailer if $sectTrailer;
     print $fileTrailer if $fileTrailer and not $fileHeader;
-    # print CSV information if necessary
-    my $err;
-    PrintCSV($textOut2) if $csv and not $isWriting;
-    # print SVG plot
-    if ($plot) {
-        $plot->Draw($textOut2 || \*STDOUT);
-        if ($$plot{Error}) {
-            Error("Error: $$plot{Error}\n");
+    # print CSV or SVG output file if necessary
+    my ($fp, $err);
+    if ($textOut2) {
+        if ($mt->Open(\*OUTFILE, $textOut2, '>')) {
+            $fp = \*OUTFILE;
+        } else {
+            Error("Error creating $textOut2\n");
             $err = 1;
-        } elsif ($$plot{Warn}) {
-            Warn("Warning: $$plot{Warn}\n");
         }
     }
-    if ($textOut2) {
-        close($textOut2) or $err = 1;
+    unless ($err) {
+        PrintCSV($fp) if $csv and not $isWriting;
+        # print SVG plot
+        if ($plot) {
+            $plot->Draw($fp || \*STDOUT);
+            if ($$plot{Error}) {
+                Error("Error: $$plot{Error}\n");
+                $err = 1;
+            } elsif ($$plot{Warn}) {
+                Warn("Warning: $$plot{Warn}\n");
+            }
+        }
+    }
+    if ($fp) {
+        close($fp) or $err = 1;
         if ($err) {
-            $mt->Unlink($tmpText);
+            $mt->Unlink($textOut2);
         } else {
             $created{$textOut2} = 1;
         }
-        undef $tmpText;
     }
 }
 
@@ -6041,7 +6053,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 13.21 --
+    -- Generated by ExifTool 13.22 --
     File: a.jpg - 2003:10:31 15:44:19
     (f/5.6, 1/60s, ISO 100)
     File: b.jpg - 2006:05:23 11:57:38

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

@@ -18,7 +18,7 @@ use Image::ExifTool::XMP;
 use Image::ExifTool::GPS;
 use Image::ExifTool::Protobuf;
 
-$VERSION = '1.13';
+$VERSION = '1.14';
 
 sub ProcessDJIInfo($$$);
 sub ProcessSettings($$$);
@@ -266,6 +266,9 @@ my %convFloat2 = (
     },
     'dvtm_ac203_3-2-6-1' => { Name => 'ColorTemperature', Format => 'unsigned' }, # (NC)
    # dvtm_ac203_3-2-9-1 - looks like Z accerometer measurement, but 2 and 3 don't look like other components
+    'dvtm_ac203_3-2-10-2' => { Name => 'AccelerometerX', Format => 'float' } , # (NC) left/right
+    'dvtm_ac203_3-2-10-3' => { Name => 'AccelerometerY', Format => 'float' } , # (NC) front/back
+    'dvtm_ac203_3-2-10-4' => { Name => 'AccelerometerZ', Format => 'float' } , # (NC) up/down
    # dvtm_ac203_3-4-1-4 - model code?
     'dvtm_ac203_3-4-2-1' => {
         Name => 'GPSInfo',
@@ -301,6 +304,9 @@ my %convFloat2 = (
         PrintConv => 'Image::ExifTool::Exif::PrintExposureTime($val)',
     },
     'dvtm_ac204_3-2-6-1' => { Name => 'ColorTemperature', Format => 'unsigned' }, # (NC)
+    'dvtm_ac204_3-2-10-2' => { Name => 'AccelerometerX', Format => 'float' } , # (NC) left/right
+    'dvtm_ac204_3-2-10-3' => { Name => 'AccelerometerY', Format => 'float' } , # (NC) front/back
+    'dvtm_ac204_3-2-10-4' => { Name => 'AccelerometerZ', Format => 'float' } , # (NC) up/down
    # dvtm_ac204_3-4-1-4 - model code?
     'dvtm_ac204_3-4-2-1' => {
         Name => 'GPSInfo',
@@ -413,6 +419,11 @@ my %convFloat2 = (
         Format => 'rational',
         PrintConv => 'Image::ExifTool::Exif::PrintExposureTime($val)',
     },
+    'dvtm_pm320_3-2-4-1' => { # (NC)
+        Name => 'FNumber',
+        Format => 'rational',
+        PrintConv => 'Image::ExifTool::Exif::PrintFNumber($val)',
+    },
     'dvtm_pm320_3-2-6-1' => { Name => 'DigitalZoom', Format => 'float' },
     'dvtm_pm320_3-3-4-1' => {
         Name => 'GPSInfo',

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

@@ -437,7 +437,7 @@ sub Process_marl($$$)
 {
     my ($et, $dirInfo, $tagTablePtr) = @_;
     my $dataPt = $$dirInfo{DataPt};
-    my $dataPos = $$dirInfo{DataPos} + $$dirInfo{Base};
+    my $dataPos = ($$dirInfo{DataPos} || 0) + ($$dirInfo{Base} || 0);
     my $dataLen = length $$dataPt;
     my $vals = $$et{GMVals}; # running values for each channel (0=TimeStamp)
     my $chan = $$et{GMChan}; # running channel number

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

@@ -202,7 +202,7 @@ sub ProcessJPEG_HDR($$$);
         Groups => { 0 => 'APP6', 1 => 'DJI' },
         Notes => 'DJI Thermal Analysis Tool record',
         ValueConv => 'substr($val,7)',
-      # also seen Motorola APP6 "MMIMETA\0", with sub-types: AL3A,ALED,MMI0,MOTD,QC3A
+      # also seen Motorola APP6 "MMIMETA\0", with sub-types: AL3A,ALED,MMI0,MOTD,QC3A,LMB1
     }],
     APP7 => [{
         Name => 'Pentax',

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

@@ -4833,17 +4833,17 @@ my %base64coord = (
     0x2f => [
     {
         Name => 'FocusPositionHorizontal',   # 209/231 focus point cameras
-        Condition => '$$self{Model} =~ /^NIKON (Z 30|Z 50|Z fc)\b/i  and $$self{AFAreaXPosition} != 0',   #models Z30, Z50, Zfc
+        Condition => '$$self{Model} =~ /^NIKON (Z 30|Z 50|Z fc)\b/i and $$self{AFAreaXPosition}',   #models Z30, Z50, Zfc
         ValueConv => 'int($$self{AFAreaXPosition} / 260 )',     #divisor is an estimate (chosen to cause center point to report 'C')
         PrintConv => sub { my ($val) = @_; PrintAFPointsLeftRight($val, 19 ) },
     },{
         Name => 'FocusPositionHorizontal',  #273/299 focus point cameras
-        Condition => '$$self{Model} =~ /^NIKON (Z 5|Z 6|Z 6_2|D780)\b/i  and $$self{AFAreaXPosition} != 0',   #models Z5, Z6, Z6ii, D780
+        Condition => '$$self{Model} =~ /^NIKON (Z 5|Z 6|Z 6_2|D780)\b/i and $$self{AFAreaXPosition}',   #models Z5, Z6, Z6ii, D780
         ValueConv => 'int($$self{AFAreaXPosition} / 260 )',     #divisor is an estimate (chosen to cause center point to report 'C')
         PrintConv => sub { my ($val) = @_; PrintAFPointsLeftRight($val, 21 ) },
     },{
         Name => 'FocusPositionHorizontal',   #405/493 focus point cameras
-        Condition => '$$self{Model} =~ /^NIKON (Z 7|Z 7_2)\b/i  and $$self{AFAreaXPosition} != 0',   #models Z7/Z7ii
+        Condition => '$$self{Model} =~ /^NIKON (Z 7|Z 7_2)\b/i and $$self{AFAreaXPosition}',   #models Z7/Z7ii
         ValueConv => 'int($$self{AFAreaXPosition} / 260 )',     #divisor is the measured horizontal pixel separation between adjacent points
         PrintConv => sub { my ($val) = @_; PrintAFPointsLeftRight($val, 29 ) },
     },
@@ -4858,17 +4858,17 @@ my %base64coord = (
     0x31 => [
     {
         Name => 'FocusPositionVertical',   # 209/233 focus point cameras
-        Condition => '$$self{Model} =~ /^NIKON (Z 30|Z 50|Z fc)\b/i  and $$self{AFAreaYPosition} != 0',   #models Z30, Z50, Zfc
+        Condition => '$$self{Model} =~ /^NIKON (Z 30|Z 50|Z fc)\b/i and $$self{AFAreaYPosition}',   #models Z30, Z50, Zfc
         ValueConv => 'int($$self{AFAreaYPosition} / 286 )',      #divisor is an estimate (chosen to cause center point to report 'C')
         PrintConv => sub { my ($val) = @_; PrintAFPointsUpDown($val, 11 ) },
     },{
         Name => 'FocusPositionVertical',  #273/299 focus point cameras
-        Condition => '$$self{Model} =~ /^NIKON (Z 5|Z 6|Z 6_2|D780)\b/i  and $$self{AFAreaYPosition} != 0',   #models Z5, Z6, Z6ii, D780
+        Condition => '$$self{Model} =~ /^NIKON (Z 5|Z 6|Z 6_2|D780)\b/i and $$self{AFAreaYPosition}',   #models Z5, Z6, Z6ii, D780
         ValueConv => 'int($$self{AFAreaYPosition} / 286 )',     #divisor is an estimate (chosen to cause center point to report 'C')
         PrintConv => sub { my ($val) = @_; PrintAFPointsUpDown($val, 13 ) },
     },{
         Name => 'FocusPositionVertical',   #405/493 focus point cameras
-        Condition => '$$self{Model} =~ /^NIKON (Z 7|Z 7_2)\b/i  and $$self{AFAreaYPosition} != 0',   #models Z7/Z7ii
+        Condition => '$$self{Model} =~ /^NIKON (Z 7|Z 7_2)\b/i and $$self{AFAreaYPosition}',   #models Z7/Z7ii
         ValueConv => 'int($$self{AFAreaYPosition} / 292 )',     #divisor is the measured vertical pixel separation between adjacent points
         PrintConv => sub { my ($val) = @_; PrintAFPointsUpDown($val, 17 ) },
     },

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

@@ -36,7 +36,7 @@ use strict;
 use vars qw($VERSION $AUTOLOAD %stdCase);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.70';
+$VERSION = '1.71';
 
 sub ProcessPNG_tEXt($$$);
 sub ProcessPNG_iTXt($$$);
@@ -371,6 +371,12 @@ my %noLeapFrog = ( SAVE => 1, SEEK => 1, IHDR => 1, JHDR => 1, IEND => 1, MEND =
             IgnoreProp => { meta => 1 }, # ignore 'meta' container
         },
     },
+    gdAT => {
+        Name => 'GainMapImage',
+        Groups => { 2 => 'Preview' },
+        Binary => 1,
+    },
+    # gmAP  - https://github.com/w3c/png/issues/380 does't correspond to my only sample
     seAl => {
         Name => 'SEAL',
         SubDirectory => { TagTable => 'Image::ExifTool::XMP::SEAL' },

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

@@ -18,16 +18,17 @@ my %defaults = (
     size   => [ 800, 600 ],        # width,height of output image
     margin => [ 60, 15, 15, 30 ],  # left,top,right,bottom margins around plot area
     legend => [ 0, 0 ],            # top,right offset for legend
-    txtPad => [ 10, 10 ],          # padding between text and x,y scale
-    lineSpacing => 20,             # text line spacing
-    # colors for plot lines
-    cols   => [ qw(red green blue black orange gray purple cyan brown pink
-                   goldenrod lightsalmon seagreen goldenrod cadetblue plum
-                   deepskyblue mediumpurple royalblue tomato) ],
-    grid   => 'darkgray',          # grid color
-    text   => 'black',             # text and plot frame color
+    txtpad => [ 10, 10 ],          # padding between text and x,y scale
+    linespacing => 20,             # text line spacing
+    # colours for plot lines
+    cols   => [ qw(red green blue black orange gray fuchsia brown turquoise gold
+                   lime violet maroon aqua navy pink olive indigo silver teal) ],
+    marks  => [ qw(circle square triangle diamond star plus pentagon left down right) ],
+    stroke => 1,                   # stroke width and marker scaling
+    grid   => 'darkgray',          # grid colour
+    text   => 'black',             # text and plot frame colour
     type   => 'line',              # plot type, 'line' or 'scatter'
-    style  => 'line',              # 'line', 'marker' or 'line+marker'
+    style  => '',                  # 'line', 'marker' or 'line+marker'
     xlabel => '',                  # x axis label
     ylabel => '',                  # y axis label
     title  => '',                  # plot title
@@ -35,24 +36,33 @@ my %defaults = (
     # xmin, xmax                   # x axis minimum,maximum
     # ymin, ymax                   # y axis minimum,maximum
     # split                        # split list of numbers into separate plot lines
-    # bkg                          # background color
+    # bkg                          # background colour
+    # multi                        # flag to make one plot per dataset
+#
+# members containing capital letters are used internally
+#
     Data   => { },                 # data arrays for each variable
     Name   => [ ],                 # variable names
-    XMax   => 0,                   # number of points in plot so far
+    # XMin, XMax                   # min/max data index
+    # YMin, YMax                   # min/max data value
+    # SaveName, Save               # saved variables between plots
 );
 
-my @markerName = qw(circle square triangle diamond triangle2 triangle3 triangle4);
-my @markerData = (
-    '<circle cx="6" cy="6" r="4" stroke-width="1.5" stroke="context-stroke" fill="none" />',
-    '<path stroke-width="1.5" stroke="context-stroke" fill="none" d="M2.5 2.5 l7 0 0 7 -7 0 z"/>',
-    '<path stroke-width="1.5" stroke="context-stroke" fill="none" d="M6 1.2 l4 8 -8 0 z"/>',
-    '<path stroke-width="1.5" stroke="context-stroke" fill="none" d="M6 1.5 l4.5 4.5 -4.5 4.5 -4.5 -4.5 z"/>',
-    '<path stroke-width="1.5" stroke="context-stroke" fill="none" d="M1.2 6 l8 4 0 -8 z"/>',
-    '<path stroke-width="1.5" stroke="context-stroke" fill="none" d="M6 10.8 l4 -8 -8 0 z"/>',
-    '<path stroke-width="1.5" stroke="context-stroke" fill="none" d="M10.8 6 l-8 4 0 -8 z"/>',
+my %markerData = (
+    circle   => '<circle cx="4" cy="4" r="2.667"',
+    square   => '<path d="M1.667 1.667 l4.667 0 0 4.667 -4.667 0 z"',
+    triangle => '<path d="M4 0.8 l2.667 5.333 -5.333 0 z"',
+    diamond  => '<path d="M4 1 l3 3 -3 3 -3 -3 z"',
+    star     => '<path d="M4 0.8 L5 2.625 7.043 3.011 5.617 4.525 5.881 6.589 4 5.7 2.119 6.589 2.383 4.525 0.957 3.011 3 2.625 z"',
+    plus     => '<path d="M2.75 1 l2.5 0 0 1.75 1.75 0 0 2.5 -1.75 0 0 1.75 -2.5 0 0 -1.75 -1.75 0 0 -2.5 1.75 0 z"',
+    pentagon => '<path d="M4 1 L6.853 3.073 5.763 6.427 2.237 6.427 1.147 3.073 z"',
+    left     => '<path d="M0.8 4 l5.333 2.667 0 -5.333 z"',
+    down     => '<path d="M4 7.2 l2.667 -5.333 -5.333 0 z"',
+    right    => '<path d="M7.2 4 l-5.333 2.667 0 -5.333 z"',
 );
-# optimal number grid lines in X and Y for a 800x600 plot and nominal character width
-my ($nx, $ny, $wch) = (15, 12, 8);
+
+my @ng = (20, 15);  # optimal number grid lines in X and Y for a 800x600 plot
+my $wch = 8;        # nominal width of a character (measured at 7.92)
 
 #------------------------------------------------------------------------------
 # Create new plot object
@@ -78,17 +88,40 @@ sub Settings($$)
     return unless $set;
     foreach (split /,\s*/, $set) {
         next unless /^([a-z].*?)(=(.*))?$/i;
-        my ($name, $val) = ($1, $3);
+        my ($name, $val) = (lc $1, $3);
         if (ref $$self{$name} eq 'ARRAY') {
             next unless defined $val;
-            $$self{lc $name} = [ split /[\s\/]+/, $val ]; # split on space or slash
+            my $isNum = $$self{$name}[0] =~ /^\d+$/;
+            # also allow numbers to also be separated by 'x'
+            my @vals = $isNum ? split(/\s*[x\s\/+]\s*/, $val) : split(/\s*[\s\/+]\s*/, $val);
+            my $i;
+            for ($i=0; @vals; ++$i) {
+                my $val = lc shift @vals;
+                next unless length $val;
+                if ($name eq 'marks') {
+                    my @v = split /-/, $val;
+                    if ($v[0]) {
+                        if ($v[0] =~ /^n/) {
+                            $v[0] = 'none';
+                        } else {
+                            ($v[0]) = grep /^$v[0]/, @{$defaults{marks}};
+                            $v[0] or $$self{Warn} = 'Invalid marker name', next;
+                        }
+                    } else {
+                        # cycle through default markers if none specified
+                        $v[0] = $defaults{marks}[$i % @{$defaults{marks}}];
+                    }
+                    $val = join '-', @v;
+                }
+                $$self{$name}[$i] = $val;
+            }
         } else {
             $val = 1 unless defined $val;   # default to 1 if no "="
             my %charName = ('&'=>'amp', '<'=>'lt', '>'=>'gt');
             # escape necessary XML characters, but allow numerical entities
             $val =~ s/([&><])/&$charName{$1};/sg and $val =~ s/&amp;(#(\d+|x[0-9a-fA-F]+);)/&$1/;
             undef $val unless length $val;
-            $$self{lc $name} = $val;
+            $$self{$name} = $val;
         }
     }
 }
@@ -102,12 +135,13 @@ sub AddPoints($$$)
     my ($tag, $name, %num, $index, $mod, $val, @vals);
     my ($ee, $docNum, $data, $xmin, $xmax) = @$self{qw(EE DocNum Data XMin XMax)};
     $$self{type} or $$self{type} = 'line';
-    my $scat = $$self{type} =~ /^s/i;
+    my $scat = $$self{type} =~ /^s/ ? 1 : 0;
     my $xname = $$self{Name}[0];    # (x-axis name if using scatter plot)
-    my $maxLines = $$self{type} =~ /^h/i ? 1 : 20;
+    my $maxLines = ($$self{type} =~ /^h/ and not $$self{multi}) ? 1 : 20;
     for (;;) {
         if (@vals) {
             $val = shift @vals;
+            next unless $val =~ /^[+-]?(?=\.?\d)\d*\.?\d*(?:e[+-]?\d+)?$/;
         } else {
             $tag = shift @$tags or last;
             # ignore non-floating-point values
@@ -127,7 +161,7 @@ sub AddPoints($$$)
                 }
             }
         }
-        next unless defined $val and $val =~ /^[+-]?(?=\.?\d)\d*\.?\d*(?:e[+-]?\d+)?([ ,;\t\n\r]?|\z)/i;
+        next unless defined $val and $val =~ /^[+-]?(?=\.?\d)\d*\.?\d*(?:e[+-]?\d+)?([ ,;\t\n\r]+|$)/i;
         if ($1) {
             # split a string of numbers into separate plot points (eg. histogram tags)
             if ($$self{'split'}) {
@@ -145,10 +179,10 @@ sub AddPoints($$$)
         my $docNum = $docNum ? $$docNum{$tag} || 0 : 0;
         next if $docNum and not $ee;
         unless ($$data{$name}) {
-            if (@{$$self{Name}} >= $maxLines) {
+            if (@{$$self{Name}} >= $maxLines + $scat) {
                 unless ($$self{MaxTags}) {
-                    if ($$self{type} =~ /^h/i) {
-                        $$self{Warn} = 'A histogram can only plot one variable';
+                    if ($$self{type} =~ /^h/ and not $$self{multi}) {
+                        $$self{Warn} = 'Use the Multi setting to make a separate histogram for each dataset';
                     } else {
                         $$self{Warn} = 'Too many variables to plot all of them';
                     }
@@ -158,10 +192,11 @@ sub AddPoints($$$)
             }
             push @{$$self{Name}}, $name;
             $xname or $xname = $name;   # x-axis data for scatter plot
-            unless (defined $$self{Min}) {
-                $$self{Min} = $$self{Max} = $val unless $scat and $name eq $xname;
-                $xmin = $xmax = $docNum unless defined $xmin;
+            unless ($scat and $name eq $xname) {
+                $$self{Max} = $val if not defined $$self{Max} or $val > $$self{Max};
+                $$self{Min} = $val if not defined $$self{Min} or $val < $$self{Min};
             }
+            $xmin = $xmax = $docNum unless defined $xmin;
             $num{$name} = $xmax;
             $$data{$name}[$xmax - $xmin] = $val if $xmax >= $xmin;
             next;
@@ -186,20 +221,40 @@ sub AddPoints($$$)
 
 #------------------------------------------------------------------------------
 # Calculate a nice round number for grid spacing
-# Inputs: 0) nominal spacing (must be positive)
+# Inputs: 0) nominal spacing (must be positive), 1) flag to increment to next number
 # Returns: spacing rounded to an even number
-sub GetGridSpacing($)
+sub GetGridSpacing($;$)
 {
-    my $nom = shift;
-    my $rounded;
+    my ($nom, $inc) = @_;
+    my ($rounded, $spc);
     my $div = sprintf('%.3e', $nom);
     my $num = substr($div, 0, 1);
     my $exp = $div =~ s/.*e// ? $div : 0;
-    # look for nearest factor to 1, 1.5, 2 or 5 * 10^x
-    ($num, $exp) = $num < 8 ? (5, $exp) : (1, $exp+1) if $num > 2;
+    if ($inc) {
+        # increment to next highest even number
+        $num = $num < 2 ? 2 : ($num < 5 ? 5 : (++$exp, 1));
+    } else {
+        # look for nearest factor to 1, 2 or 5 * 10^x
+        $num = $num < 8 ? 5 : (++$exp, 1) if $num > 2;
+    }
     return $exp >= 0 ? $num . ('0' x $exp) : '.' . ('0' x (-$exp - 1)) . $num;
 }
 
+#------------------------------------------------------------------------------
+# Get plot range
+# Inputs: 0) minimum, 1) maximum
+# Returns: difference
+# Notes: Adjusts min/max if necessary to make difference positive
+sub GetRange($$)
+{
+    if ($_[0] >= $_[1]) {
+        $_[0] = ($_[0] + $_[1]) / 2;
+        $_[0] -= 0.5 if $_[0];
+        $_[1] = $_[0] + 1;
+    }
+    return $_[1] - $_[0];
+}
+
 #------------------------------------------------------------------------------
 # Draw SVG plot
 # Inputs: 0) Plot ref, 1) Output file reference
@@ -208,29 +263,85 @@ sub Draw($$)
     my ($self, $fp) = @_;
     my ($min, $max, $xmin, $xmax, $name, $style) = @$self{qw(Min Max XMin XMax Name style)};
 
-    if (not defined $min or not defined $xmin or not $style) {
+    if (not defined $min or not defined $xmin) {
         $$self{Error} = 'Nothing to plot';
         return;
     }
-    my ($data, $title, $xlabel, $ylabel, $cols) = @$self{qw(Data title xlabel ylabel cols)};
-    my ($i, $n, %col, %class, $dx, $dy, $dx2, $xAxis, $x, $y, $px, $py);
-    my ($grid, $lastLen, $noLegend, $xname, $xdat, $xdiff, $diff);
-    my $scat = $$self{type} =~ /^s/i ? 1 : 0;
-    my $hist = $$self{type} =~ /^h/i ? [ ] : 0;
+    my ($i, $n, %col, %class, $dx, $dy, $dx2, $xAxis, $x, $y, $px, $py, @og);
+    my ($noLegend, $xname, $xdat, $xdiff, $diff, %markID, $plotNum);
+    my $scat = $$self{type} =~ /^s/ ? 1 : 0;
+    my $hist = $$self{type} =~ /^h/ ? [ ] : 0;
+    my $multi = int($$self{multi} || 0);
+    $multi = 0 unless $multi > 0;
+    $style or $style = $hist ? 'line+fill' : 'line';
+    unless ($style =~ /\b[mpl]/ or ($hist and $style =~ /\bf/)) {
+        $$self{Error} = 'Invalid plot Style setting';
+        return;
+    }
+    my $numPlots = $multi ? scalar(@$name) - $scat : 1;
+    my @size = @{$$self{size}};
+    my $sy = $size[1];
+    if ($multi) {
+        $sy *= int(($numPlots + $multi - 1) / $multi) / $multi;
+        $_ /= $multi foreach @size;
+    }
+    my $tmp = $$self{title} || "Plot by ExifTool $Image::ExifTool::VERSION";
+    print $fp qq{<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="$$self{size}[0]" height="$sy"
+ preserveAspectRatio="xMidYMid meet" viewBox="0 0 $$self{size}[0] $sy">
+<title>$tmp</title>};
+  # loop through all plots
+  for ($plotNum=0; $plotNum<$numPlots; ++$plotNum) {
+    if ($numPlots > 1) {
+        print $fp "\n<g transform='translate(", ($plotNum % $multi) * $size[0],
+                  ',', int($plotNum/$multi) * $size[1], ")'>";
+        if ($plotNum) {
+            @$self{qw(XMin XMax title xlabel ylabel)} = @{$$self{Save}};
+        } else {
+            $$self{Save} = [ @$self{qw(XMin XMax title xlabel ylabel)} ];
+            $$self{SaveName} = [ @{$$self{Name}} ];
+        }
+        $name = $$self{Name} = [ ];
+        push @{$$self{Name}}, $$self{SaveName}[0] if $scat;
+        push @{$$self{Name}}, $$self{SaveName}[$scat + $plotNum];
+        my $dat = $$self{Data}{$$self{Name}[$scat]};
+        undef $min; undef $max;
+        foreach (@$dat) {
+            defined or next;
+            defined $min or $min = $max = $_, next;
+            $min > $_ and $min = $_;
+            $max < $_ and $max = $_;
+        }
+    }
+    my ($data, $title, $xlabel, $ylabel, $cols, $marks, $tpad, $wid) =
+        @$self{qw(Data title xlabel ylabel cols marks txtpad stroke)};
     my @name = @$name;
     my @margin = ( @{$$self{margin}} );
 
     # set reasonable default titles and labels
     $xname = shift @name if $scat;
     $title = "$name[0] vs $xname" if $scat and defined $title and not $title and @name == 1;
-    $xlabel = $$name[0] if $scat || $hist and defined $xlabel and not $xlabel;
-    $ylabel = ($hist ? 'Count' : $name[0]) and $noLegend=1 if defined $ylabel and not $ylabel and @name == 1;
+    if ($scat || $hist and defined $xlabel and not $xlabel) {
+        $xlabel = $$name[0];
+        $noLegend = 1 if $hist;
+    }
+    if (defined $ylabel and not $ylabel and @name == 1) {
+        $ylabel = $hist ? 'Count' : $name[0];
+        $noLegend = 1 unless $hist;
+    }
 
     # make room for title/labels
-    $margin[1] += $$self{lineSpacing} * 1.5 if $title;
-    $margin[3] += $$self{lineSpacing} if $xlabel;
-    $margin[0] += $$self{lineSpacing} if $ylabel;
+    $margin[1] += $$self{linespacing} * 1.5 if $title;
+    $margin[3] += $$self{linespacing} if $xlabel;
+    $margin[0] += $$self{linespacing} if $ylabel;
 
+    # calculate optimal number of X/Y grid lines
+    for ($i=0; $i<2; ++$i) {
+        $og[$i] = $ng[$i] * ($size[$i] - $margin[$i] - $margin[$i+2]) /
+                     ($defaults{size}[$i] - $defaults{margin}[$i] - $defaults{margin}[$i+2]);
+        $og[$i] <= 0 and $$self{Error} = 'Invalid plot size', return;
+    }
     if ($scat) {
         $xdat = $$self{Data}{$xname};
         unless (defined $$self{xmin} and defined $$self{xmax}) {
@@ -241,7 +352,7 @@ sub Draw($$)
                 $xmin = $_ if $xmin > $_;
                 $xmax = $_ if $xmax < $_;
             }
-            my $dnx2 = ($xmax - $xmin) / ($nx * 2);
+            my $dnx2 = ($xmax - $xmin) / ($og[0] * 2);
             # leave a bit of a left/right margin, but don't pass 0
             $xmin = ($xmin >= 0 and  $xmin < $dnx2) ? 0 : $xmin - $dnx2;
             $xmax = ($xmax <= 0 and -$xmax < $dnx2) ? 0 : $xmax + $dnx2;
@@ -261,7 +372,7 @@ sub Draw($$)
         $max = $$self{xmax} if defined $$self{xmax};
     } else {
         # leave a bit of a margin above/below data when autoscaling but don't pass 0
-        my $dny2 = ($max - $min) / ($ny * 2);
+        my $dny2 = ($max - $min) / ($og[1] * 2);
         $min = ($min >= 0 and  $min < $dny2) ? 0 : $min - $dny2;
         $max = ($max <= 0 and -$max < $dny2) ? 0 : $max + $dny2;
         # adjust to user-defined range if specified
@@ -269,15 +380,15 @@ sub Draw($$)
         $max = $$self{ymax} if defined $$self{ymax};
     }
     # generate random colors if we need more
-    while (@$cols < @$name) {#138
+    while (@$cols < @$name) {
         $$self{seeded} or srand(141), $$self{seeded} = 1;
         push @$cols, sprintf("#%.2x%.2x%.2x",int(rand(220)),int(rand(220)),int(rand(220)));
     }
-    $diff = $max - $min || 1;
-    $xdiff = $xmax - $xmin || 1;
+    $diff = GetRange($min, $max);
+    $xdiff = GetRange($xmin, $xmax);
 
     # determine y grid spacing (nice even numbers)
-    $dy = GetGridSpacing($diff / ($hist ? $$self{nbins} : $ny));
+    $dy = GetGridSpacing($diff / ($hist ? $$self{nbins} : $og[1]));
     # expand plot min/max to the nearest even multiple of our grid spacing
     $min = ($min > 0 ? int($min/$dy) : int($min/$dy-0.9999)) * $dy;
     $max = ($max > 0 ? int($max/$dy+0.9999) : int($max/$dy)) * $dy;
@@ -300,125 +411,137 @@ sub Draw($$)
         } else {
             $max < $_ and $max = $_ foreach @$hist;   # find max count
         }
-        $diff = $max - $min || 1;
+        $diff = GetRange($min, $max);
         $dx = $dy;
-        $dy = GetGridSpacing($diff / $ny);
+        $dy = GetGridSpacing($diff / $og[1]);
         $max = ($max > 0 ? int($max/$dy+0.9999) : int($max/$dy)) * $dy;
         $$data{$name[0]} = $hist;
     } else {
-        $dx = GetGridSpacing($xdiff / $nx);
+        $dx = GetGridSpacing($xdiff / $og[0]);
     }
     if ($scat) {
         $xmin = ($xmin > 0 ? int($xmin/$dx) : int($xmin/$dx-0.9999)) * $dx;
         $xmax = ($xmax > 0 ? int($xmax/$dx+0.9999) : int($xmax/$dx)) * $dx;
     }
-    $diff = $max - $min || 1;
-    $xdiff = $xmax - $xmin || 1;
+    $diff = GetRange($min, $max);
+    $xdiff = GetRange($xmin, $xmax);
     # width/height of plot area
-    my $width  = $$self{size}[0] - $margin[0] - $margin[2];
-    my $height = $$self{size}[1] - $margin[1] - $margin[3];
+    my $width  = $size[0] - $margin[0] - $margin[2];
+    my $height = $size[1] - $margin[1] - $margin[3];
     my $yscl = $height / $diff;
     my $xscl = $width / $xdiff;
     my $px0 = $margin[0] - $xmin * $xscl;
     my $py0 = $margin[1] + $height + $min * $yscl;
-    my $tmp = $title || "Plot by ExifTool $Image::ExifTool::VERSION";
-    print $fp qq{<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="$$self{size}[0]" height="$$self{size}[1]"
- preserveAspectRatio="xMidYMid meet" viewBox="0 0 $$self{size}[0] $$self{size}[1]">
-<title>$tmp</title>};
-    print $fp "<rect x='0' y='0' width='$$self{size}[0]' height='$$self{size}[1]' fill='$$self{bkg}'/>" if $$self{bkg};
+    my @clip = ($margin[0]-6*$wid, $margin[1]-6*$wid, $width+12*$wid, $height+12*$wid);
+    print $fp "\n<!-- Definitions -->\n<defs>\n<clipPath id='plot-area'>";
+    print $fp "<rect x='$clip[0]' y='$clip[1]' width='$clip[2]' height='$clip[3]'/></clipPath>";
+    if ($style =~ /\b[mp]/) { # 'm' for 'marker' or 'p' for 'point' (undocumented)
+        for ($i=0; $i<@name; ++$i) {
+            my @m = split /-/, ($$marks[$i] || $defaults{marks}[$i % @{$defaults{marks}}]);
+            my ($fill, $mark);
+            $fill = $m[2] || $$cols[$i] if $m[1] ? $m[1] =~ /^f/ : $style =~ /\bf/;
+            $mark = $markerData{$m[0]};
+            $mark or $markID{$mark} = '', next; # skip 'none' or unrecognized marker name
+            if ($fill and $fill ne 'none') {
+                my $op = $m[3] || ($$cols[$i] eq 'none' ? 50 : 20); 
+                $mark .= qq( fill="$fill" style="fill-opacity: $op%");
+            } else {
+                $mark .= ' fill="none"';
+            }
+            $mark .= ' stroke="context-stroke"/>';
+            # don't re-define mark if it is the same as a previous one
+            $markID{$mark} and $markID{$i} = $markID{$mark}, next;
+            $markID{$mark} = $markID{$i} = "mark$i";
+            print $fp "\n<marker id='$markID{$i}' markerWidth='8' markerHeight='8' refX='4'",
+                      " refY='4'>\n$mark\n</marker>";
+        }
+        print $fp "\n</defs>\n<style>";
+        for ($i=0; $i<@name; ++$i) {
+            next unless $markID{$i} eq "mark$i";
+            print $fp "\n  path.mark$i { marker: url(#mark$i) }";
+        }
+    } else {
+        print $fp "\n</defs>\n<style>";
+    }
+    print $fp "\n  text { fill: $$self{text} }\n</style>";
+    print $fp "\n<rect x='0' y='0' width='$size[0]' height='$size[1]' fill='$$self{bkg}'/>" if $$self{bkg};
     print $fp "\n<!-- X axis -->";
     print $fp "\n<g dominant-baseline='hanging' text-anchor='middle'>";
-    $py = int(($margin[1] + $height + $$self{txtPad}[1]) * 10 + 0.5) / 10;
+    $py = int(($margin[1] + $height + $$tpad[1]) * 10 + 0.5) / 10;
     $px = int(($margin[0] + $width / 2) * 10 + 0.5) / 10;
     if ($title) {
         print $fp "\n<text x='${px}' y='14' font-size='150%'>$title</text>";
     }
     if ($xlabel) {
-        $y = $py + $$self{lineSpacing};
+        $y = $py + $$self{linespacing};
         print $fp "\n<text x='${px}' y='${y}'>$xlabel</text>";
     }
     if ($ylabel) {
         $y = $margin[1] + $height / 2;
         print $fp "\n<text x='10' y='${y}' transform='rotate(-90,10,$y)'>$ylabel</text>";
     }
-    # check to be sure the X labels will fit
-    my $len = 0;
-    for ($i=0, $x=$xmax; $i<3; ++$i, $x-=$dx) {
-        $n = length sprintf('%g', $x);
-        $len = $n if $len < $n;
+    # make sure the X labels will fit
+    my $spc = $dx;
+    for (;;) {
+        # find longest label at current spacing
+        my $len = 0;
+        my $x0 = int($xmax / $spc + 0.5) * $spc;    # get value of last x label
+        for ($i=0, $x=$x0; $i<3; ++$i, $x-=$spc) {
+            $n = length sprintf('%g', $x);
+            $len = $n if $len < $n;
+        }
+        last if $spc >= ($len + 1) * $wch * $xdiff / $width;
+        # increase label spacing by one increment and try again
+        $spc = $dx2 = GetGridSpacing($spc, 1);
     }
-    my $n = $wch * $len * $xdiff / $dx; # conservative length of all x-axis text
-    $dx2 = GetGridSpacing($dx * $n * 1.5 / 500) if $n > 500; # use larger label spacing
-    ($grid, $lastLen) = ('', 0);
+    my ($grid, $lastLen) = ('', 0);
     for ($x=int($xmin/$dx-1)*$dx; ; $x+=$dx) {
         $px = int(($margin[0] + ($x - $xmin) * $width / $xdiff) * 10 + 0.5) / 10;
         next if $px < $margin[0] - 0.5;
         last if $px > $margin[0] + $width + 0.5;
-        if (not $dx2 or $x/$dx2 - int($x/$dx2) < 0.1) {
+        my $h = $height;
+        if (not $dx2 or abs($x/$dx2 - int($x/$dx2+($x>0 ? 0.5 : -0.5))) < 0.01) {
             printf $fp "\n<text x='${px}' y='${py}'>%g</text>", $x;
+            $h += $$tpad[1]/2;
         }
         length($grid) - $lastLen > 80 and $grid .= "\n", $lastLen = length($grid);
-        $grid .= sprintf("M$px $margin[1] v$height ");
+        $grid .= sprintf("M$px $margin[1] v$h ");
     }
     print $fp "\n<path stroke='$$self{grid}' stroke-width='0.5' d='\n${grid}'/>";
     print $fp "\n</g>\n<!-- Y axis -->\n<g dominant-baseline='middle' text-anchor='end'>";
-    $px = int(($margin[0] - $$self{txtPad}[0]) * 10 + 0.5) / 10;
+    $px = int(($margin[0] - $$tpad[0]) * 10 + 0.5) / 10;
     ($grid, $lastLen) = ('', 0);
+    my ($gx, $gw) = ($margin[0]-$$tpad[0]/2, $width + $$tpad[0]/2);
     for ($y=$min; ; $y+=$dy) {
         $py = int(($margin[1] + $height - ($y - $min) * $yscl) * 10 + 0.5) / 10;
         last if $py < $margin[1] - 0.5;
-        $y = 0 if $y < $dy/2 and $y > -$dy/2; # (avoid round-off errors)
+        $y = 0 if $y < $dy/2 and $y > -$dy/2;       # (avoid round-off errors)
         printf $fp "\n<text x='${px}' y='${py}'>%g</text>", $y;
-        $y < $dy/2 and $y > -$dy/2 and $xAxis = 1, next;    # draw x axis later
+        $y < $dy/2 and $y > -$dy/2 and $xAxis = 1;  # redraw x axis later
         length($grid) - $lastLen > 80 and $grid .= "\n", $lastLen = length($grid);
-        $grid .= "M$margin[0] $py h$width ";
+        $grid .= "M$gx $py h$gw ";
     }
     if ($xAxis and $min!=0) {
         $py = $margin[1] + $height + $min * $yscl;
-        print $fp "\n<path stroke='$$self{text}' d='M$margin[0] $py h${width}'/>";
+        print $fp "\n<path stroke='$$self{text}' d='M$margin[0] $py h$width'/>";
     }
     print $fp "\n<path stroke='$$self{grid}' stroke-width='0.5' d='\n${grid}'/>";
-    print $fp "\n</g>\n<!-- Plot box and legend-->\n<g dominant-baseline='middle' text-anchor='start'>";
+    print $fp "\n</g>\n<!-- Plot box and legend -->\n<g dominant-baseline='middle' text-anchor='start'>";
     print $fp "\n<path stroke='$$self{text}' fill='none' d='M$margin[0] $margin[1] l0 $height $width 0 0 -$height z'/>";
     for ($i=0; $i<@name and not $noLegend; ++$i) {
-        next if $scat and not $i;
-        $x = $margin[0] + $$self{legend}[0] + 550;
-        $y = $margin[1] + $$self{legend}[1] + 15 + $$self{lineSpacing} * ($i - $scat + 0.5);
+        $x = $size[0] - $margin[2] - 175 + $$self{legend}[0];
+        $y = $margin[1] + $$self{legend}[1] + 15 + $$self{linespacing} * ($i + 0.5);
         my $col = $$cols[$i];
-        my $mark = '';
-        if ($style =~ /\b[mp]/i) { # 'm' for 'marker' or 'p' for 'point' (undocumented)
-            my $id = $markerName[$i % @markerName];
-            $mark = " marker-end='url(#$id)' fill='none'";
-        }
-        my $line = ($style =~ /\bl/i) ? ' l-20 0' : '';
-        print $fp "\n<path$mark stroke-width='2' stroke='${col}' d='M$x $y m-7 -1${line}'/>";
+        my $mark = $markID{$i} ? " marker-end='url(#$markID{$i})' fill='none'" : '';
+        my $line = ($style =~ /\bl/) ? ' l-20 0' : sprintf(' m%.4g 0', -5 * $wid);
+        my $sw = ($style =~ /\bm/ ? 1.5 : 2) * $wid; # (wider for line-only style so colour is more visible)
+        print $fp "\n<path$mark stroke-width='${sw}' stroke='${col}' d='M$x $y m-7 -1${line}'/>";
         print $fp "\n<text x='${x}' y='${y}'>$name[$i]</text>";
     }
-    my @clip = ($margin[0]-6, $margin[1]-6, $width+12, $height+12);
-    print $fp "\n</g>\n<!-- Definitions -->\n<defs>";
-    print $fp "\n<clipPath id='plot-area'><rect x='$clip[0]' y='$clip[1]' width='$clip[2]' height='$clip[3]' /></clipPath>";
-    if ($style =~ /\b[mp]/i) {
-        for ($i=0; $i<@markerName and $i<@name; ++$i) {
-            print $fp "\n<marker id='@markerName[$i]' markerWidth='12' markerHeight='12' refX='6' refY='6' markerUnits='userSpaceOnUse'>";
-            my $mark = $markerData[$i];
-            $mark =~ s/"none"/"$$cols[$i]"/ if $style =~ /\bf/i;
-            print $fp "\n$mark\n</marker>";
-        }
-        print $fp "\n</defs>\n<style>";
-        for ($i=0; $i<@markerName and $i<@name; ++$i) {
-            print $fp "\n  path.$markerName[$i] { marker: url(#$markerName[$i]) }";
-        }
-        print $fp "\n  text { fill: $$self{text}] }";
-        print $fp "\n</style>";
-    } else {
-        print $fp "\n</defs><style>\n  text { fill: $$self{text} }\n</style>";
-    }
-    print $fp "\n<g fill='none' clip-path='url(#plot-area)' stroke-linejoin='round' stroke-linecap='round' stroke-width='1.5'>";
+    # print the data
     foreach (0..$#name) {
         $col{$name[$_]} = $$cols[$_];
-        $class{$name[$_]} = $style =~ /\b[mp]/i ? ' class="' . $markerName[$_ % @markerName] . '"' : '';
+        $class{$name[$_]} = $markID{$_} ? " class='$markID{$_}'" : '';
     }
     my ($i0, $i1, $xsclr);
     my $fill = '';
@@ -429,17 +552,25 @@ sub Draw($$)
         $xscl = $width / @$hist;
         $px0 = $margin[0];
         $xsclr = int($xscl * 100 + 0.5) / 100;
-        $fill = qq( fill="$$cols[0]" style="fill-opacity: .20") if $$self{style} =~ /\bf/i;
+        if ($style =~ /\bf/) {
+            my @m = split /-/, $$marks[0];
+            my $op = $m[3] || ($style =~ /\bl/ ? 20 : 50); 
+            $fill = " fill='$$cols[0]'";
+            $fill .= " style='fill-opacity: $op%'" if $$cols[0] ne 'none';
+        }
     } else {
         $i0 = int($xmin) - 1;
         $i0 = 0 if $i0 < 0;
         $i1 = int($xmax) + 1;
     }
+    print $fp "\n</g>\n<!-- Datasets -->\n<g fill='none' clip-path='url(#plot-area)'",
+              " stroke-linejoin='round' stroke-linecap='round' stroke-width='",1.5*$wid,"'>";
+    my $doLines = $style =~ /\bl/;
     foreach (@name) {
+        my $stroke = ($hist and not $doLines) ? 'none' : $col{$_};
         my $dat = $$data{$_};
-        my $doLines = $style =~ /\bl/i;
         print $fp "\n<!-- $_ -->";
-        print $fp "\n<path$class{$_}$fill stroke='$col{$_}' d='";
+        print $fp "\n<path$class{$_}$fill stroke='${stroke}' d='";
         print $fp 'M' if $doLines;
         my $m = $doLines ? '' : ' M';
         for ($i=$i0; $i<=$i1; ++$i) {
@@ -456,12 +587,15 @@ sub Draw($$)
                     next;
                 }
             }
-            print $fp $m, ($i % 20 ? ' ' : "\n"), "$x $y";
+            print $fp $m, ($i % 10 ? ' ' : "\n"), "$x $y";
         }
         print $fp ' V', $margin[1]+$height, " H$margin[0] z" if $hist and $fill;
         print $fp "'/>";
     }
-    print $fp "\n</g></svg>\n";
+    print $fp "\n</g>";
+    print $fp "\n</g>" if $numPlots > 1;
+  }
+  print $fp "</svg>\n" or $$self{Error} = 'Error writing output plot file';
 }
 
 1;  # end
@@ -472,14 +606,92 @@ __END__
 
 Image::ExifTool::Plot - Plot tag values in SVG format
 
-=head1 SYNOPSIS
+=head1 DESCRIPTION
 
-This module is used by Image::ExifTool
+Output plots in SVG format based on  ExifTool tag information.
 
-=head1 DESCRIPTION
+=head1 METHODS
+
+=head2 new
+
+Create a new Plot object.
+
+    $plot = Image::ExifTool::Plot->new;
+
+=head2 Settings
+
+Change plot settings.
+
+=over 4
+
+=item Inputs:
+
+0) Plot object reference
+
+1) Comma-delimited string of options
+
+=item Options:
+
+  "Type=Line"           - plot type (Line, Scatter or Histogram)
+  "Style=Line"          - data style (Line, Marker and/or Fill)
+  "NBins=20"            - number of bins for histogram plot
+  "Size=800 600"        - width,height of output image
+  "Margin=60 15 15 30"  - left,top,right,bottom margins around plot area
+  "Legend=0 0"          - x,y offset to shift plot legend
+  "TxtPad=10 10"        - padding between text and x,y scale
+  "LineSpacing=20"      - spacing between text lines
+  "Stroke=1"            - plot stroke width and marker-size scaling factor
+  Title, XLabel, YLabel - plot title and x/y axis labels (no default)
+  XMin, XMax            - x axis minimum/maximum (autoscaling if not set)
+  YMin, YMax            - y axis minimum/maximum
+  Multi                 - flag to draw multiple plots, one for each dataset
+  Split                 - flag to split strings of numbers into lists
+                          (> 1 to split into lists of N items)
+  "Grid=darkgray"       - grid color
+  "Text=black"          - color of text and plot border
+  "Bkg="                - background color (default is transparent)
+  "Cols=red green blue black orange gray fuchsia brown turquoise gold"
+                        - colors for plot data
+  "Marks=circle square triangle diamond star plus pentagon left down right"
+                        - marker-shape names for each dataset
+
+=back
 
-This module contains definitions required by Image::ExifTool to plot tag
-values in SVG format.
+=head2 AddPoints
+
+Add points to be plotted.
+
+=over 4
+
+=item Inputs:
+
+0) Plot object reference
+
+1) Tag information hash reference from ExifTool
+
+2) List of tag keys to plot
+
+=back
+
+=head2 Draw
+
+Draw the SVG plot to the specified output file.
+
+=over 4
+
+=item Inputs:
+
+0) Plot object reference
+
+1) Output file reference
+
+=item Notes:
+
+On return, the Plot Error and Warn members contain error or warning strings
+if there were any problems.  If an Error is set, then the output SVG is
+invalid.
+
+=back
 
 =head1 AUTHOR
 
@@ -488,5 +700,13 @@ Copyright 2003-2025, 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 SEE ALSO
+
+=over 4
+
+=item L<https://exiftool.org/plot.html>
+
+=back
+
 =cut
 

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

@@ -30,7 +30,7 @@ use strict;
 use vars qw($VERSION $AUTOLOAD);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.71';
+$VERSION = '1.70';
 
 sub ConvertTimecode($);
 sub ProcessSGLT($$$);
@@ -1319,9 +1319,9 @@ my %code2charset = (
         Name => 'ImageWidth',
         Format => 'int16u',
         Priority => 0,
-        # add " Lossless" to FileType since image has a VP8L (lossless) chunk
+        # add " (lossless)" to FileType since image has a VP8L (lossless) chunk
         RawConv => q{
-            $self->OverrideFileType($$self{VALUE}{FileType} . ' Lossless', undef, 'webp');
+            $self->OverrideFileType($$self{VALUE}{FileType} . ' (lossless)', undef, 'webp');
             return $val;
         },
         ValueConv => '($val & 0x3fff) + 1',

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 28526 tags, with 17595 unique tag names.
+They contain a total of 28534 tags, with 17595 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
@@ -11561,6 +11561,9 @@ for a given protocol should be considered to have the default value of 0.
   'dvtm_ac203_3-2-2-1'      ISO                 no
   'dvtm_ac203_3-2-4-1'      ShutterSpeed        no
   'dvtm_ac203_3-2-6-1'      ColorTemperature    no
+  'dvtm_ac203_3-2-10-2'     AccelerometerX      no
+  'dvtm_ac203_3-2-10-3'     AccelerometerY      no
+  'dvtm_ac203_3-2-10-4'     AccelerometerZ      no
   'dvtm_ac203_3-4-2-1'      GPSInfo             DJI GPSInfo
   'dvtm_ac203_3-4-2-2'      GPSAltitude         no
   'dvtm_ac203_3-4-2-6-1'    GPSDateTime         no
@@ -11569,6 +11572,9 @@ for a given protocol should be considered to have the default value of 0.
   'dvtm_ac204_2-3'          FrameInfo           DJI FrameInfo
   'dvtm_ac204_3-2-4-1'      ShutterSpeed        no
   'dvtm_ac204_3-2-6-1'      ColorTemperature    no
+  'dvtm_ac204_3-2-10-2'     AccelerometerX      no
+  'dvtm_ac204_3-2-10-3'     AccelerometerY      no
+  'dvtm_ac204_3-2-10-4'     AccelerometerZ      no
   'dvtm_ac204_3-4-2-1'      GPSInfo             DJI GPSInfo
   'dvtm_ac204_3-4-2-2'      GPSAltitude         no
   'dvtm_ac204_3-4-2-6-1'    GPSDateTime         no
@@ -11577,6 +11583,7 @@ for a given protocol should be considered to have the default value of 0.
   'dvtm_pm320_2-2'          FrameInfo           DJI FrameInfo
   'dvtm_pm320_3-2-2-1'      ISO                 no
   'dvtm_pm320_3-2-3-1'      ShutterSpeed        no
+  'dvtm_pm320_3-2-4-1'      FNumber             no
   'dvtm_pm320_3-2-6-1'      DigitalZoom         no
   'dvtm_pm320_3-3-3'        DroneInfo           DJI DroneInfo
   'dvtm_pm320_3-3-4-1'      GPSInfo             DJI GPSInfo
@@ -28670,6 +28677,7 @@ check if speed is more of a concern.
   'gIFg'             GIFGraphicControlExtension no
   'gIFt'             GIFPlainTextExtension      no
   'gIFx'             GIFApplicationExtension    no
+  'gdAT'             GainMapImage               no
   'hIST'             PaletteHistogram           no
   'iCCP'             ICC_Profile                ICC_Profile
   'iCCP-name'        ProfileName                yes

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

@@ -12,7 +12,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.00';
+$VERSION = '1.01';
 
 %Image::ExifTool::Trailer::Vivo = (
     GROUPS => { 0 => 'Trailer', 1 => 'Vivo', 2 => 'Image' },
@@ -271,7 +271,7 @@ sub ProcessGoogle($$)
             DataPos => $start + $pos,
             DirLen  => $$len[$i],
         });
-        $et->HandleTag($tagTable, $$tag[$i], \$buff, { DataPos => $start + $pos, DataPt => \$buff });
+        $et->HandleTag($tagTable, $$tag[$i], \$buff, DataPos => $start + $pos, DataPt => \$buff);
         # (haven't seen non-zero padding, but I assume this is how it works
         $pos += $$len[$i] + (($pad and $$pad[$i]) ? $$pad[$i] : 0);
     }

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

@@ -2269,6 +2269,11 @@ NoOverwrite:            next if $isNew > 0;
             # build list of offsets to process
             my @offsetList;
             if ($ifd >= 0) {
+                $dirName = $$dirInfo{DirName} || 'unknown';
+                if ($ifd) {
+                    $dirName =~ s/\d+$//;
+                    $dirName .= $ifd;
+                }
                 my $offsetInfo = $offsetInfo[$ifd] or next;
                 if ($$offsetInfo{0x111} and $$offsetInfo{0x144}) {
                     # SubIFD may contain double-referenced data as both strips and tiles

data/bin/lib/Image/ExifTool.pm

@@ -29,7 +29,7 @@ use vars qw($VERSION $RELEASE @ISA @EXPORT_OK %EXPORT_TAGS $AUTOLOAD @fileTypes
             %jpegMarker %specialTags %fileTypeLookup $testLen $exeDir
             %static_vars $advFmtSelf);
 
-$VERSION = '13.21';
+$VERSION = '13.22';
 $RELEASE = '';
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (

data/bin/lib/Image/ExifTool.pod

@@ -1009,16 +1009,20 @@ values are:
   "Legend=0 0"          - x,y offset to shift plot legend
   "TxtPad=10 10"        - padding between text and x,y scale
   "LineSpacing=20"      - spacing between text lines
+  "Stroke=1"            - plot stroke width and marker-size scaling
   Title, XLabel, YLabel - plot title and x/y axis labels (no default)
   XMin, XMax            - x axis minimum/maximum (autoscaling if not set)
   YMin, YMax            - y axis minimum/maximum
+  Multi                 - flag to draw multiple plots, one for each dataset
   Split                 - flag to split strings of numbers into lists
                           (> 1 to split into lists of N items)
   "Grid=darkgray"       - grid color
   "Text=black"          - color of text and plot border
   "Bkg="                - background color (default is transparent)
-  "Cols=red green blue black orange gray purple cyan brown pink"
-                       - colors for plot data
+  "Cols=red green blue black orange gray fuchsia brown turquoise gold"
+                        - colors for plot data
+  "Marks=circle square triangle diamond star plus pentagon left down right"
+                        - marker-shape names for each dataset
 
 =item PrintConv
 

data/bin/perl-Image-ExifTool.spec

@@ -1,6 +1,6 @@
 Summary: perl module for image data extraction
 Name: perl-Image-ExifTool
-Version: 13.21
+Version: 13.22
 Release: 1
 License: Artistic/GPL
 Group: Development/Libraries/Perl

data/lib/exiftool_vendored/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ExiftoolVendored
-  VERSION = Gem::Version.new('13.21.0')
+  VERSION = Gem::Version.new('13.22.0')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exiftool_vendored
 version: !ruby/object:Gem::Version
-  version: 13.21.0
+  version: 13.22.0
 platform: ruby
 authors:
 - Matthew McEachen
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-01 00:00:00.000000000 Z
+date: 2025-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: exiftool