exiftool_vendored 9.46.0 → 9.49.0

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

@@ -26,7 +26,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::FLAC;
 
-$VERSION = '1.10';
+$VERSION = '1.11';
 
 sub ProcessMeta($$$;$);
 
@@ -557,7 +557,7 @@ sub ReadCompressed($$$$)
     # uncompress if necessary
     if ($inflate) {
         unless (ref $inflate) {
-            unless (eval 'require Compress::Zlib') {
+            unless (eval { require Compress::Zlib }) {
                 $_[3] = 'Install Compress::Zlib to extract compressed information';
                 return 0;
             }

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

@@ -15,7 +15,7 @@
 #                  and http://forum.photome.de/viewtopic.php?f=2&t=353&p=742#p740
 #               7) Kai Lappalainen private communication
 #               8) http://u88.n24.queensu.ca/exiftool/forum/index.php/topic,5223.0.html
-#               9) Iliah Borg private communication
+#               9) Iliah Borg private communication (LibRaw)
 #               JD) Jens Duttke private communication
 #------------------------------------------------------------------------------
 
@@ -26,7 +26,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.44';
+$VERSION = '1.45';
 
 sub ProcessFujiDir($$$);
 sub ProcessFaceRec($$$);
@@ -712,7 +712,8 @@ my %faceCategories = (
         OffsetPair => 0xf007,  # point to associated offsets
     },
     # 0xf009 - values: 0, 3
-    # 0xf00a-0xf00b ?
+    0xf00a => 'BlackLevel', #9
+    # 0xf00b ?
     0xf00c => 'WB_GRBLevelsStandard', #9 (GRBXGRBX; X=17 is standard illuminant A, X=21 is D65)
     0xf00d => 'WB_GRBLevelsDaylight', #9
     0xf00e => 'WB_GRBLevels',

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

@@ -4,8 +4,9 @@
 # Description:  Read GeoTiff meta information
 #
 # Revisions:    02/23/2004 - P. Harvey Created
-#               02/25/2004 - P. Harvey Added new codes from libgeotiff-1.2.1
-#               02/01/2007 - P. Harvey Added new codes from libgeotiff-1.2.3
+#               02/25/2004 - PH Added new codes from libgeotiff-1.2.1
+#               02/01/2007 - PH Added new codes from libgeotiff-1.2.3
+#               01/22/2014 - PH Added new code from libgeotiff-1.4.0
 #
 # Reference:    ftp://ftp.remotesensing.org/geotiff/libgeotiff/libgeotiff-1.1.4.tar.gz
 #------------------------------------------------------------------------------
@@ -16,7 +17,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.08';
+$VERSION = '1.09';
 
 # format codes for geoTiff directory entries
 my %geoTiffFormat = (
@@ -504,6 +505,7 @@ my %epsg_units = (
         PrintConv => \%epsg_units,
     },
     2061 => 'GeogPrimeMeridianLong',
+    2062 => 'GeogToWGS84',
     3072 => {
         Name => 'ProjectedCSType',
         PrintConv => {

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

@@ -22,7 +22,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:Public);
 
-$VERSION = '1.39';
+$VERSION = '1.40';
 
 sub JITTER() { return 2 }       # maximum time jitter
 
@@ -114,7 +114,7 @@ sub LoadTrackLog($$;$)
     my ($nmeaStart, $fixSecs, @fixTimes, $lastFix, %nmea);
     my ($canCut, $cutPDOP, $cutHDOP, $cutSats);
 
-    unless (eval 'require Time::Local') {
+    unless (eval { require Time::Local }) {
         return 'Geotag feature requires Time::Local installed';
     }
     # add data to existing track
@@ -705,7 +705,7 @@ sub SetGeoValues($$;$)
             $err = 'GPS track is empty';
             last;
         }
-        unless (eval 'require Time::Local') {
+        unless (eval { require Time::Local }) {
             $err = 'Geotag feature requires Time::Local installed';
             last;
         }

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

@@ -24,7 +24,7 @@ use vars qw($VERSION %convMake);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.10';
+$VERSION = '1.11';
 
 sub ProcessSEI($$);
 
@@ -495,7 +495,7 @@ my $parsePictureTiming; # flag to enable parsing of picture timing information (
         Name => 'ExposureTime',
         Mask => 0x7fff, # (what is bit 0x8000 for?)
         RawConv => '$val == 0x7fff ? undef : $val', #7
-        ValueConv => '$val / 33640', #PH (conversion factor determined empirically)
+        ValueConv => '$val / 28125', #PH (Vixia HF G30, ref forum5588) (was $val/33640 until 9.49)
         PrintConv => 'Image::ExifTool::Exif::PrintExposureTime($val)',
     },
 );
@@ -512,12 +512,21 @@ my $parsePictureTiming; # flag to enable parsing of picture timing information (
         RawConv => '$$self{Make} = ($Image::ExifTool::H264::convMake{$val} || "Unknown"); $val',
         PrintConv => \%convMake,
     },
-    # 1 => ModelIDCode according to ref 4/5 (I think not)
-    # vals: 0x3001 - Sony HDR-CX105E/TG3E/XR500V
+    # 1 => ModelIDCode according to ref 4/5 (I think not - PH)
+    # 1 => { Name => 'ModelIDCode', PrintConv => 'sprintf("%.4x",$val)' },
+    # vals: 0x0313 - various Pansonic HDC models
+    #       0x0345 - Panasonic HC-V7272
+    #       0x0414 - Panasonic AG-AF100
+    #       0x0591 - various Panasonic DMC models
+    #       0x3001 - various Sony DSC, HDR, NEX and SLT models
+    #       0x3003 - various Sony DSC models
+    #       0x3100 - various Sony DSC, ILCE, NEX and SLT models
     #       0x1000 - Sony HDR-UX1
-    #       0x3000 - Canon HF100 (30p)
     #       0x2000 - Canon HF100 (60i)
+    #       0x3000 - Canon HF100 (30p)
     #       0x3101 - Canon HFM300 (PH, all qualities and frame rates)
+    #       0x3102 - Canon HFS200
+    #       0x4300 - Canon HFG30
 );
 
 # camera info 0xe1 (ref 6)

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

@@ -16,7 +16,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.40';
+$VERSION = '1.41';
 
 sub ProcessID3v2($$$);
 sub ProcessPrivate($$$);
@@ -1097,7 +1097,7 @@ sub ProcessID3v2($$$)
         }
         # uncompress data
         if ($flags{Compress}) {
-            if (eval 'require Compress::Zlib') {
+            if (eval { require Compress::Zlib }) {
                 my $inflate = Compress::Zlib::inflateInit();
                 my ($buff, $stat);
                 $inflate and ($buff, $stat) = $inflate->inflate($val);

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

@@ -15,7 +15,7 @@ use strict;
 use vars qw($VERSION $AUTOLOAD %iptcCharset);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.49';
+$VERSION = '1.50';
 
 %iptcCharset = (
     "\x1b%G"  => 'UTF8',
@@ -1045,7 +1045,7 @@ sub ProcessIPTC($$$)
         my $path = $et->MetadataPath();
         if (IsStandardIPTC($path)) {
             my $md5;
-            if (eval 'require Digest::MD5') {
+            if (eval { require Digest::MD5 }) {
                 if ($pos or $dirLen != length($$dataPt)) {
                     $md5 = Digest::MD5::md5(substr $$dataPt, $pos, $dirLen);
                 } else {

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

@@ -11,9 +11,10 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.20';
+$VERSION = '1.21';
 
 sub ProcessOcad($$$);
+sub ProcessJPEG_HDR($$$);
 
 # (this main JPEG table is for documentation purposes only)
 %Image::ExifTool::JPEG::Main = (
@@ -137,11 +138,21 @@ sub ProcessOcad($$$);
         Condition => '$$valPt =~ /^SPIFF\0/',
         SubDirectory => { TagTable => 'Image::ExifTool::JPEG::SPIFF' },
     },
+    APP9 => {
+        Name => 'MediaJukebox',
+        Condition => '$$valPt =~ /^Media Jukebox\0/',
+        SubDirectory => { TagTable => 'Image::ExifTool::JPEG::MediaJukebox' },
+    },
     APP10 => {
         Name => 'Comment',
         Condition => '$$valPt =~ /^UNICODE\0/',
         Notes => 'PhotoStudio Unicode comment',
     },
+    APP11 => {
+        Name => 'JPEG-HDR',
+        Condition => '$$valPt =~ /^HDR_RI /',
+        SubDirectory => { TagTable => 'Image::ExifTool::JPEG::HDR' },
+    },
     APP12 => [{
         Name => 'PictureInfo',
         Condition => '$$valPt =~ /(\[picture info\]|Type=)/',
@@ -184,7 +195,7 @@ sub ProcessOcad($$$);
     },
     DQT => {
         Name => 'DefineQuantizationTable',
-        Notes => 'used to calculate the Extra:JPEGDigest tag value',
+        Notes => 'used to calculate the Extra JPEGDigest tag value',
     },
     Trailer => [{
         Name => 'AFCP',
@@ -321,6 +332,42 @@ sub ProcessOcad($$$);
     },
 );
 
+# Media Jukebox APP9 segment (ref PH)
+%Image::ExifTool::JPEG::MediaJukebox = (
+    GROUPS => { 0 => 'XML', 1 => 'MediaJukebox', 2 => 'Image' },
+    VARS => { NO_ID => 1 },
+    NOTES => 'Tags found in the XML metadata of the "Media Jukebox" APP9 segment.',
+    Date => {
+        Groups => { 2 => 'Time' },
+        # convert from days since Dec 30, 1899 to seconds since Jan 1, 1970
+        ValueConv => 'ConvertUnixTime(($val - (70 * 365 + 17 + 2)) * 24 * 3600)',
+        PrintConv => '$self->ConvertDateTime($val)',
+    },
+    Album        => { },
+    Name         => { },
+    People       => { },
+    Places       => { },
+    Tool_Name    => { },
+    Tool_Version => { },
+);
+
+# JPEG-HDR APP11 information (ref PH, guessed from http://anyhere.com/gward/papers/cic05.pdf)
+%Image::ExifTool::JPEG::HDR = (
+    GROUPS => { 0 => 'APP11', 1 => 'JPEG-HDR', 2 => 'Image' },
+    PROCESS_PROC => \&ProcessJPEG_HDR,
+    TAG_PREFIX => '', # (no prefix for unknown tags)
+    NOTES => 'Information extracted from APP11 of a JPEG-HDR image.',
+    ver => 'JPEG-HDRVersion',
+    # (need names for the next 3 tags)
+    ln0 => { Description => 'Ln0' },
+    ln1 => { Description => 'Ln1' },
+    s2n => { Description => 'S2n' },
+    alp => { Name => 'Alpha' }, # (Alpha/Beta are saturation parameters)
+    bet => { Name => 'Beta' },
+    cor => { Name => 'CorrectionMethod' },
+    RatioImage => { Binary => 1, Notes => 'the embedded JPEG-compressed ratio image' },
+);
+
 # AdobeCM APP13 (no references)
 %Image::ExifTool::JPEG::AdobeCM = (
     PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
@@ -396,6 +443,7 @@ sub ProcessOcad($$$);
 %Image::ExifTool::JPEG::Ocad = (
     PROCESS_PROC => \&ProcessOcad,
     GROUPS => { 0 => 'APP0', 1 => 'Ocad', 2 => 'Image' },
+    TAG_PREFIX => 'Ocad',
     FIRST_ENTRY => 0,
     NOTES => q{
         Tags extracted from the JPEG APP0 "Ocad" segment (found in Photobucket
@@ -480,11 +528,30 @@ sub ProcessOcad($$$)
         last unless $$dataPt =~ /\$(\w+):([^\0\$]+)/g;
         my ($tag, $val) = ($1, $2);
         $val =~ s/^\s+//; $val =~ s/\s+$//;     # remove leading/trailing spaces
-        unless ($$tagTablePtr{$tag}) {
-            AddTagToTable($tagTablePtr, $tag, { Name => "Ocad_$tag" });
-        }
+        AddTagToTable($tagTablePtr, $tag) unless $$tagTablePtr{$tag};
+        $et->HandleTag($tagTablePtr, $tag, $val);
+    }
+    return 1;
+}
+
+#------------------------------------------------------------------------------
+# Extract information from the JPEG APP0 Ocad segment
+# Inputs: 0) ExifTool object ref, 1) dirInfo ref, 2) tag table ref
+# Returns: 1 on success
+sub ProcessJPEG_HDR($$$)
+{
+    my ($et, $dirInfo, $tagTablePtr) = @_;
+    my $dataPt = $$dirInfo{DataPt};
+    $$dataPt =~ /~\0/g or $et->Warn('Unrecognized JPEG-HDR format'), return 0;
+    my $pos = pos $$dataPt;
+    my $meta = substr($$dataPt, 7, $pos-9);
+    $et->VerboseDir('APP11 JPEG-HDR', undef, length $$dataPt);
+    while ($meta =~ /(\w+)=([^,\s]*)/g) {
+        my ($tag, $val) = ($1, $2);
+        AddTagToTable($tagTablePtr, $tag) unless $$tagTablePtr{$tag};
         $et->HandleTag($tagTablePtr, $tag, $val);
     }
+    $et->HandleTag($tagTablePtr, 'RatioImage', substr($$dataPt, $pos));
     return 1;
 }
 

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

@@ -13,7 +13,7 @@ package Image::ExifTool::JPEGDigest;
 use strict;
 use vars qw($VERSION);
 
-$VERSION = '1.03';
+$VERSION = '1.04';
 
 # the print conversion for the JPEGDigest tag
 my %PrintConv = ( #JD
@@ -2448,7 +2448,7 @@ sub Calculate($$$)
 {
     my ($et, $dqtList, $subSampling) = @_;
 
-    unless (eval 'require Digest::MD5') {
+    unless (eval { require Digest::MD5 }) {
         $et->Warn('Digest::MD5 must be installed to calculate JPEGDigest');
         return;
     }

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

@@ -11,7 +11,7 @@ package Image::ExifTool::Lang::pl;
 use strict;
 use vars qw($VERSION);
 
-$VERSION = '1.07';
+$VERSION = '1.09';
 
 %Image::ExifTool::Lang::pl::Translate = (
    'AEAperture' => 'Priorytet AE',
@@ -453,6 +453,8 @@ $VERSION = '1.07';
    'FrameSize' => 'Wielkość kadru',
    'FreeByteCounts' => 'Liczba wolnych bajtów',
    'FreeOffsets' => 'Wolne offsety',
+   'GDALMetadata' => 'Metadane GDAL',
+   'GDALNoData' => 'Brak danych GDAL',
    'GPSAltitude' => 'Wysokość',
    'GPSAltitudeRef' => {
       Description => 'Wysokość odniesienia',
@@ -479,6 +481,7 @@ $VERSION = '1.07';
         'No Correction' => 'Pomiar bez korekcji różnicowej',
       },
     },
+   'GPSHPositioningError' => 'Błąd poziomy wyznaczenia pozycji',
    'GPSImgDirection' => 'Kierunek obrazu',
    'GPSImgDirectionRef' => 'Wartość odniesienia dla kierunku obrazu',
    'GPSInfo' => 'Wskaźnik GPS Info IFD',
@@ -578,6 +581,12 @@ $VERSION = '1.07';
         'Portrait' => 'Portret',
       },
     },
+   'ImageType' => {
+      Description => 'Rodzaj obrazu',
+      PrintConv => {
+        'Page' => 'Strona',
+      },
+    },
    'ImageUniqueID' => 'Unikalny kod ID zdjęcia',
    'ImageWidth' => 'Szerokość obrazu',
    'Index' => 'Indeks',
@@ -604,6 +613,9 @@ $VERSION = '1.07';
    'Lens' => 'Obiektyw',
    'LensID' => 'ID obiektywu',
    'LensInfo' => 'Informacja o obiektywie',
+   'LensMake' => 'Producent obiektywu',
+   'LensModel' => 'Model obiektywu',
+   'LensSerialNumber' => 'Numer seryjny obiektywu',
    'LightReading' => 'Pomiar światła',
    'LightSource' => {
       Description => 'Źródło światła',
@@ -752,6 +764,20 @@ $VERSION = '1.07';
         'None' => 'Brak',
       },
     },
+   'PixelFormat' => {
+      Description => 'Format zapisu koloru',
+      PrintConv => {
+        '128-bit PRGBA Float' => '128-bitów PRGBA (zapis zmienno przecinkowy)',
+        '128-bit RGB Float' => '128-bitów RGB (zapis zmienno przecinkowy)',
+        '128-bit RGBA Float' => '128-bitów RGBA (zapis zmienno przecinkowy)',
+        '16-bit Gray' => '16-bitów Szarość',
+        '32-bit Gray Float' => '32-bity Szarość (zapis zmienno przecinkowy)',
+        '48-bit RGB Fixed Point' => '48-bitów RGB (zapis stałopozycyjny)',
+        '8-bit Gray' => '8-bitów Szarość',
+        '96-bit RGB Fixed Point' => '96-bitów RGB (zapis stałopozycyjny)',
+        'Black & White' => 'Czarno Biały',
+      },
+    },
    'PlanarConfiguration' => {
       Description => 'Układ danych obrazu',
       PrintConv => {
@@ -1014,6 +1040,7 @@ $VERSION = '1.07';
    'Track' => 'Ścieżka',
    'TransferFunction' => 'Funkcja transferu',
    'Transformation' => {
+      Description => 'Przekształcenie',
       PrintConv => {
         'Horizontal (normal)' => '0° (góra/lewo)',
         'Mirror horizontal' => '0° (góra/prawo)',
@@ -1027,6 +1054,7 @@ $VERSION = '1.07';
     },
    'TransmissionReference' => 'Odnośnik transmisji',
    'TvExposureTimeSetting' => 'Ustawienia czasu ekspozycji TV',
+   'Uncompressed' => 'Nieskompresowany',
    'UniqueCameraModel' => 'Unikatowy model aparatu',
    'Unknown' => 'Nieznany',
    'Urgency' => 'Priorytet',