exiftool_vendored 9.65.0 → 9.67.0

data/bin/{Image-ExifTool-9.65 → Image-ExifTool-9.67}/html/history.html

@@ -17,13 +17,44 @@ considered development releases, and are not uploaded to <a href="http://search.
 <!-- Use line width of 80 -->
 <!-- *********************************************************************** -->
 
+<a name='v9.67'><b>July 6, 2014 - Version 9.67</b></a>
+<ul>
+<li>Added support for Sigma X3F version 4.0 files from the DP2 Quattro
+<li>Added support for Sony XAVC video files
+<li>Added a new Nikon PhaseDetectAF value
+<li>Added conversion for Casio EX-ZR300 BestShotMode (thanks Manfred)
+<li>Decode more proprietary information from some Panasonic/Leica MP4 videos
+<li>Fixed inaccuracies in decoding some SigmaRaw tags from the X3F header
+</ul>
+
+<a name='v9.66'><b>July 1, 2014 - Version 9.66</b></a>
+<ul>
+<li>Added read support for Kodak PixPro S-1 maker notes
+<li>Added new Canon, Pentax and Sigma LensTypes (thanks LibRaw for the Canon)
+<li>Added support for Sigma DP2 Quattro maker notes
+<li>Decode AFMicroAdj for Sony A77M2
+<li>Improved decoding of Pentax K-3 AFPointSelected (thanks Dan)
+<li>Swap "GPS track start/end" labels in -geotag -v2 output if track is stored
+    in reverse chronological order
+<li>Changed handling of IPTC groups so that standard IPTC always has a family 1
+    group name of "IPTC", and takes priority over non-standard IPTC when
+    duplicates are not allowed
+<li>Patched to recognize incorrect XMP URI's written by Nikon NX2
+<li>Fixed problem with possible duplication of lens names when attempting to
+    identify lens used by a Nikon camera from a Photoshop-mangled image
+<li>Fixed problem parsing some NMEA sentences, and added support for GPZDA
+<li>Fixed typo in a CanonCustom value
+<li>Fixed bug where standard IPTC may be incorrectly written into a proprietary
+    PhotoMechanic IPTC-format SoftEdit record
+</ul>
+
 <a name='v9.65'><b>June 20, 2014 - Version 9.65</b></a>
 <ul>
-<li>Added LargeTags shortcut
 <li>Added a new Olympus LensType (thanks Niels Kristian Bech Jensen)
+<li>Added a print conversion for Unknown ICC_Profile MeasurementGeometry
+<li>Added LargeTags shortcut
 <li>Avoid loading data for some tags with large binary data values if they were
     specifically excluded by the command
-<li>Added a print conversion for Unknown ICC_Profile MeasurementGeometry
 <li>Improved memory handling when processing CanonVRD information
 <li>Patched potential "subscript -1" runtime error when reading EPS files
 </ul>

data/bin/{Image-ExifTool-9.65 → Image-ExifTool-9.67}/html/index.html

@@ -74,9 +74,9 @@ span.sup        { font-size: 0.8em; font-weight: normal; position: relative; top
 </div>
 
 <blockquote><table class='dl lg'><tr><td><b>
-<a href="Image-ExifTool-9.65.tar.gz">
-Download        Version 9.65</a> (3.7 MB) -
-<a href="history.html">June 20, 2014</a></b></td></tr></table></blockquote>
+<a href="Image-ExifTool-9.67.tar.gz">
+Download        Version 9.67</a> (3.7 MB) -
+<a href="history.html">July 6, 2014</a></b></td></tr></table></blockquote>
 
 <p><b>ExifTool is a platform-independent <a href="ExifTool.html">Perl
 library</a> plus a <a href="exiftool_pod.html">command-line application</a> for
@@ -125,8 +125,8 @@ distribution above.)</i></p>
 
 <blockquote><table class='dl lg'><tr><td><b>
 <a name="alone">Windows Executable:</a>
-<a href="exiftool-9.65.zip">
-         exiftool-9.65.zip</a> (3.7 MB)</b></td></tr></table></blockquote>
+<a href="exiftool-9.67.zip">
+         exiftool-9.67.zip</a> (3.7 MB)</b></td></tr></table></blockquote>
 
 <p><b>The stand-alone Windows executable</b> does not require Perl. Just
 download and un-zip the archive then double-click on
@@ -137,8 +137,8 @@ of Windows (including Windows 7).</p>
 
 <blockquote><table class='dl lg'><tr><td><b>
 Mac OS X Package:
-<a href="ExifTool-9.65.dmg">
-         ExifTool-9.65.dmg</a> (2.4 MB)</b></td></tr></table></blockquote>
+<a href="ExifTool-9.67.dmg">
+         ExifTool-9.67.dmg</a> (2.4 MB)</b></td></tr></table></blockquote>
 
 <p><b>The OS X package</b> installs the ExifTool command-line application and
 libraries in /usr/bin. After installing, type "<code>exiftool</code>" in a

data/bin/{Image-ExifTool-9.65 → Image-ExifTool-9.67}/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.65';
+$VERSION = '9.67';
 $RELEASE = '';
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (

data/bin/{Image-ExifTool-9.65 → Image-ExifTool-9.67}/lib/Image/ExifTool.pod

@@ -827,9 +827,9 @@ list below.  Default is 'wcg'.
     c - Create new tags
     g - create new Groups as necessary
 
-The level of the group is the SubDirectory level in the metadata structure. 
-For XMP or IPTC this is the full XMP/IPTC block (the family 0 group), but
-for EXIF this is the individual IFD (the family 1 group).
+The level of the group differs for different types of metadata. For XMP or
+IPTC this is the full XMP/IPTC block (the family 0 group), but for EXIF this
+is the individual IFD (the family 1 group).
 
 =item XMPAutoConv
 

data/bin/{Image-ExifTool-9.65 → Image-ExifTool-9.67}/lib/Image/ExifTool/BuildTagLookup.pm

@@ -32,7 +32,7 @@ use Image::ExifTool::XMP;
 use Image::ExifTool::Canon;
 use Image::ExifTool::Nikon;
 
-$VERSION = '2.78';
+$VERSION = '2.79';
 @ISA = qw(Exporter);
 
 sub NumbersFirst;
@@ -374,6 +374,13 @@ doesn't include a timezone then the current local timezone offset is used
 (unless written with a combined date/time, in which case the local timezone
 offset at the specified date/time is used, which may be different due to
 changes in daylight savings time).
+
+Note that it is not uncommon for IPTC to be found in non-standard locations
+in JPEG and TIFF-based images.  When reading, the family 1 group name has a
+number added for non-standard IPTC ("IPTC2", "IPTC3", etc), but when writing
+only "IPTC" may be specified as the group.  To keep the IPTC consistent,
+ExifTool updates tags in all existing IPTC locations, but will create a new
+IPTC group only in the standard location.
 },
     Photoshop => q{
 Photoshop tags are found in PSD and PSB files, as well as inside embedded

data/bin/{Image-ExifTool-9.65 → Image-ExifTool-9.67}/lib/Image/ExifTool/Canon.pm

@@ -82,7 +82,7 @@ sub ProcessSerialData($$$);
 sub ProcessFilters($$$);
 sub SwapWords($);
 
-$VERSION = '3.33';
+$VERSION = '3.34';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
@@ -263,9 +263,10 @@ $VERSION = '3.33';
     161 => 'Canon EF 28-70mm f/2.8L or Sigma or Tamron Lens',
     161.1 => 'Sigma 24-70mm f/2.8 EX',
     161.2 => 'Sigma 28-70mm f/2.8 EX', #PH (http://www.breezesys.com/forum/showthread.php?t=3718)
-    161.3 => 'Tamron AF 17-50mm f/2.8 Di-II LD Aspherical', #40
-    161.4 => 'Tamron 90mm f/2.8',
-    161.5 => 'Sigma 24-60mm f/2.8 EX DG', #PH (http://www.lensrentals.com/blog/2012/08/canon-illumination-correction-and-third-party-lenses)
+    161.3 => 'Sigma 24-60mm f/2.8 EX DG', #PH (http://www.lensrentals.com/blog/2012/08/canon-illumination-correction-and-third-party-lenses)
+    161.4 => 'Tamron AF 17-50mm f/2.8 Di-II LD Aspherical', #40
+    161.5 => 'Tamron 90mm f/2.8',
+    161.6 => 'Tamron SP AF 17-35mm f/2.8-4 Di LD Aspherical IF', #52 (A05)
     162 => 'Canon EF 200mm f/2.8L', #32
     163 => 'Canon EF 300mm f/4L', #32
     164 => 'Canon EF 400mm f/5.6L', #32

data/bin/{Image-ExifTool-9.65 → Image-ExifTool-9.67}/lib/Image/ExifTool/CanonCustom.pm

@@ -19,7 +19,7 @@ use Image::ExifTool qw(:DataAccess);
 use Image::ExifTool::Canon;
 use Image::ExifTool::Exif;
 
-$VERSION = '1.48';
+$VERSION = '1.49';
 
 sub ProcessCanonCustom($$$);
 sub ProcessCanonCustom2($$$);
@@ -1863,7 +1863,7 @@ my %convPFn = ( PrintConv => \&ConvertPfn, PrintConvInv => \&ConvertPfnInv );
     0x0516 => { # new for 7D and 1DmkIV
         Name => 'OrientationLinkedAFPoint',
         PrintConv => {
-            0 => 'Same for verical and horizontal',
+            0 => 'Same for vertical and horizontal',
             1 => 'Select different AF points',
         },
     },

data/bin/{Image-ExifTool-9.65 → Image-ExifTool-9.67}/lib/Image/ExifTool/Casio.pm

@@ -21,7 +21,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.35';
+$VERSION = '1.36';
 
 # older Casio maker notes (ref 1)
 %Image::ExifTool::Casio::Main = (
@@ -1510,6 +1510,50 @@ $VERSION = '1.35';
             # this camera also supports 100 modes that you can apparently load
             # from a CD-ROM, but I don't know how these map into these numbers
         },
+    },{ #Manfred, email
+        Name => 'BestShotMode',
+        Writable => 'int16u',
+        Condition => '$$self{Model} eq "EX-ZR300"',
+        Notes => 'EX-ZR300',
+        PrintConvColumns => 2,
+        PrintConv => {
+            1 => 'High Speed Night Shot',
+            2 => 'Blurred Background',
+            3 => 'Toy Camera',
+            4 => 'Soft Focus',
+            5 => 'Light Tone',
+            6 => 'Pop',
+            7 => 'Sepia',
+            8 => 'Monochrome',
+            9 => 'Miniature',
+            10 => 'Wide Shot',
+            11 => 'High Speed Best Selection',
+            12 => 'Lag Correction',
+            13 => 'High Speed Night Scene',
+            14 => 'High Speed Night Scene and Portrait',
+            15 => 'High Speed Anti Shake',
+            16 => 'Portrait',
+            17 => 'Scenery',
+            18 => 'Portrait with Scenery',
+            19 => 'Children',
+            20 => 'Sports',
+            21 => 'Candlelight Portrait',
+            22 => 'Party',
+            23 => 'Pet',
+            24 => 'Flower',
+            25 => 'Natural Green',
+            26 => 'Autumn Leaves',
+            27 => 'Soft Flowing Water',
+            28 => 'Splashing Water',
+            29 => 'Sundown',
+            30 => 'Fireworks',
+            31 => 'Food',
+            32 => 'Text',
+            33 => 'Collection',
+            34 => 'Auction',
+            35 => 'Prerecord (Movie)',
+            36 => 'For YouTube',
+        },
     },{
         Name => 'BestShotMode',
         Writable => 'int16u',

data/bin/{Image-ExifTool-9.65 → Image-ExifTool-9.67}/lib/Image/ExifTool/Geotag.pm

@@ -22,7 +22,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:Public);
 
-$VERSION = '1.41';
+$VERSION = '1.43';
 
 sub JITTER() { return 2 }       # maximum time jitter
 
@@ -177,7 +177,7 @@ sub LoadTrackLog($$;$)
                 $format = 'XML';
             # check for NMEA sentence
             # (must ONLY start with ones that have timestamps! eg. not GSA or PTNTHPR!)
-            } elsif (/^\$(GP(RMC|GGA|GLL)|PMGNTRK),/) {
+            } elsif (/^\$(GP(RMC|GGA|GLL|ZDA)|PMGNTRK),/) {
                 $format = 'NMEA';
                 $nmeaStart = $2 || $1;    # save type of first sentence
             } elsif (/^A(FLA|XSY|FIL)/) {
@@ -306,7 +306,7 @@ sub LoadTrackLog($$;$)
         my (%fix, $secs, $date, $nmea);
         if ($format eq 'NMEA') {
             # ignore unrecognized NMEA sentences
-            next unless /^\$(GP(RMC|GGA|GLL|GSA)|PMGNTRK|PTNTHPR),/;
+            next unless /^\$(GP(RMC|GGA|GLL|GSA|ZDA)|PMGNTRK|PTNTHPR),/;
             $nmea = $2 || $1;
         }
 #
@@ -333,8 +333,9 @@ sub LoadTrackLog($$;$)
 #
         } elsif ($nmea eq 'RMC') {
             #  $GPRMC,092204.999,A,4250.5589,S,14718.5084,E,0.00,89.68,211200,,*25
+            #  $GPRMC,093657.007,,3652.835020,N,01053.104094,E,1.642,,290913,,,A*0F
             #  $GPRMC,hhmmss.sss,A/V,ddmm.mmmm,N/S,ddmmm.mmmm,E/W,spd(knots),dir(deg),DDMMYY,,*cs
-            /^\$GPRMC,(\d{2})(\d{2})(\d+)(\.\d+)?,A,(\d*?)(\d{1,2}\.\d+),([NS]),(\d*?)(\d{1,2}\.\d+),([EW]),(\d*\.?\d*),(\d*\.?\d*),(\d{2})(\d{2})(\d+)/ or next;
+            /^\$GPRMC,(\d{2})(\d{2})(\d+(\.\d*)?),A?,(\d*?)(\d{1,2}\.\d+),([NS]),(\d*?)(\d{1,2}\.\d+),([EW]),(\d*\.?\d*),(\d*\.?\d*),(\d{2})(\d{2})(\d+)/ or next;
             next if $13 > 31 or $14 > 12 or $15 > 99;   # validate day/month/year
             $fix{lat} = (($5 || 0) + $6/60) * ($7 eq 'N' ? 1 : -1);
             $fix{lon} = (($8 || 0) + $9/60) * ($10 eq 'E' ? 1 : -1);
@@ -342,22 +343,21 @@ sub LoadTrackLog($$;$)
             $fix{track} = $12 if length $12;
             my $year = $15 + ($15 >= 70 ? 1900 : 2000);
             $secs = (($1 * 60) + $2) * 60 + $3;
-            $secs += $4 if $4;      # add fractional seconds
             $date = Time::Local::timegm(0,0,0,$13,$14-1,$year-1900);
 #
 # NMEA GGA sentence (no date)
 #
         } elsif ($nmea eq 'GGA') {
             #  $GPGGA,092204.999,4250.5589,S,14718.5084,E,1,04,24.4,19.7,M,,,,0000*1F
+            #  $GPGGA,093657.000,3652.835020,N,01053.104094,E,,8,,166.924,M,40.9,M,,*77
             #  $GPGGA,hhmmss.sss,ddmm.mmmm,N/S,dddmm.mmmm,E/W,0=invalid,sats,hdop,alt,M,...
-            /^\$GPGGA,(\d{2})(\d{2})(\d+)(\.\d+)?,(\d*?)(\d{1,2}\.\d+),([NS]),(\d*?)(\d{1,2}\.\d+),([EW]),[1-6],(\d+)?,(\.\d+|\d+\.?\d*)?,(-?\d+\.?\d*)?,M?,/ or next;
+            /^\$GPGGA,(\d{2})(\d{2})(\d+(\.\d*)?),(\d*?)(\d{1,2}\.\d+),([NS]),(\d*?)(\d{1,2}\.\d+),([EW]),[1-6]?,(\d+)?,(\.\d+|\d+\.?\d*)?,(-?\d+\.?\d*)?,M?,/ or next;
             $fix{lat} = (($5 || 0) + $6/60) * ($7 eq 'N' ? 1 : -1);
             $fix{lon} = (($8 || 0) + $9/60) * ($10 eq 'E' ? 1 : -1);
             $fix{nsats} = $11;
             $fix{hdop} = $12;
             $fix{alt} = $13;
             $secs = (($1 * 60) + $2) * 60 + $3;
-            $secs += $4 if $4;      # add fractional seconds
             $canCut = 1;
 #
 # NMEA GLL sentence (no date)
@@ -365,11 +365,10 @@ sub LoadTrackLog($$;$)
         } elsif ($nmea eq 'GLL') {
             #  $GPGLL,4250.5589,S,14718.5084,E,092204.999,A*2D
             #  $GPGLL,ddmm.mmmm,N/S,dddmm.mmmm,E/W,hhmmss.sss,A/V*cs
-            /^\$GPGLL,(\d*?)(\d{1,2}\.\d+),([NS]),(\d*?)(\d{1,2}\.\d+),([EW]),(\d{2})(\d{2})(\d+)(\.\d+),A/ or next;
+            /^\$GPGLL,(\d*?)(\d{1,2}\.\d+),([NS]),(\d*?)(\d{1,2}\.\d+),([EW]),(\d{2})(\d{2})(\d+(\.\d*)?),A/ or next;
             $fix{lat} = (($1 || 0) + $2/60) * ($3 eq 'N' ? 1 : -1);
             $fix{lon} = (($4 || 0) + $5/60) * ($6 eq 'E' ? 1 : -1);
             $secs = (($7 * 60) + $8) * 60 + $9;
-            $secs += $10 if $10;    # add fractional seconds
 #
 # NMEA GSA sentence (satellite status, no date)
 #
@@ -382,17 +381,25 @@ sub LoadTrackLog($$;$)
             $fix{nsats} = scalar @a;
             $canCut = 1;
 #
+# NMEA ZDA sentence (date/time, contains date)
+#
+        } elsif ($nmea eq 'ZDA') {
+            #  $GPZDA,093655.000,29,09,2013,,*58
+            #  $GPZDA,hhmmss.ss,DD,MM,YYYY,tzh,tzm (hhmmss in UTC)
+            /^\$GPZDA,(\d{2})(\d{2})(\d{2}(\.\d*)?),(\d+),(\d+),(\d+)/ or next;
+            $secs = (($1 * 60) + $2) * 60 + $3;
+            $date = Time::Local::timegm(0,0,0,$5,$6-1,$7-1900);
+#
 # Magellan eXplorist PMGNTRK (Proprietary MaGellaN TRacK) sentence (optional date)
 #
         } elsif ($nmea eq 'PMGNTRK') {
             # $PMGNTRK,4415.026,N,07631.091,W,00092,M,185031.06,A,,020409*65
             # $PMGNTRK,ddmm.mmm,N/S,dddmm.mmm,E/W,alt,F/M,hhmmss.ss,A/V,trkname,DDMMYY*cs
-            /^\$PMGNTRK,(\d+)(\d{2}\.\d+),([NS]),(\d+)(\d{2}\.\d+),([EW]),(-?\d+\.?\d*),([MF]),(\d{2})(\d{2})(\d+)(\.\d+)?,A,(?:[^,]*,(\d{2})(\d{2})(\d+))?/ or next;
+            /^\$PMGNTRK,(\d+)(\d{2}\.\d+),([NS]),(\d+)(\d{2}\.\d+),([EW]),(-?\d+\.?\d*),([MF]),(\d{2})(\d{2})(\d+(\.\d*)?),A,(?:[^,]*,(\d{2})(\d{2})(\d+))?/ or next;
             $fix{lat} = ($1 + $2/60) * ($3 eq 'N' ? 1 : -1);
             $fix{lon} = ($4 + $5/60) * ($6 eq 'E' ? 1 : -1);
             $fix{alt} = $8 eq 'M' ? $7 : $7 * 12 * 0.0254;
             $secs = (($9 * 60) + $10) * 60 + $11;
-            $secs += $12 if $12;    # add fractional seconds
             if (defined $15) {
                 next if $13 > 31 or $14 > 12 or $15 > 99;   # validate day/month/year
                 # optional date is available in PMGNTRK sentence
@@ -555,11 +562,14 @@ sub LoadTrackLog($$;$)
         print $out "Ignored $cutHDOP points due to GeoMaxHDOP cut\n" if $cutHDOP;
         print $out "Ignored $cutSats points due to GeoMinSats cut\n" if $cutSats;
         if ($numPoints and $verbose > 1) {
-            print $out '  GPS track start: ' . Image::ExifTool::ConvertUnixTime($fixTimes[0]) . " UTC\n";
+            my @lbl = ('start:', 'end:  ');
+            # (fixes may be in reverse order in GPX files)
+            @lbl = reverse @lbl if $fixTimes[0] > $fixTimes[-1];
+            print $out "  GPS track $lbl[0] " . Image::ExifTool::ConvertUnixTime($fixTimes[0]) . " UTC\n";
             if ($verbose > 3) {
                 print $out PrintFix($points, $_) foreach @fixTimes;
             }
-            print $out '  GPS track end:   ' . Image::ExifTool::ConvertUnixTime($fixTimes[-1]) . " UTC\n";
+            print $out "  GPS track $lbl[1] " . Image::ExifTool::ConvertUnixTime($fixTimes[-1]) . " UTC\n";
         }
     }
     if ($numPoints) {