Changeset 24107 for main/trunk/greenstone2/perllib/cpan/Image/ExifTool/PNG.pm

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/PNG.pm (modified) (46 diffs)

main/trunk/greenstone2/perllib/cpan/Image/ExifTool/PNG.pm

@@ -12 +12 @@
 #               3) http://www.libpng.org/pub/mng/
 #               4) http://www.libpng.org/pub/png/spec/register/
-#
-# Notes:        I haven't found a sample PNG image with a 'iTXt' chunk, so
-#               this part of the code is still untested.
-#
-#               Writing meta information in PNG images is a pain in the butt
+#               5) ftp://ftp.simplesystems.org/pub/png/documents/pngext-1.4.0-pdg.html
+#
+# Notes:        Writing meta information in PNG images is a pain in the butt
 #               for a number of reasons:  One biggie is that you have to
 #               decompress then decode the ASCII/hex profile information before
@@ -29 +27 @@
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.15';
+$VERSION = '1.24';
 
 sub ProcessPNG_tEXt($$$);
@@ -38 +36 @@
 sub AddChunks($$);
 sub Add_iCCP($$);
+sub GetLangInfo($$);
+sub BuildTextChunk($$$$$);
 
 my $noCompressLib;
@@ -48 +48 @@
 );
 
+# map for directories in PNG images
+my %pngMap = (
+    IFD1         => 'IFD0',
+    EXIF         => 'IFD0', # to write EXIF as a block
+    ExifIFD      => 'IFD0',
+    GPS          => 'IFD0',
+    SubIFD       => 'IFD0',
+    GlobParamIFD => 'IFD0',
+    PrintIM      => 'IFD0',
+    InteropIFD   => 'ExifIFD',
+    MakerNotes   => 'ExifIFD',
+    IFD0         => 'PNG',
+    XMP          => 'PNG',
+    ICC_Profile  => 'PNG',
+    Photoshop    => 'PNG',
+    IPTC         => 'Photoshop',
+    MakerNotes   => 'ExifIFD',
+);
+
 # color type of current image
 $Image::ExifTool::PNG::colorType = -1;
@@ -55 +74 @@
     WRITE_PROC => \&Image::ExifTool::DummyWriteProc,
     GROUPS => { 2 => 'Image' },
+    PREFERRED => 1, # always add these tags when writing
+    NOTES => q{
+        Tags extracted from PNG images.  See
+        L<http://www.libpng.org/pub/png/spec/1.2/> for the official PNG 1.2
+        specification.
+    },
     bKGD => {
         Name => 'BackgroundColor',
@@ -62 +87 @@
         Name => 'PrimaryChromaticities',
         SubDirectory => { TagTable => 'Image::ExifTool::PNG::PrimaryChromaticities' },
+    },
+    dSIG => {
+        Name => 'DigitalSignature',
+        Binary => 1,
     },
     fRAc => {
@@ -130 +159 @@
         Name => 'SignificantBits',
         ValueConv => 'join(" ",unpack("C*",$val))',
+    },
+    sCAL => { # png 1.4.0
+        Name => 'SubjectScale',
+        SubDirectory => { TagTable => 'Image::ExifTool::PNG::SubjectScale' },
     },
     sPLT => {
@@ -145 +178 @@
             3 => 'Absolute Colorimetric',
         },
+    },
+    sTER => { # png 1.4.0
+        Name => 'StereoImage',
+        SubDirectory => { TagTable => 'Image::ExifTool::PNG::StereoImage' },
     },
     tEXt => {
@@ -162 +199 @@
         },
         PrintConv => '$self->ConvertDateTime($val)',
-        PrintConvInv => '$val',
+        PrintConvInv => '$self->InverseDateTime($val)',
     },
     tRNS => {
@@ -175 +212 @@
         Notes => 'obsolete location specified by older XMP draft',
         SubDirectory => { TagTable => 'Image::ExifTool::XMP::Main' },
+    },
+    vpAg => { # private imagemagick chunk
+        Name => 'VirtualPage',
+        SubDirectory => { TagTable => 'Image::ExifTool::PNG::VirtualPage' },
     },
     zTXt => {
@@ -256 +297 @@
 );
 
+# PNG sCAL chunk
+%Image::ExifTool::PNG::SubjectScale = (
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    GROUPS => { 2 => 'Image' },
+    0 => {
+        Name => 'SubjectUnits',
+        PrintConv => { 1 => 'Meters', 2 => 'Radians' },
+    },
+    1 => {
+        Name => 'SubjectPixelWidth',
+        Format => 'var_string',
+    },
+    2 => {
+        Name => 'SubjectPixelHeight',
+        Format => 'var_string',
+    },
+);
+
+# PNG vpAg chunk
+%Image::ExifTool::PNG::VirtualPage = (
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    GROUPS => { 2 => 'Image' },
+    FORMAT => 'int32u',
+    0 => 'VirtualImageWidth',
+    1 => 'VirtualImageHeight',
+    2 => {
+        Name => 'VirtualPageUnits',
+        Format => 'int8u',
+        # what is the conversion for this?
+    },
+);
+
+# PNG sTER chunk
+%Image::ExifTool::PNG::StereoImage = (
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    GROUPS => { 2 => 'Image' },
+    0 => {
+        Name => 'StereoMode',
+        PrintConv => {
+            0 => 'Cross-fuse Layout',
+            1 => 'Diverging-fuse Layout',
+        },
+    },
+);
+
 my %unreg = ( Notes => 'unregistered' );
 
@@ -266 +352 @@
     PREFERRED => 1, # always add these tags when writing
     GROUPS => { 2 => 'Image' },
+    LANG_INFO => \&GetLangInfo,
     NOTES => q{
-The PNG TextualData format allows aribrary tag names to be used.  The tags
-listed below are the only ones that can be written (unless new user-defined
-tags are added via the configuration file), however ExifTool will extract
-any other TextualData tags that are found.
-
-The information for the TextualData tags may be stored as tEXt, zTXt or iTXt
-chunks in the PNG image.  ExifTool will read and edit tags in their original
-form, but tEXt chunks are written by default when creating new tags.
-Compressed zTXt chunks are written only if Compress::Zlib is available, and
-only for profile information or when the -z (Compress) option is specified.
-
-Some of the tags below are not registered as part of the PNG specification,
-but are included here because they are generated by other software such as
-ImageMagick.
+        The PNG TextualData format allows arbitrary tag names to be used.  The tags
+        listed below are the only ones that can be written (unless new user-defined
+        tags are added via the configuration file), however ExifTool will extract
+        any other TextualData tags that are found.
+        
+        These tags may be stored as tEXt, zTXt or iTXt chunks in the PNG image.  By
+        default ExifTool writes new string-value tags as as uncompressed tEXt, or
+        compressed zTXt if the Compress (-z) option is used and Compress::Zlib is
+        available.  Alternate language tags and values containing special characters
+        (unless the Latin character set is used) are written as iTXt, and compressed
+        if the Compress option is used and Compress::Zlib is available.  Raw profile
+        information is always created as compressed zTXt if Compress::Zlib is
+        available, or tEXt otherwise.  Standard XMP is written as uncompressed iTXt.
+
+        Alternate languages are accessed by suffixing the tag name with a '-',
+        followed by an RFC 3066 language code (ie. "PNG:Comment-fr", or
+        "Title-en-US").  See L<http://www.ietf.org/rfc/rfc3066.txt> for the RFC 3066
+        specification.
+
+        Some of the tags below are not registered as part of the PNG specification,
+        but are included here because they are generated by other software such as
+        ImageMagick.
     },
     Title       => { },
@@ -306 +401 @@
     Make        => { %unreg, Groups => { 2 => 'Camera' } },
     Model       => { %unreg, Groups => { 2 => 'Camera' } },
+   'create-date'=> {
+        Name => 'CreateDate',
+        Groups => { 2 => 'Time' },
+        Shift => 'Time',
+        %unreg,
+        ValueConv => 'require Image::ExifTool::XMP; Image::ExifTool::XMP::ConvertXMPDate($val)',
+        ValueConvInv => 'require Image::ExifTool::XMP; Image::ExifTool::XMP::FormatXMPDate($val)',
+        PrintConv => '$self->ConvertDateTime($val)',
+        PrintConvInv => '$self->InverseDateTime($val,undef,1)',
+    },
+   'modify-date'=> {
+        Name => 'ModDate', # (to distinguish from tIME chunk "ModifyDate")
+        Groups => { 2 => 'Time' },
+        Shift => 'Time',
+        %unreg,
+        ValueConv => 'require Image::ExifTool::XMP; Image::ExifTool::XMP::ConvertXMPDate($val)',
+        ValueConvInv => 'require Image::ExifTool::XMP; Image::ExifTool::XMP::FormatXMPDate($val)',
+        PrintConv => '$self->ConvertDateTime($val)',
+        PrintConvInv => '$self->InverseDateTime($val,undef,1)',
+    },
     TimeStamp   => { %unreg, Groups => { 2 => 'Time' }, Shift => 'Time' },
     URL         => { %unreg },
@@ -311 +426 @@
         Name => 'XMP',
         Notes => q{
-            location according to the XMP specification -- this is where ExifTool will
-            add a new XMP chunk if the image didn't already contain XMP
+            unregistered, but this is the location according to the XMP specification,
+            and is where ExifTool will add a new XMP chunk if the image didn't already
+            contain XMP
         },
         SubDirectory => {
@@ -323 +439 @@
             # (No condition because this is just for BuildTagLookup)
             Name => 'APP1_Profile',
+            %unreg,
             SubDirectory => {
                 TagTable=>'Image::ExifTool::Exif::Main',
@@ -338 +455 @@
    'Raw profile type exif' => {
         Name => 'EXIF_Profile',
+        %unreg,
         SubDirectory => {
             TagTable=>'Image::ExifTool::Exif::Main',
@@ -345 +463 @@
    'Raw profile type icc' => {
         Name => 'ICC_Profile',
+        %unreg,
         SubDirectory => {
             TagTable => 'Image::ExifTool::ICC_Profile::Main',
@@ -352 +471 @@
    'Raw profile type icm' => {
         Name => 'ICC_Profile',
+        %unreg,
         SubDirectory => {
             TagTable => 'Image::ExifTool::ICC_Profile::Main',
@@ -359 +479 @@
    'Raw profile type iptc' => {
         Name => 'IPTC_Profile',
+        %unreg,
         SubDirectory => {
             TagTable => 'Image::ExifTool::Photoshop::Main',
@@ -366 +487 @@
    'Raw profile type xmp' => {
         Name => 'XMP_Profile',
+        %unreg,
         SubDirectory => {
             TagTable => 'Image::ExifTool::XMP::Main',
@@ -379 +501 @@
 {
     return Image::ExifTool::DoAutoLoad($AUTOLOAD, @_);
+}
+
+#------------------------------------------------------------------------------
+# Get standard case for language code (this routine copied from XMP.pm)
+# Inputs: 0) Language code
+# Returns: Language code in standard case
+sub StandardLangCase($)
+{
+    my $lang = shift;
+    # make 2nd subtag uppercase only if it is 2 letters
+    return lc($1) . uc($2) . lc($3) if $lang =~ /^([a-z]{2,3}|[xi])(-[a-z]{2})\b(.*)/i;
+    return lc($lang);
+}
+
+#------------------------------------------------------------------------------
+# Get localized version of tagInfo hash
+# Inputs: 0) tagInfo hash ref, 1) language code (ie. "x-default")
+# Returns: new tagInfo hash ref, or undef if invalid
+sub GetLangInfo($$)
+{
+    my ($tagInfo, $lang) = @_;
+    $lang =~ tr/_/-/;   # RFC 3066 specifies '-' as a separator
+    # no alternate languages for XMP or raw profile directories
+    return undef if $$tagInfo{SubDirectory};
+    # language code must normalized for use in tag ID
+    return Image::ExifTool::GetLangInfo($tagInfo, StandardLangCase($lang));
 }
 
@@ -386 +534 @@
 #         2) Tag ID, 3) Tag value, 4) [optional] compressed data flag:
 #            0=not compressed, 1=unknown compression, 2-N=compression with type N-2
-#         5) optional output buffer reference
+#         5) optional output buffer ref, 6) character encoding (tEXt/zTXt/iTXt only)
+#         6) optional language code
 # Returns: 1 on success
-sub FoundPNG($$$$;$$)
+sub FoundPNG($$$$;$$$$)
 {
-    my ($exifTool, $tagTablePtr, $tag, $val, $compressed, $outBuff) = @_;
+    my ($exifTool, $tagTablePtr, $tag, $val, $compressed, $outBuff, $enc, $lang) = @_;
+    return 0 unless defined $val;
+    my $verbose = $exifTool->Options('Verbose');
+    my $id = $tag;  # generate tag ID which include language code
+    if ($lang) {
+        # case of language code must be normalized since they are case insensitive
+        $lang = StandardLangCase($lang);
+        $id .= '-' . $lang;
+    }
+    my $tagInfo = $exifTool->GetTagInfo($tagTablePtr, $id) ||
+                  # (some software forgets to capitalize first letter)
+                  $exifTool->GetTagInfo($tagTablePtr, ucfirst($id));
+    # create alternate language tag if necessary
+    if (not $tagInfo and $lang) {
+        $tagInfo = $exifTool->GetTagInfo($tagTablePtr, $tag) ||
+                   $exifTool->GetTagInfo($tagTablePtr, ucfirst($tag));
+        $tagInfo = GetLangInfo($tagInfo, $lang) if $tagInfo;
+    }
+#
+# uncompress data if necessary
+#
     my ($wasCompressed, $deflateErr);
-    return 0 unless defined $val;
-#
-# First, uncompress data if requested
-#
-    my $verbose = $exifTool->Options('Verbose');
-    my $out = $exifTool->Options('TextOut');
-    my $tagInfo = $exifTool->GetTagInfo($tagTablePtr, $tag) ||
-                  # (some software forgets to capitalize first letter)
-                  $exifTool->GetTagInfo($tagTablePtr, ucfirst($tag));
-
     if ($compressed and $compressed > 1) {
         if ($compressed == 2) { # Inflate/Deflate compression
@@ -416 +575 @@
                 }
             } elsif (not $noCompressLib) {
-                $noCompressLib = 1;
-                my $verb = $outBuff ? 'write' : 'decode';
-                $deflateErr = "Install Compress::Zlib to $verb compressed information";
+                $deflateErr = "Install Compress::Zlib to read compressed information";
             } else {
                 $deflateErr = '';   # flag deflate error but no warning
@@ -429 +586 @@
             $exifTool->VerboseDir("Unable to decompress $$tagInfo{Name}", 0, length($val));
         }
-        $exifTool->Warn($deflateErr) if $deflateErr and not $outBuff;
+        # issue warning if relevant
+        if ($deflateErr and (not $outBuff or
+            ($tagInfo and $$tagInfo{SubDirectory} and $$exifTool{EDIT_DIRS}{$$tagInfo{Name}})))
+        {
+            $exifTool->Warn($deflateErr);
+            $noCompressLib = 1 if $deflateErr =~ /^Install/;
+        }
+    }
+    # translate character encoding if necessary (tEXt/zTXt/iTXt string values only)
+    if ($enc and not $compressed and not ($tagInfo and $$tagInfo{SubDirectory})) {
+        $val = $exifTool->Decode($val, $enc);
     }
 #
@@ -444 +611 @@
                     $wasCompressed and $name = "Decompressed $name";
                     $exifTool->VerboseDir($name, 0, $len);
-                    my %parms = ( Prefix => $exifTool->{INDENT}, Out => $out );
-                    $parms{MaxLen} = 96 unless $verbose > 3;
-                    Image::ExifTool::HexDump(\$val, undef, %parms);
+                    $exifTool->VerboseDump(\$val);
                 }
                 # don't indent next directory (since it is really the same data)
@@ -457 +622 @@
             return 1 if $outBuff and not $$subTable{WRITE_PROC};
             my %subdirInfo = (
-                DataPt => \$val,
+                DataPt   => \$val,
                 DirStart => 0,
-                DataLen => $len,
-                DirLen => $len,
-                DirName => $tagName,
-                TagInfo => $tagInfo,
+                DataLen  => $len,
+                DirLen   => $len,
+                DirName  => $tagName,
+                TagInfo  => $tagInfo,
                 ReadOnly => 1, # (only used by WriteXMP)
-                OutBuff => $outBuff,
+                OutBuff  => $outBuff,
             );
             # no need to re-decompress if already done
@@ -482 +647 @@
         if ($outBuff) {
             my $writable = $tagInfo->{Writable};
+            my $isOverwriting;
             if ($writable or ($$tagTablePtr{WRITABLE} and
                 not defined $writable and not $$tagInfo{SubDirectory}))
             {
                 # write new value for this tag if necessary
-                my ($isOverwriting, $newVal);
+                my $newVal;
                 if ($exifTool->{DEL_GROUP}->{PNG}) {
                     # remove this tag now, but keep in ADD_PNG list to add back later
@@ -492 +658 @@
                 } else {
                     # remove this from the list of PNG tags to add
-                    delete $exifTool->{ADD_PNG}->{$tag};
+                    delete $exifTool->{ADD_PNG}->{$id};
                     # (also handle case of tEXt tags written with lowercase first letter)
-                    delete $exifTool->{ADD_PNG}->{ucfirst($tag)};
-                    my $newValueHash = $exifTool->GetNewValueHash($tagInfo);
-                    $isOverwriting = Image::ExifTool::IsOverwriting($newValueHash);
+                    delete $exifTool->{ADD_PNG}->{ucfirst($id)};
+                    my $nvHash = $exifTool->GetNewValueHash($tagInfo);
+                    $isOverwriting = Image::ExifTool::IsOverwriting($nvHash);
                     if (defined $deflateErr) {
-                        $newVal = Image::ExifTool::GetNewValues($newValueHash);
-                        # can only write tag now if unconditionally deleting it
-                        if ($isOverwriting > 0 and not defined $newVal) {
+                        $newVal = Image::ExifTool::GetNewValues($nvHash);
+                        # can only write tag now if always overwriting
+                        if ($isOverwriting > 0) {
                             $val = '<deflate error>';
-                        } else {
-                            $isOverwriting = 0; # can't rewrite this compressed text
+                        } elsif ($isOverwriting) {
+                            $isOverwriting = 0; # can't overwrite
                             $exifTool->Warn($deflateErr) if $deflateErr;
                         }
                     } else {
                         if ($isOverwriting < 0) {
-                            $isOverwriting = Image::ExifTool::IsOverwriting($newValueHash, $val);
+                            $isOverwriting = Image::ExifTool::IsOverwriting($nvHash, $val);
                         }
                         # (must get new value after IsOverwriting() in case it was shifted)
-                        $newVal = Image::ExifTool::GetNewValues($newValueHash);
+                        $newVal = Image::ExifTool::GetNewValues($nvHash);
                     }
                 }
                 if ($isOverwriting) {
-                    $$outBuff =  (defined $newVal) ? $newVal : '';
+                    $$outBuff = (defined $newVal) ? $newVal : '';
                     ++$exifTool->{CHANGED};
-                    if ($verbose > 1) {
-                        print $out "    - PNG:$tagName = '",$exifTool->Printable($val),"'\n";
-                        print $out "    + PNG:$tagName = '",$exifTool->Printable($newVal),"'\n" if defined $newVal;
-                    }
+                    $exifTool->VerboseValue("- PNG:$tagName", $val);
+                    $exifTool->VerboseValue("+ PNG:$tagName", $newVal) if defined $newVal;
                 }
             }
-            if ($$outBuff) {
-                if ($wasCompressed) {
+            if (defined $$outBuff and length $$outBuff) {
+                if ($enc) { # must be tEXt/zTXt/iTXt if $enc is set
+                    $$outBuff = BuildTextChunk($exifTool, $tag, $tagInfo, $$outBuff, $lang);
+                } elsif ($wasCompressed) {
                     # re-compress the output data
                     my $deflate;
@@ -537 +703 @@
                     }
                     $$outBuff or $exifTool->Warn("PNG:$tagName not written (compress error)");
-                } elsif ($exifTool->Options('Compress')) {
-                    $exifTool->Warn("PNG:$tagName not compressed (uncompressed tag existed)", 1);
                 }
             }
@@ -548 +712 @@
         ($name = $tag) =~ s/\s+(.)/\u$1/g;   # remove white space from tag name
         $tagInfo = { Name => $name };
+        $$tagInfo{LangCode} = $lang if $lang;
         # make unknown profiles binary data type
-        $$tagInfo{ValueConv} = '\$val' if $tag =~ /^Raw profile type /;
+        $$tagInfo{Binary} = 1 if $tag =~ /^Raw profile type /;
         Image::ExifTool::AddTagToTable($tagTablePtr, $tag, $tagInfo);
     }
@@ -605 +770 @@
         if ($verbose > 2) {
             $exifTool->VerboseDir("Decoded $tagName", 0, $len);
-            my %parms = (
-                Prefix => $exifTool->{INDENT},
-                Out => $exifTool->Options('TextOut'),
-            );
-            $parms{MaxLen} = 96 unless $verbose > 3;
-            Image::ExifTool::HexDump(\$buff, undef, %parms);
+            $exifTool->VerboseDump(\$buff);
         }
         # don't indent next directory (since it is really the same data)
@@ -647 +807 @@
         $dirInfo{DirStart} += $hdrLen;
         $dirInfo{DirLen} -= $hdrLen;
-        $processed = $exifTool->ProcessTIFF(\%dirInfo);
         if ($outBuff) {
-            if ($$outBuff) {
-                $$outBuff = $Image::ExifTool::exifAPP1hdr . $$outBuff if $$outBuff;
-            } else {
-                $$outBuff = '' if $processed;
-            }
+            $$outBuff = $exifTool->WriteDirectory(\%dirInfo, $tagTablePtr,
+                                                  \&Image::ExifTool::WriteTIFF);
+            $$outBuff = $Image::ExifTool::exifAPP1hdr . $$outBuff if $$outBuff;
             delete $$addDirs{IFD0};
+        } else {
+            $processed = $exifTool->ProcessTIFF(\%dirInfo);
         }
     } elsif ($buff =~ /^$Image::ExifTool::xmpAPP1hdr/) {
@@ -673 +832 @@
         # TIFF information (haven't seen this, but what the heck...)
         return 1 if $outBuff and not $$editDirs{IFD0};
-        $processed = $exifTool->ProcessTIFF(\%dirInfo);
         if ($outBuff) {
-            if ($$outBuff) {
-                $$outBuff = $Image::ExifTool::exifAPP1hdr . $$outBuff if $$outBuff;
-            } else {
-                $$outBuff = '' if $processed;
-            }
+            $$outBuff = $exifTool->WriteDirectory(\%dirInfo, $tagTablePtr,
+                                                  \&Image::ExifTool::WriteTIFF);
+            $$outBuff = $Image::ExifTool::exifAPP1hdr . $$outBuff if $$outBuff;
             delete $$addDirs{IFD0};
+        } else {
+            $processed = $exifTool->ProcessTIFF(\%dirInfo);
         }
     } else {
@@ -687 +845 @@
         $exifTool->Warn("Unknown raw profile '$profName'");
     }
-    if ($outBuff and $$outBuff) {
+    if ($outBuff and defined $$outBuff and length $$outBuff) {
         if ($exifTool->{CHANGED} != $oldChanged) {
             my $hdr = sprintf("\n%s\n%8d\n", $profileType, length($$outBuff));
@@ -703 +861 @@
 # Inputs: 0) ExifTool object reference, 1) DirInfo reference, 2) Pointer to tag table
 # Returns: 1 on success
+# Notes: writes new chunk data to ${$$dirInfo{OutBuff}} if writing tag
 sub ProcessPNG_Compressed($$$)
 {
@@ -712 +871 @@
     my $hdr = $tag . "\0" . substr($val, 0, 1);
     $val = substr($val, 1); # remove compression method byte
+    my $success;
+    my $outBuff = $$dirInfo{OutBuff};
     # use the PNG chunk tag instead of the embedded tag name for iCCP chunks
     if ($$dirInfo{TagInfo} and $$dirInfo{TagInfo}->{Name} eq 'ICC_Profile') {
         $tag = 'iCCP';
         $tagTablePtr = \%Image::ExifTool::PNG::Main;
-    }
-    my $outBuff = $$dirInfo{OutBuff};
-    my $rtnVal = FoundPNG($exifTool, $tagTablePtr, $tag, $val, $compressed, $outBuff);
-    # add header back onto this chunk if we are writing
-    $$outBuff = $hdr . $$outBuff if $outBuff and $$outBuff;
-    return $rtnVal;
+        $success = FoundPNG($exifTool, $tagTablePtr, $tag, $val, $compressed, $outBuff);
+        $$outBuff = $hdr . $$outBuff if $outBuff and $$outBuff;
+    } else {
+        $success = FoundPNG($exifTool, $tagTablePtr, $tag, $val, $compressed, $outBuff, 'Latin');
+    }
+    return $success;
 }
 
@@ -728 +889 @@
 # Inputs: 0) ExifTool object reference, 1) DirInfo reference, 2) Pointer to tag table
 # Returns: 1 on success
+# Notes: writes new chunk data to ${$$dirInfo{OutBuff}} if writing tag
 sub ProcessPNG_tEXt($$$)
 {
@@ -733 +895 @@
     my ($tag, $val) = split /\0/, ${$$dirInfo{DataPt}}, 2;
     my $outBuff = $$dirInfo{OutBuff};
-    my $rtnVal = FoundPNG($exifTool, $tagTablePtr, $tag, $val, undef, $outBuff);
-    # add header back onto this chunk if we are writing
-    $$outBuff = $tag . "\0" . $$outBuff if $outBuff and $$outBuff;
-    return $rtnVal;
+    return FoundPNG($exifTool, $tagTablePtr, $tag, $val, undef, $outBuff, 'Latin');
 }
 
@@ -743 +902 @@
 # Inputs: 0) ExifTool object reference, 1) DirInfo reference, 2) Pointer to tag table
 # Returns: 1 on success
+# Notes: writes new chunk data to ${$$dirInfo{OutBuff}} if writing tag
 sub ProcessPNG_iTXt($$$)
 {
@@ -753 +913 @@
     $compressed and $compressed = 2 + $meth;
     my $outBuff = $$dirInfo{OutBuff};
-    my $rtnVal = FoundPNG($exifTool, $tagTablePtr, $tag, $val, $compressed, $outBuff);
-    if ($outBuff and $$outBuff) {
-        $$outBuff = $tag . "\0" . substr($dat, 0, 2) . "$lang\0$trans\0" . $$outBuff;
-    }
-    return $rtnVal;
+    return FoundPNG($exifTool, $tagTablePtr, $tag, $val, $compressed, $outBuff, 'UTF8', $lang);
 }
 
@@ -777 +933 @@
     return 0 unless $raf->Read($sig,8) == 8 and $pngLookup{$sig};
     if ($outfile) {
+        delete $$exifTool{TextChunkType};
         Write($outfile, $sig) or $err = 1 if $outfile;
         # can only add tags in Main and TextualData tables
@@ -782 +939 @@
             \%Image::ExifTool::PNG::Main,
             \%Image::ExifTool::PNG::TextualData);
-        # initialize with same directories as JPEG, but PNG tags take priority
-        $exifTool->InitWriteDirs('JPEG','PNG');
+        # initialize with same directories, with PNG tags taking priority
+        $exifTool->InitWriteDirs(\%pngMap,'PNG');
     }
     my ($fileType, $hdrChunk, $endChunk) = @{$pngLookup{$sig}};
@@ -847 +1004 @@
             if ($chunk eq $hdrChunk) {
                 $foundHdr = 1;
+            } elsif ($hdrChunk eq 'IHDR' and $chunk eq 'CgBI') {
+                $exifTool->Warn('Non-standard PNG image (Apple iPhone format)');
             } else {
                 $exifTool->Warn("$fileType image did not start with $hdrChunk");
@@ -862 +1021 @@
             }
             print $out "$fileType $chunk ($len bytes):\n";
-            if ($verbose > 2) {
-                my %dumpParms = ( Out => $out );
-                $dumpParms{MaxLen} = 96 if $verbose <= 4;
-                Image::ExifTool::HexDump(\$dbuf, undef, %dumpParms);
-            }
+            $exifTool->VerboseDump(\$dbuf, Addr => $raf->Tell() - $len - 4) if $verbose > 2;
         }
         # only extract information from chunks in our tables
@@ -877 +1032 @@
         }
         if ($outfile) {
-            if ($theBuff) {
-                $hbuf = pack('Na4',length($theBuff), $chunk);
+            if (defined $theBuff) {
+                next unless length $theBuff; # empty if we deleted the information
+                # change chunk type if necessary
+                if ($$exifTool{TextChunkType}) {
+                    $chunk = $$exifTool{TextChunkType};
+                    delete $$exifTool{TextChunkType};
+                }
+                $hbuf = pack('Na4', length($theBuff), $chunk);
                 $dbuf = $theBuff;
                 my $crc = CalculateCRC(\$hbuf, undef, 4);
                 $crc = CalculateCRC(\$dbuf, $crc);
                 $cbuf = pack('N', $crc);
-            } elsif (defined $theBuff) {
-                next;   # empty if we deleted the information
             }
             Write($outfile, $hbuf, $dbuf, $cbuf) or $err = 1;
@@ -913 +1072 @@
 =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