exiftool_vendored 13.31.0 → 13.36.0

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

@@ -31,7 +31,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.97';
+$VERSION = '1.99';
 
 sub ProcessFujiDir($$$);
 sub ProcessFaceRec($$$);
@@ -426,6 +426,16 @@ my %faceCategories = (
             0x300 => 'DR (Dynamic Range priority)',
         },
     },
+    0x1037 => { #forum17591
+        Name => 'MultipleExposure',
+        Writable => 'int16u', # (NC)
+        PrintConv => {
+            1 => 'Additive',
+            2 => 'Average',
+            3 => 'Light',
+            4 => 'Dark',
+        },
+    },
     0x1040 => { #8
         Name => 'ShadowTone',
         Writable => 'int32s',
@@ -586,16 +596,44 @@ my %faceCategories = (
         Name => 'SequenceNumber',
         Writable => 'int16u',
     },
+    0x1102 => { #forum17602
+        Name => 'WhiteBalanceBracketing',
+        Writable => 'int16u', # (NC)
+        PrintHex => 1,
+        PrintConv => {
+            0x01ff => '+/- 1',
+            0x02ff => '+/- 2',
+            0x03ff => '+/- 3',
+        },
+    },
     0x1103 => {
         Name => 'DriveSettings',
         SubDirectory => { TagTable => 'Image::ExifTool::FujiFilm::DriveSettings' },
     },
     0x1105 => { Name => 'PixelShiftShots',  Writable => 'int16u' }, #IB
     0x1106 => { Name => 'PixelShiftOffset', Writable => 'rational64s', Count => 2 }, #IB
-    # (0x1150-0x1152 exist only for Pro Low-light and Pro Focus PictureModes)
-    # 0x1150 - Pro Low-light - val=1; Pro Focus - val=2 (ref 7); HDR - val=128 (forum10799)
-    # 0x1151 - Pro Low-light - val=4 (number of pictures taken?); Pro Focus - val=2,3 (ref 7); HDR - val=3 (forum10799)
-    # 0x1152 - Pro Low-light - val=1,3,4 (stacked pictures used?); Pro Focus - val=1,2 (ref 7); HDR - val=3 (forum10799)
+    0x1150 => {
+        Name => 'CompositeImageMode',
+        Writable => 'int32u',
+        PrintConv => {
+            0 => 'n/a', #PH
+            1 => 'Pro Low-light', #7
+            2 => 'Pro Focus', #7
+            32 => 'Panorama', #PH
+            128 => 'HDR', #forum10799
+            1024 => 'Multi-exposure', #forum17591
+        },
+    },
+    0x1151 => {
+        Name => 'CompositeImageCount1',
+        Writable => 'int16u',
+        # Pro Low-light - val=4 (number of pictures taken?); Pro Focus - val=2,3 (ref 7); HDR - val=3 (forum10799)
+    },
+    0x1152 => {
+        Name => 'CompositeImageCount2',
+        Writable => 'int16u',
+        # Pro Low-light - val=1,3,4 (stacked pictures used?); Pro Focus - val=1,2 (ref 7); HDR - val=3 (forum10799)
+    },
     0x1153 => { #forum7668
         Name => 'PanoramaAngle',
         Writable => 'int16u',
@@ -605,8 +643,8 @@ my %faceCategories = (
         Writable => 'int16u',
         PrintConv => {
             1 => 'Right',
-            2 => 'Up',
-            3 => 'Left',
+            2 => 'Up', # (or Left?, forum17591)
+            3 => 'Left', # (or Up?, forum17591)
             4 => 'Down',
         },
     },
@@ -832,6 +870,13 @@ my %faceCategories = (
     },
     0x1447 => { Name => 'FujiModel',  Writable => 'string' },
     0x1448 => { Name => 'FujiModel2', Writable => 'string' },
+
+    # Found in X-M5, X-E5
+    # White balance as shot. Same valus as 0xf00e.
+    0x144a => { Name => 'WBRed',      Writable => 'int16u' },
+    0x144b => { Name => 'WBGreen',    Writable => 'int16u' },
+    0x144c => { Name => 'WBBlue',     Writable => 'int16u' },
+    
     0x144d => { Name => 'RollAngle',  Writable => 'rational64s' }, #forum14319
     0x3803 => { #forum10037
         Name => 'VideoRecordingMode',
@@ -1551,20 +1596,21 @@ my %faceCategories = (
     TAG_PREFIX => 'MRAW',
     NOTES => q{
         Tags extracted from the M-RAW header of multi-image RAF files.  The family 1
-        group name for these tags is "M-RAW".
-    },
-    1 => { Name => 'RawImageNumber', Format => 'int32u' },
-    # 3 - seen "0 100", "-300 100" and "300 100" for a sequence of 3 images
-    3 => { Name => 'ExposureCompensation', Format => 'rational32s', Unknown => 1, Hidden => 1, PrintConv => 'sprintf("%+.2f",$val)' },
-    # 4 - (same value as 3 in all my samples)
-    4 => { Name => 'ExposureCompensation2', Format => 'rational32s', Unknown => 1, Hidden => 1, PrintConv => 'sprintf("%+.2f",$val)' },
-    # 5 - seen "10 1600", "10 6800", "10 200", "10 35000" etc
-    5 => { Name => 'ExposureTime', Format => 'rational64u', PrintConv => 'Image::ExifTool::Exif::PrintExposureTime($val)' },
-    # 6 - seen "450 100", "400 100" (all images in RAF have same value)
-    6 => { Name => 'FNumber', Format => 'rational64u', PrintConv => 'Image::ExifTool::Exif::PrintFNumber($val)' },
-    # 7 - seen 200, 125, 250, 2000
-    7 => 'ISO',
-    # 8 - seen 0
+        group name for these tags is "M-RAW".  Additional metadata may be extracted
+        from the embedded RAW images with the ExtractEmbedded option.
+    },
+    0x2001 => { Name => 'RawImageNumber', Format => 'int32u' },
+    # 0x2003 - seen "0 100", "-300 100" and "300 100" for a sequence of 3 images
+    0x2003 => { Name => 'ExposureCompensation', Format => 'rational32s', Unknown => 1, Hidden => 1, PrintConv => 'sprintf("%+.2f",$val)' },
+    # 0x2004 - (same value as 3 in all my samples)
+    0x2004 => { Name => 'ExposureCompensation2', Format => 'rational32s', Unknown => 1, Hidden => 1, PrintConv => 'sprintf("%+.2f",$val)' },
+    # 0x2005 - seen "10 1600", "10 6800", "10 200", "10 35000" etc
+    0x2005 => { Name => 'ExposureTime', Format => 'rational64u', PrintConv => 'Image::ExifTool::Exif::PrintExposureTime($val)' },
+    # 0x2006 - seen "450 100", "400 100" (all images in RAF have same value)
+    0x2006 => { Name => 'FNumber', Format => 'rational64u', PrintConv => 'Image::ExifTool::Exif::PrintFNumber($val)' },
+    # 0x2007 - seen 200, 125, 250, 2000
+    0x2007 => 'ISO',
+    # 0x2008 - seen 0, 65536
 );
 
 #------------------------------------------------------------------------------
@@ -1673,10 +1719,11 @@ sub ProcessFujiDir($$$)
 #------------------------------------------------------------------------------
 # get information from FujiFilm M-RAW header
 # Inputs: 0) ExifTool ref, 1) dirInfo ref, 2) tag table ref
-# Returns: 1 if this was a valid M-RAW headerx
+# Returns: 1 if this was a valid M-RAW header
 sub ProcessMRAW($$$)
 {
     my ($et, $dirInfo, $tagTablePtr) = @_;
+    return 1 if $$et{DOC_NUM};
     my $dataPt = $$dirInfo{DataPt};
     my $dataPos = $$dirInfo{DataPos};
     my $dataLen = length $$dataPt;
@@ -1690,15 +1737,16 @@ sub ProcessMRAW($$$)
     my $pos = 44;
     my ($i, $n);
     for ($n=0; ; ++$n) {
-        $pos += 16;  # skip offset/size fields
-        my $end = $pos + $size;
+        my $end = $pos + 16 + $size;
         last if $end > $dataLen;
+        my $rafStart = Get64u($dataPt, $pos);
+        my $rafLen = Get64u($dataPt, $pos+8);
+        $pos += 16;  # skip offset/size fields
         $$et{DOC_NUM} = ++$$et{DOC_COUNT} if $pos > 60;
         $et->VPrint(0, "$$et{INDENT}(Raw image $n parameters: $size bytes, $num entries)\n");
         for ($i=0; $i<$num; ++$i) {
             last if $pos + 4 > $end;
-            # (don't know what the byte at the current $pos is for, value = 0x20)
-            my $tag = Get8u($dataPt, $pos+1);
+            my $tag = Get16u($dataPt, $pos);
             my $size = Get16u($dataPt, $pos+2);
             $pos += 4;
             last if $pos + $size > $end;
@@ -1710,6 +1758,21 @@ sub ProcessMRAW($$$)
             );
             $pos += $size;
         }
+        if ($rafStart and $et->Options('ExtractEmbedded')) {
+            if ($et->Options('Verbose')) {
+                my $msg = sprintf("$$et{INDENT}(RAW image $n data: Start=0x%x, Length=0x%x)\n",$rafStart,$rafLen);
+                $et->VPrint(0, $msg);
+            }
+            my $raf = $$et{RAF};
+            my $tell = $raf->Tell();
+            my $order = GetByteOrder();
+            my $fujiWidth = $$et{FujiWidth};
+            $raf->Seek($rafStart, 0) or next;
+            ProcessRAF($et, { RAF => $raf, Base => $rafStart });
+            $$et{FujiWidth} = $fujiWidth;
+            SetByteOrder($order);
+            $raf->Seek($tell, 0);
+        }
     }
     delete $$et{DOC_NUM};
     return 1;
@@ -1863,6 +1926,7 @@ sub ProcessRAF($$)
     my ($buff, $jpeg, $warn, $offset);
 
     my $raf = $$dirInfo{RAF};
+    my $base = $$dirInfo{Base} || 0;
     $raf->Read($buff,0x70) == 0x70    or return 0;
     $buff =~ /^FUJIFILM/              or return 0;
     # get position and size of M-RAW header and jpeg preview
@@ -1870,13 +1934,13 @@ sub ProcessRAF($$)
     my ($jpos, $jlen) = unpack('x84NN', $buff);
     $jpos & 0x8000                   and return 0;
     if ($jpos) {
-        $raf->Seek($jpos, 0)              or return 0;
+        $raf->Seek($jpos+$base, 0)        or return 0;
         $raf->Read($jpeg, $jlen) == $jlen or return 0;
     }
     SetByteOrder('MM');
-    $et->SetFileType();
+    $et->SetFileType() unless $$et{DOC_NUM};
     my $tbl = GetTagTable('Image::ExifTool::FujiFilm::RAFHeader');
-    $et->ProcessDirectory({ DataPt => \$buff, DirName => 'RAFHeader' }, $tbl);
+    $et->ProcessDirectory({ DataPt => \$buff, DirName => 'RAFHeader', Base => $base }, $tbl);
     
     # extract information from embedded JPEG
     my %dirInfo = (
@@ -1884,21 +1948,22 @@ sub ProcessRAF($$)
         RAF    => File::RandomAccess->new(\$jpeg),
     );
     if ($jpos) {
-        $$et{BASE} += $jpos;
+        $$et{BASE} += $jpos + $base;
         my $ok = $et->ProcessJPEG(\%dirInfo);
-        $$et{BASE} -= $jpos;
+        $$et{BASE} -= $jpos + $base;
         $et->FoundTag('PreviewImage', \$jpeg) if $ok;
     }
     # extract information from Fuji RAF and TIFF directories
     my ($rafNum, $ifdNum) = ('','');
     foreach $offset (0x48, 0x5c, 0x64, 0x78, 0x80) {
         last if $jpos and $offset >= $jpos;
-        unless ($raf->Seek($offset, 0) and $raf->Read($buff, 8)) {
+        unless ($raf->Seek($offset+$base, 0) and $raf->Read($buff, 8)) {
             $warn = 1;
             last;
         }
         my ($start, $len) = unpack('N2',$buff);
         next unless $start;
+        $start += $base;
         if ($offset == 0x64 or $offset == 0x80) {
             # parse FujiIFD directory
             %dirInfo = (

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

@@ -18,6 +18,8 @@
 #               2024/04/23 - PH Added ability to read more OpenTracks GPS tags
 #               2024/08/28 - PH Added support for new Google Takeout JSON format
 #               2024/11/26 - PH Also write GPSMeasureMode and GPSDOP
+#               2024/11/05 - PH Added support for Google Maps "Export timeline data"
+#                               JSON format
 #
 # References:   1) http://www.topografix.com/GPX/1/1/
 #               2) http://www.gpsinformation.org/dale/nmea.htm#GSA
@@ -1545,9 +1547,9 @@ This module is used by Image::ExifTool
 
 This module loads GPS track logs, interpolates to determine position based
 on time, and sets new GPS values for geotagging images.  Currently supported
-formats are GPX, NMEA RMC/GGA/GLL, KML, IGC, Garmin XML and TCX, Magellan
-PMGNTRK, Honeywell PTNTHPR, Bramor gEO, Winplus Beacon text, Google Takeout
-JSON, GPS/IMU CSV, DJI CSV, ExifTool CSV log files.
+formats are GPX, NMEA RMC/GGA/GLL/GSA/ZDA, KML, IGC, Garmin XML and TCX,
+Magellan PMGNTRK, Honeywell PTNTHPR, Bramor gEO, Winplus Beacon text,
+GPS/IMU CSV, DJI CSV, ExifTool CSV and 3 different Google JSON formats.
 
 Methods in this module should not be called directly.  Instead, the Geotag
 feature is accessed by writing the values of the ExifTool Geotag, Geosync

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

@@ -17,7 +17,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::QuickTime;
 
-$VERSION = '1.13';
+$VERSION = '1.14';
 
 sub ProcessGoPro($$$);
 sub ProcessString($$$);
@@ -750,14 +750,26 @@ sub ProcessString($$$)
     my @list = ref $$dataPt eq 'ARRAY' ? @{$$dataPt} : ( $$dataPt );
     my ($string, $val);
     $et->VerboseDir('GoPro structure');
+    my $docNum = $$et{DOC_NUM};
+    my $subDoc = 0;
     foreach $string (@list) {
         my @val = split ' ', $string;
         my $i = 0;
         foreach $val (@val) {
             $et->HandleTag($tagTablePtr, $i, $val);
-            $$tagTablePtr{++$i} or $i = 0;
+            next if $$tagTablePtr{++$i};
+            # increment subdoc for records stored as string of values (eg. GPS5)
+            $i = 0;
+            ++$subDoc;
+            $$et{DOC_NUM} = "$docNum-$subDoc";
+        }
+        if ($i) {
+            # increment subdoc for records stored as array of strings (eg. GPS9)
+            ++$subDoc;
+            $$et{DOC_NUM} = "$docNum-$subDoc";
         }
     }
+    $$et{DOC_NUM} = $docNum;
     return 1;
 }
 

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

@@ -15,8 +15,9 @@ package Image::ExifTool::LNK;
 use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
+use Image::ExifTool::Microsoft;
 
-$VERSION = '1.10';
+$VERSION = '1.11';
 
 sub ProcessItemID($$$);
 sub ProcessLinkInfo($$$);
@@ -441,6 +442,8 @@ sub ProcessLinkInfo($$$);
     0x08 => {
         Name => 'CodePage',
         Format => 'int32u',
+        SeparateTable => 'Microsoft CodePage',
+        PrintConv => \%Image::ExifTool::Microsoft::codePage,
     },
 );
 

data/bin/lib/Image/ExifTool/Lang/cs.pm

@@ -1198,7 +1198,6 @@ $VERSION = '1.07';
    'Rotation' => {
       PrintConv => {
         'Horizontal' => '0° (nahoru/vlevo)',
-        'Horizontal (Normal)' => '0° (nahoru/vlevo)',
         'Horizontal (normal)' => '0° (nahoru/vlevo)',
         'Rotate 180' => '180° (dolů/vpravo)',
         'Rotate 270 CW' => '90° po směru HR (vlevo/dolů)',

data/bin/lib/Image/ExifTool/Lang/de.pm

@@ -6912,7 +6912,6 @@ $VERSION = '1.38';
    'Rotation' => {
       Description => 'Ausrichtung',
       PrintConv => {
-        'Horizontal (Normal)' => 'Horizontal (normal)',
         'Rotate 180' => '180° gedreht',
         'Rotate 270 CW' => '90° gegen den Uhrzeigersinn',
         'Rotate 90 CW' => '90° im Uhrzeigersinn',

data/bin/lib/Image/ExifTool/Lang/fr.pm

@@ -8874,7 +8874,6 @@ $VERSION = '1.37';
         '270' => '270°',
         '90' => '90°',
         'Horizontal' => 'Horizontale',
-        'Horizontal (Normal)' => 'Horizontale (normale)',
         'Horizontal (normal)' => 'Horizontale (normale)',
         'Rotate 180' => 'Rotation de 180°',
         'Rotate 270 CW' => 'Rotation antihoraire de 270°',

data/bin/lib/Image/ExifTool/Lang/it.pm

@@ -6424,7 +6424,6 @@ $VERSION = '1.14';
       Description => 'Rotazione',
       PrintConv => {
         'Horizontal' => 'Orizzontale',
-        'Horizontal (Normal)' => 'Orizzontale (normale)',
         'Horizontal (normal)' => 'Orizzontale (normale)',
         'Rotate 180' => 'Ruota di 180°',
         'Rotate 270 CW' => 'Ruota di 270° in senso orario',

data/bin/lib/Image/ExifTool/Lang/ja.pm

@@ -4475,7 +4475,6 @@ $VERSION = '1.25';
       Description => '回転',
       PrintConv => {
         'Horizontal' => '水平（標準）',
-        'Horizontal (Normal)' => '水平（標準）',
         'Horizontal (normal)' => '水平（標準）',
         'Rotate 180' => '180度回転',
         'Rotate 270 CW' => '270度回転 CW',

data/bin/lib/Image/ExifTool/Lang/nl.pm

@@ -2567,7 +2567,6 @@ $VERSION = '1.13';
    'Rotation' => {
       PrintConv => {
         'Horizontal' => '0° (boven/links)',
-        'Horizontal (Normal)' => '0° (boven/links)',
         'Horizontal (normal)' => '0° (boven/links)',
         'Rotate 180' => '180° (onder/rechts)',
         'Rotate 270 CW' => 'Draai 270° met de klok mee',

data/bin/lib/Image/ExifTool/Lang/pl.pm

@@ -955,7 +955,6 @@ $VERSION = '1.12';
       Description => 'Obrót',
       PrintConv => {
         'Horizontal' => '0° (góra/lewo)',
-        'Horizontal (Normal)' => '0° (góra/lewo)',
         'Horizontal (normal)' => '0° (góra/lewo)',
         'Rotate 180' => '180° (dół/prawo)',
         'Rotate 270 CW' => '90° CW (lewo/dół)',

data/bin/lib/Image/ExifTool/Lang/zh_cn.pm

@@ -970,7 +970,6 @@ $VERSION = '1.08';
    'Rotation' => {
       PrintConv => {
         'Horizontal' => '0° (上/左)',
-        'Horizontal (Normal)' => '0° (上/左)',
         'Horizontal (normal)' => '0° (上/左)',
         'Rotate 180' => '180° (底/右)',
         'Rotate 270 CW' => '90° CW (左/底)',

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

@@ -32,7 +32,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.29';
+$VERSION = '1.30';
 
 # program map table "stream_type" lookup (ref 6/1/9)
 my %streamType = (
@@ -557,7 +557,7 @@ sub ProcessM2TS($$)
 {
     my ($et, $dirInfo) = @_;
     my $raf = $$dirInfo{RAF};
-    my ($buff, $pLen, $upkPrefix, $j, $fileType, $eof);
+    my ($buff, $pLen, $j, $fileType, $eof);
     my (%pmt, %pidType, %data, %sectLen, %packLen, %fromStart);
     my ($startTime, $endTime, $fwdTime, $backScan, $maxBack);
     my $verbose = $et->Options('Verbose');
@@ -570,10 +570,8 @@ sub ProcessM2TS($$)
     unless ($1) {
         $pLen = 188;        # no timecode
         $fileType = 'M2T';  # (just as a way to tell there is no timecode)
-        $upkPrefix = 'N';
     } else {
         $pLen = 192; # 188-byte transport packet + leading 4-byte timecode (ref 4)
-        $upkPrefix = 'x4N';
     }
     my $prePos = $pLen - 188;       # byte position of packet prefix
     my $readSize = 64 * $pLen;      # size of our read buffer

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

@@ -13,7 +13,7 @@
 package Image::ExifTool::Microsoft;
 
 use strict;
-use vars qw($VERSION);
+use vars qw($VERSION %codePage);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::XMP;
 
@@ -23,6 +23,163 @@ sub ProcessXtra($$$);
 sub WriteXtra($$$);
 sub CheckXtra($$$);
 
+# list of code pages used by Microsoft
+# (ref http://msdn.microsoft.com/en-us/library/dd317756(VS.85).aspx)
+%codePage = (
+     37 => 'IBM EBCDIC US-Canada',
+    437 => 'DOS United States',
+    500 => 'IBM EBCDIC International',
+    708 => 'Arabic (ASMO 708)',
+    709 => 'Arabic (ASMO-449+, BCON V4)',
+    710 => 'Arabic - Transparent Arabic',
+    720 => 'DOS Arabic (Transparent ASMO)',
+    737 => 'DOS Greek (formerly 437G)',
+    775 => 'DOS Baltic',
+    850 => 'DOS Latin 1 (Western European)',
+    852 => 'DOS Latin 2 (Central European)',
+    855 => 'DOS Cyrillic (primarily Russian)',
+    857 => 'DOS Turkish',
+    858 => 'DOS Multilingual Latin 1 with Euro',
+    860 => 'DOS Portuguese',
+    861 => 'DOS Icelandic',
+    862 => 'DOS Hebrew',
+    863 => 'DOS French Canadian',
+    864 => 'DOS Arabic',
+    865 => 'DOS Nordic',
+    866 => 'DOS Russian (Cyrillic)',
+    869 => 'DOS Modern Greek',
+    870 => 'IBM EBCDIC Multilingual/ROECE (Latin 2)',
+    874 => 'Windows Thai (same as 28605, ISO 8859-15)',
+    875 => 'IBM EBCDIC Greek Modern',
+    932 => 'Windows Japanese (Shift-JIS)',
+    936 => 'Windows Simplified Chinese (PRC, Singapore)',
+    949 => 'Windows Korean (Unified Hangul Code)',
+    950 => 'Windows Traditional Chinese (Taiwan)',
+    1026 => 'IBM EBCDIC Turkish (Latin 5)',
+    1047 => 'IBM EBCDIC Latin 1/Open System',
+    1140 => 'IBM EBCDIC US-Canada with Euro',
+    1141 => 'IBM EBCDIC Germany with Euro',
+    1142 => 'IBM EBCDIC Denmark-Norway with Euro',
+    1143 => 'IBM EBCDIC Finland-Sweden with Euro',
+    1144 => 'IBM EBCDIC Italy with Euro',
+    1145 => 'IBM EBCDIC Latin America-Spain with Euro',
+    1146 => 'IBM EBCDIC United Kingdom with Euro',
+    1147 => 'IBM EBCDIC France with Euro',
+    1148 => 'IBM EBCDIC International with Euro',
+    1149 => 'IBM EBCDIC Icelandic with Euro',
+    1200 => 'Unicode UTF-16, little endian',
+    1201 => 'Unicode UTF-16, big endian',
+    1250 => 'Windows Latin 2 (Central European)',
+    1251 => 'Windows Cyrillic',
+    1252 => 'Windows Latin 1 (Western European)',
+    1253 => 'Windows Greek',
+    1254 => 'Windows Turkish',
+    1255 => 'Windows Hebrew',
+    1256 => 'Windows Arabic',
+    1257 => 'Windows Baltic',
+    1258 => 'Windows Vietnamese',
+    1361 => 'Korean (Johab)',
+    10000 => 'Mac Roman (Western European)',
+    10001 => 'Mac Japanese',
+    10002 => 'Mac Traditional Chinese',
+    10003 => 'Mac Korean',
+    10004 => 'Mac Arabic',
+    10005 => 'Mac Hebrew',
+    10006 => 'Mac Greek',
+    10007 => 'Mac Cyrillic',
+    10008 => 'Mac Simplified Chinese',
+    10010 => 'Mac Romanian',
+    10017 => 'Mac Ukrainian',
+    10021 => 'Mac Thai',
+    10029 => 'Mac Latin 2 (Central European)',
+    10079 => 'Mac Icelandic',
+    10081 => 'Mac Turkish',
+    10082 => 'Mac Croatian',
+    12000 => 'Unicode UTF-32, little endian',
+    12001 => 'Unicode UTF-32, big endian',
+    20000 => 'CNS Taiwan',
+    20001 => 'TCA Taiwan',
+    20002 => 'Eten Taiwan',
+    20003 => 'IBM5550 Taiwan',
+    20004 => 'TeleText Taiwan',
+    20005 => 'Wang Taiwan',
+    20105 => 'IA5 (IRV International Alphabet No. 5, 7-bit)',
+    20106 => 'IA5 German (7-bit)',
+    20107 => 'IA5 Swedish (7-bit)',
+    20108 => 'IA5 Norwegian (7-bit)',
+    20127 => 'US-ASCII (7-bit)',
+    20261 => 'T.61',
+    20269 => 'ISO 6937 Non-Spacing Accent',
+    20273 => 'IBM EBCDIC Germany',
+    20277 => 'IBM EBCDIC Denmark-Norway',
+    20278 => 'IBM EBCDIC Finland-Sweden',
+    20280 => 'IBM EBCDIC Italy',
+    20284 => 'IBM EBCDIC Latin America-Spain',
+    20285 => 'IBM EBCDIC United Kingdom',
+    20290 => 'IBM EBCDIC Japanese Katakana Extended',
+    20297 => 'IBM EBCDIC France',
+    20420 => 'IBM EBCDIC Arabic',
+    20423 => 'IBM EBCDIC Greek',
+    20424 => 'IBM EBCDIC Hebrew',
+    20833 => 'IBM EBCDIC Korean Extended',
+    20838 => 'IBM EBCDIC Thai',
+    20866 => 'Russian/Cyrillic (KOI8-R)',
+    20871 => 'IBM EBCDIC Icelandic',
+    20880 => 'IBM EBCDIC Cyrillic Russian',
+    20905 => 'IBM EBCDIC Turkish',
+    20924 => 'IBM EBCDIC Latin 1/Open System with Euro',
+    20932 => 'Japanese (JIS 0208-1990 and 0121-1990)',
+    20936 => 'Simplified Chinese (GB2312)',
+    20949 => 'Korean Wansung',
+    21025 => 'IBM EBCDIC Cyrillic Serbian-Bulgarian',
+    21027 => 'Extended Alpha Lowercase (deprecated)',
+    21866 => 'Ukrainian/Cyrillic (KOI8-U)',
+    28591 => 'ISO 8859-1 Latin 1 (Western European)',
+    28592 => 'ISO 8859-2 (Central European)',
+    28593 => 'ISO 8859-3 Latin 3',
+    28594 => 'ISO 8859-4 Baltic',
+    28595 => 'ISO 8859-5 Cyrillic',
+    28596 => 'ISO 8859-6 Arabic',
+    28597 => 'ISO 8859-7 Greek',
+    28598 => 'ISO 8859-8 Hebrew (Visual)',
+    28599 => 'ISO 8859-9 Turkish',
+    28603 => 'ISO 8859-13 Estonian',
+    28605 => 'ISO 8859-15 Latin 9',
+    29001 => 'Europa 3',
+    38598 => 'ISO 8859-8 Hebrew (Logical)',
+    50220 => 'ISO 2022 Japanese with no halfwidth Katakana (JIS)',
+    50221 => 'ISO 2022 Japanese with halfwidth Katakana (JIS-Allow 1 byte Kana)',
+    50222 => 'ISO 2022 Japanese JIS X 0201-1989 (JIS-Allow 1 byte Kana - SO/SI)',
+    50225 => 'ISO 2022 Korean',
+    50227 => 'ISO 2022 Simplified Chinese',
+    50229 => 'ISO 2022 Traditional Chinese',
+    50930 => 'EBCDIC Japanese (Katakana) Extended',
+    50931 => 'EBCDIC US-Canada and Japanese',
+    50933 => 'EBCDIC Korean Extended and Korean',
+    50935 => 'EBCDIC Simplified Chinese Extended and Simplified Chinese',
+    50936 => 'EBCDIC Simplified Chinese',
+    50937 => 'EBCDIC US-Canada and Traditional Chinese',
+    50939 => 'EBCDIC Japanese (Latin) Extended and Japanese',
+    51932 => 'EUC Japanese',
+    51936 => 'EUC Simplified Chinese',
+    51949 => 'EUC Korean',
+    51950 => 'EUC Traditional Chinese',
+    52936 => 'HZ-GB2312 Simplified Chinese',
+    54936 => 'Windows XP and later: GB18030 Simplified Chinese (4 byte)',
+    57002 => 'ISCII Devanagari',
+    57003 => 'ISCII Bengali',
+    57004 => 'ISCII Tamil',
+    57005 => 'ISCII Telugu',
+    57006 => 'ISCII Assamese',
+    57007 => 'ISCII Oriya',
+    57008 => 'ISCII Kannada',
+    57009 => 'ISCII Malayalam',
+    57010 => 'ISCII Gujarati',
+    57011 => 'ISCII Punjabi',
+    65000 => 'Unicode (UTF-7)',
+    65001 => 'Unicode (UTF-8)',
+);
+
 # tags written by Microsoft HDView (ref 1)
 %Image::ExifTool::Microsoft::Stitch = (
     PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,

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

@@ -49,7 +49,7 @@ use vars qw($VERSION %minoltaLensTypes %minoltaTeleconverters %minoltaColorMode
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '2.88';
+$VERSION = '2.89';
 
 # Full list of product codes for Sony-compatible Minolta lenses
 # (ref http://www.kb.sony.com/selfservice/documentLink.do?externalId=C1000570)
@@ -603,6 +603,8 @@ $VERSION = '2.88';
     19 => 'Vivid 2', #JR (7SM3)
     20 => 'IN', #JR (7SM3)
     21 => 'SH', #JR (7SM3)
+    22 => 'FL2', #JR (ILME-FX2)
+    23 => 'FL3', #JR (ILME-FX2)
     100 => 'Neutral', #JD
     101 => 'Clear', #JD
     102 => 'Deep', #JD
@@ -2411,7 +2413,7 @@ my %offOn = ( 0 => 'Off', 1 => 'On' );
     0x5a => { #15
         Name => 'Rotation',
         PrintConv => {
-            0 => 'Horizontal (Normal)',
+            0 => 'Horizontal (normal)',
             1 => 'Rotate 270 CW',
             2 => 'Rotate 90 CW',
         },