Changeset 24107 for main/trunk/greenstone2/perllib/cpan/Image/ExifTool/WriteCanonRaw.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/WriteCanonRaw.pl (modified) (14 diffs)

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

@@ -11 +11 @@
 use vars qw($VERSION $AUTOLOAD %crwTagFormat);
 use Image::ExifTool::Fixup;
+
+# map for adding directories to CRW
+my %crwMap = (
+    XMP      => 'CanonVRD',
+    CanonVRD => 'Trailer',
+);
 
 # mappings to from RAW tagID to MakerNotes tagID
@@ -77 +83 @@
     # (and has the same raw tagID as CanonFileDescription)
     return if $tagInfo and $$tagInfo{Name} eq 'UserComment';
-    my $tagType = ($rawTag >> 8) & 0x38;
     my $format = $Image::ExifTool::Exif::formatNumber{$formName};
     my $fsiz = $Image::ExifTool::Exif::formatSize[$format];
@@ -166 +171 @@
 {
     my ($exifTool, $tagInfo, $valPtr) = @_;
-    Image::ExifTool::GenerateTagIDs($$tagInfo{Table});
     my $tagName = $$tagInfo{Name};
     if ($tagName eq 'JpgFromRaw' or $tagName eq 'ThumbnailImage') {
@@ -193 +197 @@
     my ($exifTool, $dirInfo, $tagTablePtr) = @_;
     my $dataPt = $$dirInfo{DataPt} or return 0;
-    my $raf = $$dirInfo{RAF} or return 0;
     my $outfile = $$dirInfo{OutFile} or return 0;
+    $$dirInfo{RAF} or return 0;
 
     # check CR2 signature
-    return 0 if $$dataPt !~ /^.{8}CR\x02\0/s and
-        $exifTool->Error("Unsupported Canon RAW file. May cause problems if rewritten", 1);
+    if ($$dataPt !~ /^.{8}CR\x02\0/s) {
+        my ($msg, $minor);
+        if ($$dataPt =~ /^.{8}CR/s) {
+            $msg = 'Unsupported Canon RAW file. May cause problems if rewritten';
+            $minor = 1;
+        } elsif ($$dataPt =~ /^.{8}\xba\xb0\xac\xbb/s) {
+            $msg = 'Can not currently write Canon 1D RAW images';
+        } else {
+            $msg = 'Unrecognized Canon RAW file';
+        }
+        return 0 if $exifTool->Error($msg, $minor);
+    }
+
     # CR2 has a 16-byte header
     $$dirInfo{NewDataPos} = 16;
@@ -231 +246 @@
 # Inputs: 0) ExifTool object reference, 1) source dirInfo reference,
 #         2) tag table reference
-# Returns: true on sucess
+# Returns: true on success
 # Notes: Increments ExifTool CHANGED flag for each tag changed This routine is
 # different from all of the other write routines because Canon RAW files are
@@ -237 +252 @@
 # writing it out.  Therefore this routine doesn't return the directory data as
 # the rest of the Write routines do.  Instead, it writes to the dirInfo
-# Outfile on the fly --> much faster, efficient, and less demanding on memory!
+# OutFile on the fly --> much faster, efficient, and less demanding on memory!
 sub WriteCanonRaw($$$)
 {
@@ -294 +309 @@
             my $newVal = $exifTool->GetNewValues($tagInfo);
             if (defined $newVal) {
+                # pad value to an even length (Canon ImageBrowser and ZoomBrowser
+                # version 6.1.1 have problems with odd-sized embedded JPEG images
+                # even if the value is padded to maintain alignment, so do this
+                # before calculating the size for the directory entry)
+                $newVal .= "\0" if length($newVal) & 0x01;
                 # add new directory entry
                 $newDir .= Set16u($addTag) . Set32u(length($newVal)) .
@@ -307 +327 @@
         }
         last unless defined $tag;           # all done if no more directory entries
-        return 0 if $tag & 0x8000;      # top bit should not be set
+        return 0 if $tag & 0x8000;          # top bit should not be set
         my $tagID = $tag & 0x3fff;          # get tag ID
         my $tagType = ($tag >> 8) & 0x38;   # get tag type
@@ -410 +430 @@
                     $oldVal = $value;
                 }
-                my $newValueHash = $exifTool->GetNewValueHash($tagInfo);
-                if (Image::ExifTool::IsOverwriting($newValueHash, $oldVal)) {
-                    my $newVal = Image::ExifTool::GetNewValues($newValueHash);
+                my $nvHash = $exifTool->GetNewValueHash($tagInfo);
+                if (Image::ExifTool::IsOverwriting($nvHash, $oldVal)) {
+                    my $newVal = Image::ExifTool::GetNewValues($nvHash);
                     my $verboseVal;
                     $verboseVal = $newVal if $verbose > 1;
@@ -422 +442 @@
                         $value = $newVal;
                         ++$exifTool->{CHANGED};
-                        if ($verbose > 1) {
-                            my $oldStr = $exifTool->Printable($oldVal);
-                            my $newStr = $exifTool->Printable($verboseVal);
-                            print $out "    - CanonRaw:$$tagInfo{Name} = '$oldStr'\n";
-                            print $out "    + CanonRaw:$$tagInfo{Name} = '$newStr'\n";
-                        }
+                        $exifTool->VerboseValue("- CanonRaw:$$tagInfo{Name}", $oldVal);
+                        $exifTool->VerboseValue("+ CanonRaw:$$tagInfo{Name}", $verboseVal);
                     }
                 }
@@ -505 +521 @@
     if ($exifTool->{DEL_GROUP}->{MakerNotes}) {
         if ($type eq 'CCDR') {
-            $exifTool->Error("Can't delete Makernotes group in CRW file");
+            $exifTool->Error("Can't delete MakerNotes group in CRW file");
             return 0;
         } else {
@@ -511 +527 @@
             return 1;
         }
+    }
+    # make XMP the preferred group for CRW files
+    if ($$exifTool{FILE_TYPE} eq 'CRW') {
+        $exifTool->InitWriteDirs(\%crwMap, 'XMP');
     }
 
@@ -552 +572 @@
         # add CanonVRD trailer if writing as a block
         $trailPt = $exifTool->AddNewTrailers($trailPt,'CanonVRD');
+        if (not $trailPt and $$exifTool{ADD_DIRS}{CanonVRD}) {
+            # create CanonVRD from scratch if necessary
+            my $outbuff = '';
+            my $saveOrder = GetByteOrder();
+            require Image::ExifTool::CanonVRD;
+            if (Image::ExifTool::CanonVRD::ProcessCanonVRD($exifTool, { OutFile => \$outbuff }) > 0) {
+                $trailPt = \$outbuff;
+            }
+            SetByteOrder($saveOrder);
+        }
         # write trailer
         if ($trailPt) {
@@ -593 +623 @@
 =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