Changeset 24107 for main/trunk/greenstone2/perllib/cpan/Image/ExifTool/Shift.pl

Timestamp:

2011-06-01T12:33:42+12:00 (13 years ago)

Author:

sjm84

Message:

Updating the ExifTool perl modules

File:

• main/trunk/greenstone2/perllib/cpan/Image/ExifTool/Shift.pl (modified) (12 diffs)

main/trunk/greenstone2/perllib/cpan/Image/ExifTool/Shift.pl

@@ -15 +15 @@
 #------------------------------------------------------------------------------
 # apply shift to value in new value hash
-# Inputs: 0) shift type, 1) shift string, 2) value to shift, 3) new value hash ref
+# Inputs: 0) shift type, 1) shift string, 2) raw date/time value, 3) new value hash ref
 # Returns: error string or undef on success and updates value in new value hash
 sub ApplyShift($$$;$)
 {
-    my ($func, $shift, $val, $newValueHash) = @_;
+    my ($func, $shift, $val, $nvHash) = @_;
 
     # get shift direction from first character in shift string
@@ -25 +25 @@
     my $pre = $1;
     my $dir = ($pre eq '+') ? 1 : -1;
-    my $tagInfo = $$newValueHash{TagInfo};
+    my $tagInfo = $$nvHash{TagInfo};
     my $tag = $$tagInfo{Name};
-    my $self = $$newValueHash{Self};    # (used in eval)
+    my $self = $$nvHash{Self};    # (used in eval)
     my $shiftOffset;
-    if ($$newValueHash{ShiftOffset}) {
-        $shiftOffset = $$newValueHash{ShiftOffset};
+    if ($$nvHash{ShiftOffset}) {
+        $shiftOffset = $$nvHash{ShiftOffset};
     } else {
-        $shiftOffset = $$newValueHash{ShiftOffset} = { };
+        $shiftOffset = $$nvHash{ShiftOffset} = { };
     }
 
@@ -63 +63 @@
     }
     # update value in new value hash
-    $newValueHash->{Value} = [ $val ];
+    $nvHash->{Value} = [ $val ];
     return undef;   # success
 }
@@ -105 +105 @@
 
 #------------------------------------------------------------------------------
-# split times into corresponding components: YYYY MM DD hh mm ss tzh tzm
+# split times into corresponding components: YYYY mm dd HH MM SS tzh tzm
 # Inputs: 0) date/time or shift string 1) reference to list for returned components
 #         2) optional reference to list of time components (if shift string)
@@ -152 +152 @@
             # this is a time (can't come after timezone)
             (defined $v[3] or defined $v[6] or @vals > 3) and $err = 1, last;
-            not $time and @vals != 3 and $err = 1, last;
+            not $time and @vals != 3 and @vals != 2 and $err = 1, last;
             $v[3] = shift(@vals);   # take hour first if only one specified
             $v[4] = shift(@vals) || 0;
@@ -175 +175 @@
 #         2) shift direction, 3) reference to output list of shifted components
 #         4) number of decimal points in seconds
+#         5) reference to return time difference due to rounding
 # Returns: error string or undef on success
-sub ShiftComponents($$$$$)
+sub ShiftComponents($$$$$;$)
 {
-    my ($time, $shift, $dir, $toTime, $dec) = @_;
+    my ($time, $shift, $dir, $toTime, $dec, $rndPt) = @_;
     # min/max for Y, M, D, h, m, s
     my @min = (    0, 1, 1, 0, 0, 0);
@@ -203 +204 @@
     if (defined $sec and $sec != int($sec)) {
         my $mult = 10 ** $dec;
-        $$toTime[5] = int($sec * $mult + 0.5 * ($sec <=> 0)) / $mult;
+        my $rndSec = int($sec * $mult + 0.5 * ($sec <=> 0)) / $mult;
+        $rndPt and $$rndPt = $sec - $rndSec;
+        $$toTime[5] = $rndSec;
     }
 #
@@ -303 +306 @@
             $time[6] = $time[7] = 0 if $val =~ s/Z$/\+00:00/;
         }
-        my $err = ShiftComponents(\@time, \@shift, $dir, \@toTime, $dec);
+        my $rndDiff;
+        my $err = ShiftComponents(\@time, \@shift, $dir, \@toTime, $dec, \$rndDiff);
         $err and return $err;
 #
@@ -324 +328 @@
                     # handle fractional seconds separately
                     $diff = $tm2[0] - int($tm2[0]) - ($tm1[0] - int($tm1[0]));
+                    $diff += $rndDiff if defined $rndDiff;  # un-do rounding
                     $tm1[0] = int($tm1[0]);
                     $tm2[0] = int($tm2[0]);
@@ -376 +381 @@
             $tm += $$shiftOffset{$mode};    # apply the shift
             $tm < 0 and return 'Shift results in negative time';
-            # strip off fractional seconds after rounding to desired precision
-            # (only round if the result isn't integral)
+            # save fractional seconds in shifted time
             $frac = $tm - int($tm);
             if ($frac) {
-                # round off to required number of decimal points
-                my $tmf = $tm + 0.5 * 10 ** (-$dec);
-                $tm = int($tmf);
-                $frac = $tm - $tmf;
+                $tm = int($tm);
+                # must account for any rounding that could occur
+                $frac + 0.5 * 10 ** (-$dec) >= 1 and ++$tm, $frac = 0;
             }
             @tm = gmtime($tm);
@@ -491 +494 @@
     '2:0'       - shift 2 hours (time, date/time), or 2 months (date)
     '5:0:0'     - shift 5 hours (time, date/time), or 5 years (date)
-    '0:0:1'     - shift 1 sec (time, date/time), or 1 day (date)
+    '0:0:1'     - shift 1 s (time, date/time), or 1 day (date)
 
 If two arguments are given, the date shift is first, followed by the time
@@ -561 +564 @@
 philosophy).
 
+=head1 BUGS
+
+This feature uses the standard time library functions, which typically are
+limited to dates in the range 1970 to 2038.
+
 =head1 AUTHOR
 
-Copyright 2003-2007, Phil Harvey (phil at owl.phy.queensu.ca)
+Copyright 2003-2011, Phil Harvey (phil at owl.phy.queensu.ca)
 
 This library is free software; you can redistribute it and/or modify it