exiftool_vendored 13.03.0 → 13.06.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: beee9d5cf55d8f0cdbe040a87bcccb203cb39721065957785486ef6bc02380ca
-  data.tar.gz: b5023cb0b5f82e8c4798256b34ea31bc3e99dc805af96d7595f2727ef1b9ce90
+  metadata.gz: 277daacb61b45f8ffcf01c45e8a2ae6c7814aa878af57ce5e700433e37a73a89
+  data.tar.gz: c27dc0342c61725b98adb52806417396827df205172ae6793f14bb6eb9d3949b
 SHA512:
-  metadata.gz: 6e8b38e7fa81625bb834f7f419100eb4116514d6e3f667b80b486e449b36f849ee26dfb9878caab0b0d937b59a803e1177ed459cbf0e6df4a949427b7e87347d
-  data.tar.gz: 36865cb5c13daac876f068af94f9d7b50b16338b0159fadcdd365bb15bf98791956bfe5c2fb25d6ab9521f02126bfc918184f4d12b264e54a24718ab93808f53
+  metadata.gz: acb79bdb9f29cb00439ad4006faba198b460abed0c655e1cce6d7a3845ec14c8fe19a778dcbdb5401bb5f77b51329329e9ab8a6932c98a9d04ff63ca04be9af0
+  data.tar.gz: 2771ca21af4d53e1d2138b4b94dd187f1e59c9f9c6230f8d3a8d83be61979b320570084a50f5ae5a3d038114a46cca518dca35e517d8304ed98087c73ceeb163

data/bin/Changes

@@ -7,6 +7,45 @@ RSS feed: https://exiftool.org/rss.xml
 Note: The most recent production release is Version 13.00. (Other versions are
 considered development releases, and are not uploaded to MetaCPAN.)
 
+Dec. 5, 2024 - Version 13.06
+
+  - Decode timed metadata from MP4 videos of yet another dashcam model
+  - Patched issue where FileSequence could increment twice for each file when a
+    -if condition was used
+  - API Changes:
+      - Revert default  WindowsLongPath option until we can solve the pipe
+        problem)
+
+Dec. 4, 2024 - Version 13.05
+
+  - Added a new SonyModelID
+  - Added support for XMP HDRGainMap and apdi namespaces
+  - Decode DJI timed djmd and dbgi protobuf-format metadata
+  - Decode APP10 AROT HDRGainCurve and APP2 URN UniformResourceName
+  - Decode a couple of new GoPro tags
+  - API Changes:
+      - Changed default  WindowsLongPath option to 1 (please report if this
+        causes any problems)
+
+Nov. 26, 2024 - Version 13.04
+
+  - Added the ability to write GPSDOP and GPSMeasureMode from the -geotag option
+    if hdop or pdop information exists in the input track file
+  - Added a few new Canon RFLensTypes (thanks Norbert Wasser)
+  - Decode timed GPS from GoPro Hero 13 videos
+  - Improved writing of GPSDestLatitudeRef and GPSDestLongitudeRef tags to allow
+    signed numbers to be written in the same way as GPSLatitudeRef and
+    GPSLongitudeRef
+  - Warn if using an Image::ExifTool library that doesn't match the application
+    version
+  - Renamed an Unknown Photoshop tag
+  - Convert GoPro GPSSpeed and GPSSpeed3D from m/s to km/h
+  - Patched to tolerate XML header in DOCX xml files
+  - Fixed incorrect file offsets for tags in some embedded files of -htmldump
+    output
+  - Fixed -htmldump output to show the same names for unknown EXIF tags as with
+    the -u option
+
 Nov. 12, 2024 - Version 13.03
 
   - Added ability to include or exclude tags from CSV and JSON imports

data/bin/MANIFEST

@@ -397,6 +397,7 @@ lib/Image/ExifTool/PhotoMechanic.pm
 lib/Image/ExifTool/Photoshop.pm
 lib/Image/ExifTool/PostScript.pm
 lib/Image/ExifTool/PrintIM.pm
+lib/Image/ExifTool/Protobuf.pm
 lib/Image/ExifTool/Qualcomm.pm
 lib/Image/ExifTool/QuickTime.pm
 lib/Image/ExifTool/QuickTimeStream.pl

data/bin/META.json

@@ -50,5 +50,5 @@
       }
    },
    "release_status" : "stable",
-   "version" : "13.03"
+   "version" : "13.06"
 }

data/bin/META.yml

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

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.03.tar.gz | tar -xf -
-  cd Image-ExifTool-13.03
+  gzip -dc Image-ExifTool-13.06.tar.gz | tar -xf -
+  cd Image-ExifTool-13.06
   ./exiftool t/images/ExifTool.jpg
 
 Note:  These commands extract meta information from one of the test images. 

data/bin/exiftool

@@ -11,7 +11,7 @@ use strict;
 use warnings;
 require 5.004;
 
-my $version = '13.03';
+my $version = '13.06';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exePath;
@@ -597,6 +597,10 @@ if (@Image::ExifTool::UserDefined::Arguments) {
     unshift @ARGV, @Image::ExifTool::UserDefined::Arguments;
 }
 
+if ($version ne $Image::ExifTool::VERSION) {
+    Warn "Application version $version does not match Image::ExifTool library version $Image::ExifTool::VERSION\n";
+}
+
 # parse command-line options in 2 passes...
 # pass 1: set all of our ExifTool options
 # pass 2: print all of our help and informational output (-list, -ver, etc)
@@ -1914,7 +1918,7 @@ if (@dbKeys) {
                     print $vout "Imported entry for '${_}' (full path: '${absPath}')\n";
                 }
             } elsif ($verbose and $verbose > 1) {
-                print $vout "Imported entry for '${_}' (non-existent file)\n";
+                print $vout "Imported entry for '${_}' (no full path)\n";
             }
         }
     }
@@ -2168,7 +2172,10 @@ sub GetImageInfo($$)
         }
         # can't make use of $info if verbose because we must reprocess
         # the file anyway to generate the verbose output
-        undef $info if $verbose or defined $fastCondition or defined $diff;
+        if ($verbose or defined $fastCondition or defined $diff) {
+            undef $info;
+            --$$et{FILE_SEQUENCE};
+        }
     } elsif ($file =~ s/^(\@JSON:)(.*)/$1/) {
         # read JSON file from command line
         my $dat = $2;
@@ -4159,11 +4166,12 @@ sub ScanDir($$;$)
     }
     $dir =~ /\/$/ or $dir .= '/';   # make sure directory name ends with '/'
     foreach $file (@fileList) {
+        next if $file eq '.' or $file eq '..';
         my $path = "$dir$file";
         if ($et->IsDirectory($path)) {
             next unless $recurse;
             # ignore directories starting with "." by default
-            next if $file =~ /^\./ and ($recurse == 1 or $file eq '.' or $file eq '..');
+            next if $file =~ /^\./ and $recurse == 1;
             next if $ignore{$file} or ($ignore{SYMLINKS} and -l $path);
             ScanDir($et, $path, $list);
             last if $end;
@@ -4311,14 +4319,15 @@ sub AbsPath($)
 {
     my $file = shift;
     my $path;
-    if (defined $file and eval { require Cwd }) {
-        $path = eval { Cwd::abs_path($file) };
-        # make the delimiters and case consistent
-        # (abs_path is very inconsistent about what it returns in Windows)
-        if (defined $path and Image::ExifTool::IsPC()) {
-            $path =~ tr/\\/\//;
-            $path = lc $path;
+    if (defined $file) {
+        return undef if $file eq '*';   # (CSV SourceFile may be '*' -- no absolute path for that)
+        if ($^O eq 'MSWin32' and $mt->Options('WindowsLongPath')) {
+            $path = $mt->WindowsLongPath($file);
+        } elsif (eval { require Cwd }) {
+            local $SIG{'__WARN__'} = sub { };
+            $path = eval { Cwd::abs_path($file) };
         }
+        $path =~ tr/\\/\// if $^O eq 'MSWin32' and defined $path;   # use forward slashes
     }
     return $path;
 }
@@ -5903,7 +5912,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 13.03 --
+    -- Generated by ExifTool 13.06 --
     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
@@ -5919,8 +5928,9 @@ name, a value of 1 is returned if any tag exists in the specified group, or
 0 otherwise (unless the C<All> group is also specified, in which case the
 values of all matching tags are joined).
 
-When B<-ee> (B<-extractEmbedded>) is combined with B<-p>, embedded documents
-are effectively processed as separate input files.
+The B<-p> output iterates through the family 3 group names, with each
+sub-document producing additional output.  This feature is most useful when
+used in combination with the B<-ee> option to extract embedded documents.
 
 If a specified tag does not exist, a minor warning is issued and the line
 with the missing tag is not printed.  However, the B<-f> option may be used
@@ -6017,7 +6027,8 @@ import).  May be combined with B<-s> to print tag names instead of
 descriptions, or B<-S> to print tag values only, tab-delimited on a single
 line.  The B<-t> option may be combined with B<-j>, B<-php> or B<-X> to add
 tag table information (C<table>, tag C<id>, and C<index> for cases where
-multiple conditional tags exist with the same ID).
+multiple conditional tags exist with the same ID), which allows the
+corresponding tag to be located in the B<-listx> output.
 
 =item B<-T> (B<-table>)
 
@@ -6770,23 +6781,22 @@ the following two commands are equivalent:
     exiftool -geotag trk.log image.jpg
     exiftool -geotag trk.log "-Geotime<DateTimeOriginal#" image.jpg
 
-When the C<Geotime> value is converted to UTC, the local system timezone is
-assumed unless the date/time value contains a timezone.  Writing C<Geotime>
-causes the following tags to be written (provided they can be calculated
-from the track log, and they are supported by the destination metadata
-format):  GPSLatitude, GPSLatitudeRef, GPSLongitude, GPSLongitudeRef,
-GPSAltitude, GPSAltitudeRef, GPSDateStamp, GPSTimeStamp, GPSDateTime,
-GPSTrack, GPSTrackRef, GPSSpeed, GPSSpeedRef, GPSImgDirection,
-GPSImgDirectionRef, GPSPitch, GPSRoll, GPSCoordinates, AmbientTemperature
-and CameraElevationAngle.  By default, in image files tags are created in
-EXIF, and updated in XMP only if they already exist.  In QuickTime-format
-files GPSCoordinates is created in the preferred location (ItemList by
-default) as well as in XMP.  However, C<EXIF:Geotime>, C<XMP:Geotime> or
-C<QuickTime:Geotime> may be specified to write to write only to one group. 
-Also, C<ItemList:Geotime>, C<Keys:Geotime> or C<UserData:Geotime> may be
-used to write to a specific location in QuickTime-format files.  Note that
-GPSPitch and GPSRoll are non-standard, and require user-defined tags in
-order to be written.
+If the C<Geotime> value does not contain a time zone then the local system
+timezone is assumed.  Writing C<Geotime> causes the following tags to be
+written (provided they can be calculated from the track log, and they are
+supported by the destination metadata format):  GPSLatitude, GPSLatitudeRef,
+GPSLongitude, GPSLongitudeRef, GPSAltitude, GPSAltitudeRef, GPSDateStamp,
+GPSTimeStamp, GPSDateTime, GPSTrack, GPSTrackRef, GPSSpeed, GPSSpeedRef,
+GPSImgDirection, GPSImgDirectionRef, GPSMeasureMode, GPSDOP, GPSPitch,
+GPSRoll, GPSCoordinates, AmbientTemperature and CameraElevationAngle.  By
+default, in image files tags are created in EXIF, and updated in XMP only if
+they already exist.  In QuickTime-format files GPSCoordinates is created in
+the preferred location (ItemList by default) as well as in XMP.  However,
+C<EXIF:Geotime>, C<XMP:Geotime> or C<QuickTime:Geotime> may be specified to
+write to write only to one group. Also, C<ItemList:Geotime>, C<Keys:Geotime>
+or C<UserData:Geotime> may be used to write to a specific location in
+QuickTime-format files.  Note that GPSPitch and GPSRoll are non-standard,
+and require user-defined tags in order to be written.
 
 The C<Geosync> tag may be used to specify a time correction which is applied
 to each C<Geotime> value for synchronization with GPS time.  For example,

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

@@ -88,7 +88,7 @@ sub ProcessCTMD($$$);
 sub ProcessExifInfo($$$);
 sub SwapWords($);
 
-$VERSION = '4.84';
+$VERSION = '4.85';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
@@ -631,6 +631,9 @@ $VERSION = '4.84';
    '61182.54' => 'Canon RF 24-105mm F2.8 L IS USM Z', #42
    '61182.55' => 'Canon RF-S 10-18mm F4.5-6.3 IS STM', #42
    '61182.56' => 'Canon RF 35mm F1.4 L VCM', #42
+   '61182.57' => 'Canon RF 70-200mm F2.8 L IS USM Z', #42
+   '61182.58' => 'Canon RF 50mm F1.4 L VCM', #42
+   '61182.59' => 'Canon RF 24mm F1.4 L VCM', #42
     65535 => 'n/a',
 );
 
@@ -7001,6 +7004,9 @@ my %ciMaxFocal = (
             316 => 'Canon RF 35mm F1.4 L VCM', #42
             317 => 'Canon RF-S 3.9mm F3.5 STM DUAL FISHEYE', #42
             318 => 'Canon RF 28-70mm F2.8 IS STM', #42
+            319 => 'Canon RF 70-200mm F2.8 L IS USM Z', #42
+            325 => 'Canon RF 50mm F1.4 L VCM', #42
+            326 => 'Canon RF 24mm F1.4 L VCM', #42
             # Note: add new RF lenses to %canonLensTypes with ID 61182
         },
     },

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

@@ -15,11 +15,11 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::XMP;
 use Image::ExifTool::GPS;
+use Image::ExifTool::Protobuf;
 
-$VERSION = '1.09';
+$VERSION = '1.10';
 
 sub ProcessDJIInfo($$$);
-sub Process_djmd($$$);
 
 my %convFloat2 = (
     PrintConv => 'sprintf("%+.2f", $val)',
@@ -187,34 +187,96 @@ my %convFloat2 = (
     },
 );
 
-# TODO - eventually add ability to decode this?
-%Image::ExifTool::DJI::djmd = (
-    PROCESS_PROC => \&Process_djmd,
+# metadata in protobuf format (djmd and dbgi meta types, ref PH)
+%Image::ExifTool::DJI::Protobuf = (
+    GROUPS => { 0 => 'Protobuf', 1 => 'DJI', 2 => 'Location' },
+    TAG_PREFIX => '',
+    PROCESS_PROC => \&Image::ExifTool::Protobuf::ProcessProtobuf,
+    NOTES => q{
+        Tags found in protobuf-format DJI meta djmd and dbgi timed metadata.  Only a
+        few tags are currently known, but unknown djmd tags may be extracted by
+        setting the Unknown option to 1 (or 2 to also extract unknown dbgi debug
+        tags).  Tag ID's are composed of the corresponding .proto file name combined
+        with the hierarchical protobuf field numbers.  The "dvtm_AVATA2.proto" file
+        is used by the DJI Avanta 2, and "dvtm_ac203.proto" by the OsmoAction4.
+    },
+    Protocol => { },
+   # dvtm_ac203_1-1-6 - some version number
+    'dvtm_ac203_1-1-10' => 'Model',
+    'dvtm_ac203_2-3-1' => { Name => 'FrameWidth',  Format => 'unsigned' },
+    'dvtm_ac203_2-3-2' => { Name => 'FrameHeight', Format => 'unsigned' },
+    'dvtm_ac203_2-3-3' => { Name => 'FrameRate',   Format => 'float' },
+   # dvtm_ac203_3-4-1-4 - model code?
+    'dvtm_ac203_3-4-2-1-1' => {
+        Name => 'CoordinateUnits',
+        Format  => 'unsigned',
+        # don't extract this -- just convert to degrees
+        RawConv => '$$self{CoordUnits} = $val; undef',
+        Hidden => 1,
+        # PrintConv => { 0 => 'Radians', 1 => 'Degrees' },
+    },
+    'dvtm_ac203_3-4-2-1-2' => {
+        Name => 'GPSLatitude',
+        Format => 'double',
+        # set ExifTool GPSLatitude/GPSLongitude members so GPSDateTime will be generated if necessary
+        RawConv => '$$self{GPSLatitude} = $$self{CoordUnits} ? $val : $val * 180 / 3.141592653589793', # (NC)
+        PrintConv => 'Image::ExifTool::GPS::ToDMS($self, $val, 1, "N")',
+    },
+    'dvtm_ac203_3-4-2-1-3' => {
+        Name => 'GPSLongitude',
+        Format => 'double',
+        RawConv => '$$self{GPSLongitude} = $$self{CoordUnits} ? $val : $val * 180 / 3.141592653589793', # (NC)
+        PrintConv => 'Image::ExifTool::GPS::ToDMS($self, $val, 1, "E")',
+    },
+    'dvtm_ac203_3-4-2-2' => {
+        Name => 'GPSAltitude',
+        Format => 'unsigned',
+        ValueConv => '$val / 1000',
+    },
+    'dvtm_ac203_3-4-2-6-1' => {
+        Name => 'GPSDateTime',
+        Format => 'string',
+        Groups => { 2 => 'Time' },
+        RawConv => '$$self{GPSDateTime} = $val',
+        ValueConv => '$val =~ tr/-/:/; $val',
+        PrintConv => '$self->ConvertDateTime($val)',
+    },
+   # dvtm_AVATA2_1-1-2 - some version number
+   # dvtm_AVATA2_1-1-3 - some version number
+    'dvtm_AVATA2_1-1-10' => 'Model',
+    'dvtm_AVATA2_2-2-3-1' => 'SerialNumber', # (NC)
+    'dvtm_AVATA2_2-3-1' => { Name => 'FrameWidth',  Format => 'unsigned' },
+    'dvtm_AVATA2_2-3-2' => { Name => 'FrameHeight', Format => 'unsigned' },
+    'dvtm_AVATA2_2-3-3' => { Name => 'FrameRate',   Format => 'float' },
+   # dvtm_AVATA2_3-1-1 - frame number (starting at 1)
+    'dvtm_AVATA2_3-1-2' => { # (also 3-2-1-6 and 3-4-1-6)
+        Name => 'TimeStamp',
+        Format => 'unsigned',
+        # milliseconds, but I don't know what the zero is
+        ValueConv => '$val / 1e6',
+    },
+   # dvtm_AVATA2_3-2-1-4 - model code?
+   # dvtm_AVATA2_3-4-1-4 - model code?
+    'dvtm_AVATA2_3-4-4-1-1' => { # (NC) (default seems to be radians if missing)
+        Name => 'CoordinateDegrees',
+        Format  => 'unsigned',
+        RawConv => '$$self{CoordDegrees} = $val; undef',
+        Hidden => 1,
+    },
+    'dvtm_AVATA2_3-4-4-1-2' => {
+        Name => 'GPSLatitude',
+        Format => 'double',
+        RawConv => '$$self{GPSLatitude} = $$self{CoordDegrees} ? $val : $val * 180 / 3.141592653589793', # (NC)
+        PrintConv => 'Image::ExifTool::GPS::ToDMS($self, $val, 1, "N")',
+    },
+    'dvtm_AVATA2_3-4-4-1-3' => {
+        Name => 'GPSLongitude',
+        Format => 'double',
+        RawConv => '$$self{GPSLongitude} = $$self{CoordDegrees} ? $val : $val * 180 / 3.141592653589793', # (NC)
+        PrintConv => 'Image::ExifTool::GPS::ToDMS($self, $val, 1, "E")',
+    },
 );
 
-#------------------------------------------------------------------------------
-# Process DJI djmd timed data from Action4 videos (ref PH)
-# Inputs: 0) ExifTool ref, 1) dirInfo ref, 2) tag table ref
-# Returns: 1 on success
-# TODO: work in progress
-sub Process_djmd($$$)
-{
-    my ($et, $dirInfo, $tagTbl) = @_;
-    my $dataPt = $$dirInfo{DataPt};
-    my ($pos, $bit, $val) = (6, 0, 0);
-    for (;;) {
-        my $v = Get8u($dataPt, $pos);
-        $val += ($v & 0x7f) << $bit;
-        last unless $v & 0x80;
-        ++$pos;
-        $bit += 7;
-    }
-    $pos += 49;
-    my @a = unpack("x${pos}fxfxfxfx3fxfxf", $$dataPt);
-    print "$val @a\n";
-    return 1;
-}
-
 #------------------------------------------------------------------------------
 # Process DJI info (ref PH)
 # Inputs: 0) ExifTool ref, 1) dirInfo ref, 2) tag table ref

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

@@ -57,7 +57,7 @@ use vars qw($VERSION $AUTOLOAD @formatSize @formatName %formatNumber %intFormat
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::MakerNotes;
 
-$VERSION = '4.54';
+$VERSION = '4.55';
 
 sub ProcessExif($$$);
 sub WriteExif($$$);
@@ -6697,8 +6697,9 @@ sub ProcessExif($$$)
                           "Format: $fstr\nSize: $size bytes\n";
                 if ($size > 4) {
                     my $offPt = Get32u($dataPt,$entry+8);
-                    # (test this with ../pics/{CanonEOS-1D_XMarkIII.hif,PanasonicDC-G9.rw2})
-                    my $actPt = $valuePtr + $valueDataPos + $base - ($$et{EXIF_POS} || 0) + ($$et{BASE_FUDGE} || 0);
+                    # (test this with ../pics/{CanonEOS-1D_XMarkIII.hif,PanasonicDC-G9.rw2,*.raf})
+                    my $actPt = $valuePtr + $valueDataPos + $base - ($$et{EXIF_POS} || 0) +
+                                ($$et{BASE_FUDGE} || $$et{BASE} || 0);
                     $tip .= sprintf("Value offset: 0x%.4x\n", $offPt);
                     # highlight tag name (red for bad size)
                     my $style = ($bad or not defined $tval) ? 'V' : 'H';
@@ -6729,12 +6730,15 @@ sub ProcessExif($$$)
                     } elsif ($tagInfo and Image::ExifTool::IsInt($tval)) {
                         if ($$tagInfo{IsOffset} or $$tagInfo{SubIFD}) {
                             $tval = sprintf('0x%.4x', $tval);
-                            my $actPt = $val + $base - ($$et{EXIF_POS} || 0) + ($$et{BASE_FUDGE} || 0);
+                            my $actPt = $val + $base - ($$et{EXIF_POS} || 0) + ($$et{BASE_FUDGE} || $$et{BASE} || 0);
                             if ($actPt != $val) {
                                 $tval .= sprintf("\nActual offset: 0x%.4x", $actPt);
                                 my $sign = $actPt < $val ? '-' : '';
                                 $tval .= sprintf("\nOffset base: ${sign}0x%.4x", abs($actPt - $val));
                             }
+                            if ($$et{EXIF_POS} and not $$et{BASE_FUDGE}) {
+                                $tip .= sprintf("File offset:   0x%.4x\n", $actPt + $$et{EXIF_POS})
+                            }
                         } elsif ($$tagInfo{PrintHex}) {
                             $tval = sprintf('0x%x', $tval);
                         }

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

@@ -12,7 +12,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.56';
+$VERSION = '1.57';
 
 my %coordConv = (
     ValueConv    => 'Image::ExifTool::GPS::ToDegrees($val)',
@@ -20,6 +20,34 @@ my %coordConv = (
     PrintConv    => 'Image::ExifTool::GPS::ToDMS($self, $val, 1)',
 );
 
+my %printConvLatRef = (
+    # extract N/S if written from Composite:GPSLatitude
+    # (also allow writing from a signed number)
+    OTHER => sub {
+        my ($val, $inv) = @_;
+        return undef unless $inv;
+        return uc $2 if $val =~ /(^|[^A-Z])([NS])(orth|outh)?\b/i;
+        return $1 eq '-' ? 'S' : 'N' if $val =~ /([-+]?)\d+/;
+        return undef;
+    },
+    N => 'North',
+    S => 'South',
+);
+
+my %printConvLonRef = (
+    # extract E/W if written from Composite:GPSLongitude
+    # (also allow writing from a signed number)
+    OTHER => sub {
+        my ($val, $inv) = @_;
+        return undef unless $inv;
+        return uc $2 if $val =~ /(^|[^A-Z])([EW])(ast|est)?\b/i;
+        return $1 eq '-' ? 'W' : 'E' if $val =~ /([-+]?)\d+/;
+        return undef;
+    },
+    E => 'East',
+    W => 'West',
+);
+
 %Image::ExifTool::GPS::Main = (
     GROUPS => { 0 => 'EXIF', 1 => 'GPS', 2 => 'Location' },
     WRITE_PROC => \&Image::ExifTool::Exif::WriteExif,
@@ -43,19 +71,7 @@ my %coordConv = (
             latitudes or negative for south, or a string containing N, North, S or South
         },
         Count => 2,
-        PrintConv => {
-            # extract N/S if written from Composite:GPSLatitude
-            # (also allow writing from a signed number)
-            OTHER => sub {
-                my ($val, $inv) = @_;
-                return undef unless $inv;
-                return uc $2 if $val =~ /(^|[^A-Z])([NS])(orth|outh)?\b/i;
-                return $1 eq '-' ? 'S' : 'N' if $val =~ /([-+]?)\d+/;
-                return undef;
-            },
-            N => 'North',
-            S => 'South',
-        },
+        PrintConv => \%printConvLatRef,
     },
     0x0002 => {
         Name => 'GPSLatitude',
@@ -72,19 +88,7 @@ my %coordConv = (
             ExifTool will also accept a number when writing this tag, positive for east
             longitudes or negative for west, or a string containing E, East, W or West
         },
-        PrintConv => {
-            # extract E/W if written from Composite:GPSLongitude
-            # (also allow writing from a signed number)
-            OTHER => sub {
-                my ($val, $inv) = @_;
-                return undef unless $inv;
-                return uc $2 if $val =~ /(^|[^A-Z])([EW])(ast|est)?\b/i;
-                return $1 eq '-' ? 'W' : 'E' if $val =~ /([-+]?)\d+/;
-                return undef;
-            },
-            E => 'East',
-            W => 'West',
-        },
+        PrintConv => \%printConvLonRef,
     },
     0x0004 => {
         Name => 'GPSLongitude',
@@ -238,7 +242,7 @@ my %coordConv = (
         Writable => 'string',
         Notes => 'tags 0x0013-0x001a used for subject location according to MWG 2.0',
         Count => 2,
-        PrintConv => { N => 'North', S => 'South' },
+        PrintConv => \%printConvLatRef,
     },
     0x0014 => {
         Name => 'GPSDestLatitude',
@@ -251,7 +255,7 @@ my %coordConv = (
         Name => 'GPSDestLongitudeRef',
         Writable => 'string',
         Count => 2,
-        PrintConv => { E => 'East', W => 'West' },
+        PrintConv => \%printConvLonRef,
     },
     0x0016 => {
         Name => 'GPSDestLongitude',

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

@@ -18,7 +18,8 @@
 #               specifying $Image::ExifTool::Geolocation::altDir.  This
 #               database and has entries in the same order as Geolocation.dat,
 #               and each entry is a newline-separated list of alternate names
-#               terminated by a null byte.
+#               terminated by a null byte.  These alternate names are used
+#               only when searching for a city by name (eg. "Big Apple").
 #
 #               Databases are based on data from geonames.org with a
 #               Creative Commons license, reformatted as follows in the