exiftool_vendored 10.65.0 → 11.41.0

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

@@ -25,7 +25,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 
-$VERSION = '1.14';
+$VERSION = '1.17';
 
 sub ProcessSEI($$);
 
@@ -433,24 +433,24 @@ my $parsePictureTiming; # flag to enable parsing of picture timing information (
     1.1 => {
         Name => 'ExposureProgram',
         Mask => 0xf0,
-        ValueConv => '$val == 0xf0 ? undef : $val',
+        ValueConv => '$val == 15 ? undef : $val',
         PrintConv => {
-            0x00 => 'Program AE',
-            0x10 => 'Gain', #?
-            0x20 => 'Shutter speed priority AE',
-            0x30 => 'Aperture-priority AE',
-            0x40 => 'Manual',
+            0 => 'Program AE',
+            1 => 'Gain', #?
+            2 => 'Shutter speed priority AE',
+            3 => 'Aperture-priority AE',
+            4 => 'Manual',
         },
     },
     2.1 => {
         Name => 'WhiteBalance',
         Mask => 0xe0,
-        ValueConv => '$val == 0xe0 ? undef : $val',
+        ValueConv => '$val == 7 ? undef : $val',
         PrintConv => {
-            0x00 => 'Auto',
-            0x20 => 'Hold',
-            0x40 => '1-Push',
-            0x60 => 'Daylight',
+            0 => 'Auto',
+            1 => 'Hold',
+            2 => '1-Push',
+            3 => 'Daylight',
         },
     },
     3 => {
@@ -710,7 +710,8 @@ sub DecodeScalingMatrices($)
 
 #------------------------------------------------------------------------------
 # Parse H.264 sequence parameter set RBSP (ref 1)
-# Inputs) 0) ExifTool ref, 1) tag table ref, 2) data ref
+# Inputs: 0) ExifTool ref, 1) tag table ref, 2) data ref
+# Notes: All this just to get the image size!
 sub ParseSeqParamSet($$$)
 {
     my ($et, $tagTablePtr, $dataPt) = @_;
@@ -832,7 +833,9 @@ sub ParseSeqParamSet($$$)
 
 #------------------------------------------------------------------------------
 # Parse H.264 picture timing SEI message (payload type 1) (ref 1)
-# Inputs) 0) ExifTool ref, 1) data ref
+# Inputs: 0) ExifTool ref, 1) data ref
+# Notes: this routine is for test purposes only, and not called unless the
+#        $parsePictureTiming flag is set
 sub ParsePictureTiming($$)
 {
     my ($et, $dataPt) = @_;
@@ -889,6 +892,26 @@ sub ParsePictureTiming($$)
 # Process H.264 Supplementary Enhancement Information (ref 1/PH)
 # Inputs: 0) Exiftool ref, 1) dirInfo ref, 2) tag table ref
 # Returns: 1 if we processed payload type 5
+# Payload types:
+#   0 - buffer period
+#   1 - pic timing
+#   2 - pan scan rect
+#   3 - filler payload
+#   4 - user data registered itu t t35
+#   5 - user data unregistered
+#   6 - recovery point
+#   7 - dec ref pic marking repetition
+#   8 - spare pic
+#   9 - sene info
+#  10 - sub seq info
+#  11 - sub seq layer characteristics
+#  12 - sub seq characteristics
+#  13 - full frame freeze
+#  14 - full frame freeze release
+#  15 - full frame snapshot
+#  16 - progressive refinement segment start
+#  17 - progressive refinement segment end
+#  18 - motion constrained slice group set
 sub ProcessSEI($$)
 {
     my ($et, $dirInfo) = @_;
@@ -915,6 +938,7 @@ sub ProcessSEI($$)
             last unless $t == 255;
         }
         return 0 if $pos + $size > $end;
+        $et->VPrint(1,"    (SEI type $type)\n");
         if ($type == 1) {                   # picture timing information
             if ($parsePictureTiming) {
                 my $buff = substr($$dataPt, $pos, $size);
@@ -1031,9 +1055,7 @@ sub ParseH264Video($$)
         $buff .= substr($$dataPt, $pos, $end - $pos);
         if ($verbose > 1) {
             printf $out "  NAL Unit Type: 0x%x (%d bytes)\n",$nal_unit_type, length $buff;
-            my %parms = ( Out => $out );
-            $parms{MaxLen} = 96 if $verbose < 4;
-            HexDump(\$buff, undef, %parms) if $verbose > 2;
+            $et->VerboseDump(\$buff);
         }
         pos($$dataPt) = $pos = $nextPos;
 
@@ -1086,7 +1108,7 @@ information from H.264 video streams.
 
 =head1 AUTHOR
 
-Copyright 2003-2017, Phil Harvey (phil at owl.phy.queensu.ca)
+Copyright 2003-2019, Phil Harvey (phil at owl.phy.queensu.ca)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.

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

@@ -250,7 +250,7 @@ Hewlett-Packard maker notes.
 
 =head1 AUTHOR
 
-Copyright 2003-2017, Phil Harvey (phil at owl.phy.queensu.ca)
+Copyright 2003-2019, Phil Harvey (phil at owl.phy.queensu.ca)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.

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

@@ -20,7 +20,7 @@ use Image::ExifTool::PostScript;
 use Image::ExifTool::XMP qw(EscapeXML UnescapeXML);
 require Exporter;
 
-$VERSION = '1.15';
+$VERSION = '1.16';
 @ISA = qw(Exporter);
 @EXPORT_OK = qw(EscapeHTML UnescapeHTML);
 
@@ -363,11 +363,11 @@ sub EscapeChar($)
 
 #------------------------------------------------------------------------------
 # Escape any special characters for HTML
-# Inputs: 0) UTF-8 string to be escaped
+# Inputs: 0) string to be escaped, 1) optional string encoding (default 'UTF8')
 # Returns: escaped string
-sub EscapeHTML($)
+sub EscapeHTML($;$)
 {
-    my $str = shift;
+    my ($str, $enc) = @_;
     # escape XML characters
     $str = EscapeXML($str);
     # escape other special characters if they exist
@@ -382,19 +382,26 @@ sub EscapeHTML($)
         }
         # suppress warnings
         local $SIG{'__WARN__'} = sub { 1 };
-        # escape any non-ascii characters for HTML
-        $str =~ s/([\xc2-\xf7][\x80-\xbf]+)/EscapeChar($1)/sge;
+        if ($enc and $enc ne 'UTF8') {
+            $str = Image::ExifTool::Decode(undef, $str, $enc, undef, 'UTF8');
+            $str =~ s/([\xc2-\xf7][\x80-\xbf]+)/EscapeChar($1)/sge;
+            $str = Image::ExifTool::Decode(undef, $str, 'UTF8', undef, $enc);
+        } else {
+            # escape any non-ascii characters for HTML
+            $str =~ s/([\xc2-\xf7][\x80-\xbf]+)/EscapeChar($1)/sge;
+        }
     }
     return $str;
 }
 
 #------------------------------------------------------------------------------
 # Unescape all HTML character references
-# Inputs: 0) string to be unescaped
+# Inputs: 0) string to be unescaped, 1) optional string encoding (default 'UTF8')
 # Returns: unescaped string
-sub UnescapeHTML($)
+sub UnescapeHTML($;$)
 {
-    return UnescapeXML(shift, \%entityNum);
+    my ($str, $enc) = @_;
+    return UnescapeXML($str, \%entityNum, $enc);
 }
 
 #------------------------------------------------------------------------------
@@ -502,7 +509,7 @@ sub ProcessHTML($$)
                     $name =~ s/\s(.)/\U$1/g;     # capitalize all words in tag name
                     $name =~ tr/-_a-zA-Z0-9//dc; # remove illegal characters (also hex code wide chars)
                     AddTagToTable($table, $tag, { Name => $name });
-                    $et->VPrint(0, "  [adding $tag '$name']\n");
+                    $et->VPrint(0, "  [adding $tag '${name}']\n");
                 }
                 $val = $et->Decode($val, $$et{HTMLCharset}) if $$et{HTMLCharset};
                 $et->HandleTag($table, $tag, UnescapeXML($val));
@@ -518,7 +525,7 @@ sub ProcessHTML($$)
             my $info = { Name => $name, Groups => { 0 => 'HTML' } };
             $info->{Groups}->{1} = ($grp eq 'http-equiv' ? 'HTTP-equiv' : "HTML-$grp") if $grp;
             AddTagToTable($table, $tag, $info);
-            $et->VPrint(0, "  [adding $tag '$tagName']\n");
+            $et->VPrint(0, "  [adding $tag '${tagName}']\n");
         }
         # recode if necessary
         $val = $et->Decode($val, $$et{HTMLCharset}) if $$et{HTMLCharset};
@@ -548,7 +555,7 @@ meta information from HTML documents.
 
 =head1 AUTHOR
 
-Copyright 2003-2017, Phil Harvey (phil at owl.phy.queensu.ca)
+Copyright 2003-2019, Phil Harvey (phil at owl.phy.queensu.ca)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.

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

@@ -13,9 +13,9 @@ use vars qw($VERSION);
 use Image::ExifTool;    # only for FinishTiffDump()
 use Image::ExifTool::HTML qw(EscapeHTML);
 
-$VERSION = '1.34';
+$VERSION = '1.37';
 
-sub DumpTable($$$;$$$$$);
+sub DumpTable($$$;$$$$$$);
 sub Open($$$;@);
 sub Write($@);
 
@@ -32,6 +32,7 @@ _END_PART_1_
 # Note: Don't change font-weight style because it can affect line height
 my $htmlHeader2 = <<_END_PART_2_;
 </title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <style type="text/css">
 <!--
 /* character style ID's */
@@ -111,7 +112,6 @@ function GetElementsByClass(classname, tagname) {
       }
     }
   }
-  delete list;
   return found;
 }
 
@@ -171,7 +171,9 @@ function high(e,on) {
     // un-highlight current objects
     if (hlist) {
       for (var i=0; i<hlist.length; ++i) {
-        hlist[i].style.background = 'transparent';
+        for (var j=0; j<hlist[i].length; ++j) {
+          hlist[i][j].style.background = 'transparent';
+        }
       }
       hlist = null;
     }
@@ -190,20 +192,25 @@ function high(e,on) {
         }
       }
       // highlight anchor elements with the same name
-      hlist = document.getElementsByName(targ.name);
+      hlist = new Array;
+      hlist.push(document.getElementsByName(targ.name));
+      // is this an IFD pointer?
+      var pos = targ.className.indexOf('Offset_');
+      if (pos > 0) {
+        // add elements from this IFD to our highlight list
+        hlist.push(document.getElementsByClassName(targ.className.substr(pos+7)));
+      }
       // use class name to highlight span elements if necessary
       for (var i=0; i<mspan.length; ++i) {
         if (mspan[i] != targ.name) continue;
-        var slist = GetElementsByClass(targ.name, 'span');
-        // add elements from hlist collection to our array
-        for (var j=0; j<hlist.length; ++j) {
-            slist[slist.length] = hlist[j];
-        }
-        hlist = slist;
+        // add these span elements to our highlight list
+        hlist.push(GetElementsByClass(targ.name, 'span'));
         break;
       }
-      for (var j=0; j<hlist.length; ++j) {
-        hlist[j].style.background = '#ffcc99';
+      for (var i=0; i<hlist.length; ++i) {
+        for (var j=0; j<hlist[i].length; ++j) {
+          hlist[i][j].style.background = '#ffcc99';
+        }
       }
     }
   }
@@ -236,7 +243,7 @@ sub new
 # Add information to dump
 # Inputs: 0) HTML dump hash ref, 1) absolute offset in file, 2) data size,
 #         3) comment string, 4) tool tip (or SAME to use previous tip),
-#         5) bit flags (see below)
+#         5) bit flags (see below), 6) IFD name
 # Bits: 0x01 - print at start of line
 #       0x02 - print red address
 #       0x04 - maker notes data ('M'-class span)
@@ -244,9 +251,9 @@ sub new
 #       0x10 - allow double references
 #       0x100 - (reserved)
 # Notes: Block will be shown in 'unused' color if comment string begins with '['
-sub Add($$$$;$)
+sub Add($$$$;$$)
 {
-    my ($self, $start, $size, $msg, $tip, $flag) = @_;
+    my ($self, $start, $size, $msg, $tip, $flag, $ifd) = @_;
     my $block = $$self{Block};
     $$block{$start} or $$block{$start} = [ ];
     my $htip;
@@ -263,7 +270,7 @@ sub Add($$$$;$)
         $htip .= "<br>($size bytes)" unless $htip =~ /<br>Size:/;
         ++$self->{TipNum};
     }
-    push @{$$block{$start}}, [ $size, $msg, $htip, $flag, $self->{TipNum} ];
+    push @{$$block{$start}}, [ $size, $msg, $htip, $flag, $self->{TipNum}, $ifd ];
 }
 
 #------------------------------------------------------------------------------
@@ -351,7 +358,7 @@ sub Print($$;$$$$$)
         }
         my $parms;
         foreach $parms (@$parmList) {
-            my ($len, $msg, $tip, $flag, $tipNum) = @$parms;
+            my ($len, $msg, $tip, $flag, $tipNum, $ifd) = @$parms;
             next unless $len > 0;
             $flag = 0 unless defined $flag;
             # generate same name for all blocks indexed by this tooltip
@@ -367,8 +374,10 @@ sub Print($$;$$$$$)
                 ++$index;
             }
             if ($flag & 0x14) {
+                my $class = $flag & 0x04 ? "$name M" : $name;
+                $class .= " $ifd" if $ifd;
                 my %bkg = (
-                    Class => $flag & 0x04 ? "$name M" : $name,
+                    Class => $class,
                     Start => $start - $dataPos,
                     End   => $start - $dataPos + $len,
                 );
@@ -428,7 +437,7 @@ sub Print($$;$$$$$)
                 $flag |= 0x100 unless $flag & 0x01 or $nextFlag & 0x01;
             }
             $self->DumpTable($start-$dataPos, \$buff, $msg, $name,
-                             $flag, $len, $pos-$dataPos);
+                             $flag, $len, $pos-$dataPos, $ifd);
             undef $buff;
             $pos = $end if $pos < $end;
         }
@@ -558,10 +567,10 @@ sub Open($$$;@)
 # Dump a block of data in HTML table form
 # Inputs: 0) HtmlDump object ref, 1) data position, 2) block pointer,
 #         3) message, 4) object name, 5) flag, 6) full block length (actual
-#         data may be shorter), 7) data end position
-sub DumpTable($$$;$$$$$)
+#         data may be shorter), 7) data end position, 8) IFD name
+sub DumpTable($$$;$$$$$$)
 {
-    my ($self, $pos, $blockPt, $msg, $name, $flag, $len, $endPos) = @_;
+    my ($self, $pos, $blockPt, $msg, $name, $flag, $len, $endPos, $ifd) = @_;
     $len = length $$blockPt unless defined $len;
     $endPos = 0 unless $endPos;
     my ($f0, $dblRef, $id);
@@ -588,7 +597,8 @@ sub DumpTable($$$;$$$$$)
             }
             ++$id unless $dblRef;
         }
-        $name = "<a name=$name class=$id>";
+        my $class = $ifd ? "'$id $ifd'" : $id;
+        $name = "<a name=$name class=$class>";
         $msg and $msg = "$name$msg</a>";
     } else {
         $name = '';
@@ -653,7 +663,8 @@ sub DumpTable($$$;$$$$$)
         if ($dblRef and $p >= $endPos) {
             $dblRef = 0;
             ++$id;
-            $name =~ s/class=\w\b/class=$id/;
+            my $class = $ifd ? "'$id $ifd'" : $id;
+            $name =~ s/class=\w\b/class=$class/;
             $f0 = '';
             $self->Open('fgd', $f0, 0);
         }
@@ -885,7 +896,7 @@ page.
 
 =head1 AUTHOR
 
-Copyright 2003-2017, Phil Harvey (phil at owl.phy.queensu.ca)
+Copyright 2003-2019, Phil Harvey (phil at owl.phy.queensu.ca)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.

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

@@ -10,6 +10,7 @@
 #               3) http://developer.apple.com/documentation/GraphicsImaging/Reference/ColorSync_Manager/ColorSync_Manager.pdf
 #               4) http://www.color.org/privatetag2007-01.pdf
 #               5) http://www.color.org/icc_specs2.xalter (approved revisions, 2010-07-16)
+#               6) Eef Vreeland private communication
 #
 # Notes:        The ICC profile information is different: the format of each
 #               tag is embedded in the information instead of in the directory
@@ -23,7 +24,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.31';
+$VERSION = '1.35';
 
 sub ProcessICC($$);
 sub ProcessICC_Profile($$$);
@@ -52,6 +53,283 @@ my %profileClass = (
     nmcl => 'NamedColor Profile',
     nkpf => 'Nikon Input Device Profile (NON-STANDARD!)', # (written by Nikon utilities)
 );
+my %manuSig = ( #6
+    'NONE' => 'none',
+    'none' => 'none', #PH
+    ''     => '', #PH
+    '4d2p' => 'Erdt Systems GmbH & Co KG',
+    'AAMA' => 'Aamazing Technologies, Inc.',
+    'ACER' => 'Acer Peripherals',
+    'ACLT' => 'Acolyte Color Research',
+    'ACTI' => 'Actix Sytems, Inc.',
+    'ADAR' => 'Adara Technology, Inc.',
+    'ADBE' => 'Adobe Systems Inc.',
+    'ADI ' => 'ADI Systems, Inc.',
+    'AGFA' => 'Agfa Graphics N.V.',
+    'ALMD' => 'Alps Electric USA, Inc.',
+    'ALPS' => 'Alps Electric USA, Inc.',
+    'ALWN' => 'Alwan Color Expertise',
+    'AMTI' => 'Amiable Technologies, Inc.',
+    'AOC ' => 'AOC International (U.S.A), Ltd.',
+    'APAG' => 'Apago',
+    'APPL' => 'Apple Computer Inc.',
+    'appl' => 'Apple Computer Inc.',
+    'AST ' => 'AST',
+    'AT&T' => 'AT&T Computer Systems',
+    'BAEL' => 'BARBIERI electronic',
+    'berg' => 'bergdesign incorporated',
+    'bICC' => 'basICColor GmbH',
+    'BRCO' => 'Barco NV',
+    'BRKP' => 'Breakpoint Pty Limited',
+    'BROT' => 'Brother Industries, LTD',
+    'BULL' => 'Bull',
+    'BUS ' => 'Bus Computer Systems',
+    'C-IT' => 'C-Itoh',
+    'CAMR' => 'Intel Corporation',
+    'CANO' => 'Canon, Inc. (Canon Development Americas, Inc.)',
+    'CARR' => 'Carroll Touch',
+    'CASI' => 'Casio Computer Co., Ltd.',
+    'CBUS' => 'Colorbus PL',
+    'CEL ' => 'Crossfield',
+    'CELx' => 'Crossfield',
+    'ceyd' => 'Integrated Color Solutions, Inc.',
+    'CGS ' => 'CGS Publishing Technologies International GmbH',
+    'CHM ' => 'Rochester Robotics',
+    'CIGL' => 'Colour Imaging Group, London',
+    'CITI' => 'Citizen',
+    'CL00' => 'Candela, Ltd.',
+    'CLIQ' => 'Color IQ',
+    'clsp' => 'MacDermid ColorSpan, Inc.',
+    'CMCO' => 'Chromaco, Inc.',
+    'CMiX' => 'CHROMiX',
+    'COLO' => 'Colorgraphic Communications Corporation',
+    'COMP' => 'COMPAQ Computer Corporation',
+    'COMp' => 'Compeq USA/Focus Technology',
+    'CONR' => 'Conrac Display Products',
+    'CORD' => 'Cordata Technologies, Inc.',
+    'CPQ ' => 'Compaq Computer Corporation',
+    'CPRO' => 'ColorPro',
+    'CRN ' => 'Cornerstone',
+    'CTX ' => 'CTX International, Inc.',
+    'CVIS' => 'ColorVision',
+    'CWC ' => 'Fujitsu Laboratories, Ltd.',
+    'DARI' => 'Darius Technology, Ltd.',
+    'DATA' => 'Dataproducts',
+    'DCP ' => 'Dry Creek Photo',
+    'DCRC' => 'Digital Contents Resource Center, Chung-Ang University',
+    'DELL' => 'Dell Computer Corporation',
+    'DIC ' => 'Dainippon Ink and Chemicals',
+    'DICO' => 'Diconix',
+    'DIGI' => 'Digital',
+    'DL&C' => 'Digital Light & Color',
+    'DPLG' => 'Doppelganger, LLC',
+    'DS  ' => 'Dainippon Screen',
+    'ds  ' => 'Dainippon Screen',
+    'DSOL' => 'DOOSOL',
+    'DUPN' => 'DuPont',
+    'dupn' => 'DuPont',
+    'Eizo' => 'EIZO NANAO CORPORATION',
+    'EPSO' => 'Epson',
+    'ESKO' => 'Esko-Graphics',
+    'ETRI' => 'Electronics and Telecommunications Research Institute',
+    'EVER' => 'Everex Systems, Inc.',
+    'EXAC' => 'ExactCODE GmbH',
+    'FALC' => 'Falco Data Products, Inc.',
+    'FF  ' => 'Fuji Photo Film Co.,LTD',
+    'FFEI' => 'FujiFilm Electronic Imaging, Ltd.',
+    'ffei' => 'FujiFilm Electronic Imaging, Ltd.',
+    'flux' => 'FluxData Corporation',
+    'FNRD' => 'fnord software',
+    'FORA' => 'Fora, Inc.',
+    'FORE' => 'Forefront Technology Corporation',
+    'FP  ' => 'Fujitsu',
+    'FPA ' => 'WayTech Development, Inc.',
+    'FUJI' => 'Fujitsu',
+    'FX  ' => 'Fuji Xerox Co., Ltd.',
+    'GCC ' => 'GCC Technologies, Inc.',
+    'GGSL' => 'Global Graphics Software Limited',
+    'GMB ' => 'Gretagmacbeth',
+    'GMG ' => 'GMG GmbH & Co. KG',
+    'GOLD' => 'GoldStar Technology, Inc.',
+    'GOOG' => 'Google', #PH
+    'GPRT' => 'Giantprint Pty Ltd',
+    'GTMB' => 'Gretagmacbeth',
+    'GVC ' => 'WayTech Development, Inc.',
+    'GW2K' => 'Sony Corporation',
+    'HCI ' => 'HCI',
+    'HDM ' => 'Heidelberger Druckmaschinen AG',
+    'HERM' => 'Hermes',
+    'HITA' => 'Hitachi America, Ltd.',
+    'HiTi' => 'HiTi Digital, Inc.',
+    'HP  ' => 'Hewlett-Packard',
+    'HTC ' => 'Hitachi, Ltd.',
+    'IBM ' => 'IBM Corporation',
+    'IDNT' => 'Scitex Corporation, Ltd.',
+    'Idnt' => 'Scitex Corporation, Ltd.',
+    'IEC ' => 'Hewlett-Packard',
+    'IIYA' => 'Iiyama North America, Inc.',
+    'IKEG' => 'Ikegami Electronics, Inc.',
+    'IMAG' => 'Image Systems Corporation',
+    'IMI ' => 'Ingram Micro, Inc.',
+    'Inca' => 'Inca Digital Printers Ltd.',
+    'INTC' => 'Intel Corporation',
+    'INTL' => 'N/A (INTL)',
+    'INTR' => 'Intra Electronics USA, Inc.',
+    'IOCO' => 'Iocomm International Technology Corporation',
+    'IPS ' => 'InfoPrint Solutions Company',
+    'IRIS' => 'Scitex Corporation, Ltd.',
+    'Iris' => 'Scitex Corporation, Ltd.',
+    'iris' => 'Scitex Corporation, Ltd.',
+    'ISL ' => 'Ichikawa Soft Laboratory',
+    'ITNL' => 'N/A (ITNL)',
+    'IVM ' => 'IVM',
+    'IWAT' => 'Iwatsu Electric Co., Ltd.',
+    'JPEG' => 'Joint Photographic Experts Group', #PH
+    'JSFT' => 'Jetsoft Development',
+    'JVC ' => 'JVC Information Products Co.',
+    'KART' => 'Scitex Corporation, Ltd.',
+    'Kart' => 'Scitex Corporation, Ltd.',
+    'kart' => 'Scitex Corporation, Ltd.',
+    'KFC ' => 'KFC Computek Components Corporation',
+    'KLH ' => 'KLH Computers',
+    'KMHD' => 'Konica Minolta Holdings, Inc.',
+    'KNCA' => 'Konica Corporation',
+    'KODA' => 'Kodak',
+    'KYOC' => 'Kyocera',
+    'LCAG' => 'Leica Camera AG',
+    'LCCD' => 'Leeds Colour',
+    'lcms' => 'Little CMS', #NealKrawetz
+    'LDAK' => 'Left Dakota',
+    'LEAD' => 'Leading Technology, Inc.',
+    'Leaf' => 'Leaf', #PH
+    'LEXM' => 'Lexmark International, Inc.',
+    'LINK' => 'Link Computer, Inc.',
+    'LINO' => 'Linotronic',
+    'Lino' => 'Linotronic', #PH (NC)
+    'lino' => 'Linotronic', #PH (NC)
+    'LITE' => 'Lite-On, Inc.',
+    'MAGC' => 'Mag Computronic (USA) Inc.',
+    'MAGI' => 'MAG Innovision, Inc.',
+    'MANN' => 'Mannesmann',
+    'MICN' => 'Micron Technology, Inc.',
+    'MICR' => 'Microtek',
+    'MICV' => 'Microvitec, Inc.',
+    'MINO' => 'Minolta',
+    'MITS' => 'Mitsubishi Electronics America, Inc.',
+    'MITs' => 'Mitsuba Corporation',
+    'Mits' => 'Mitsubishi Electric Corporation Kyoto Works',
+    'MNLT' => 'Minolta',
+    'MODG' => 'Modgraph, Inc.',
+    'MONI' => 'Monitronix, Inc.',
+    'MONS' => 'Monaco Systems Inc.',
+    'MORS' => 'Morse Technology, Inc.',
+    'MOTI' => 'Motive Systems',
+    'MSFT' => 'Microsoft Corporation',
+    'MUTO' => 'MUTOH INDUSTRIES LTD.',
+    'NANA' => 'NANAO USA Corporation',
+    'NEC ' => 'NEC Corporation',
+    'NEXP' => 'NexPress Solutions LLC',
+    'NISS' => 'Nissei Sangyo America, Ltd.',
+    'NKON' => 'Nikon Corporation',
+    'ob4d' => 'Erdt Systems GmbH & Co KG',
+    'obic' => 'Medigraph GmbH',
+    'OCE ' => 'Oce Technologies B.V.',
+    'OCEC' => 'OceColor',
+    'OKI ' => 'Oki',
+    'OKID' => 'Okidata',
+    'OKIP' => 'Okidata',
+    'OLIV' => 'Olivetti',
+    'OLYM' => 'OLYMPUS OPTICAL CO., LTD',
+    'ONYX' => 'Onyx Graphics',
+    'OPTI' => 'Optiquest',
+    'PACK' => 'Packard Bell',
+    'PANA' => 'Matsushita Electric Industrial Co., Ltd.',
+    'PANT' => 'Pantone, Inc.',
+    'PBN ' => 'Packard Bell',
+    'PFU ' => 'PFU Limited',
+    'PHIL' => 'Philips Consumer Electronics Co.',
+    'PNTX' => 'HOYA Corporation PENTAX Imaging Systems Division',
+    'POne' => 'Phase One A/S',
+    'PREM' => 'Premier Computer Innovations',
+    'PRIN' => 'Princeton Graphic Systems',
+    'PRIP' => 'Princeton Publishing Labs',
+    'QLUX' => 'Hong Kong',
+    'QMS ' => 'QMS, Inc.',
+    'QPCD' => 'QPcard AB',
+    'QUAD' => 'QuadLaser',
+    'quby' => 'Qubyx Sarl',
+    'QUME' => 'Qume Corporation',
+    'RADI' => 'Radius, Inc.',
+    'RDDx' => 'Integrated Color Solutions, Inc.',
+    'RDG ' => 'Roland DG Corporation',
+    'REDM' => 'REDMS Group, Inc.',
+    'RELI' => 'Relisys',
+    'RGMS' => 'Rolf Gierling Multitools',
+    'RICO' => 'Ricoh Corporation',
+    'RNLD' => 'Edmund Ronald',
+    'ROYA' => 'Royal',
+    'RPC ' => 'Ricoh Printing Systems,Ltd.',
+    'RTL ' => 'Royal Information Electronics Co., Ltd.',
+    'SAMP' => 'Sampo Corporation of America',
+    'SAMS' => 'Samsung, Inc.',
+    'SANT' => 'Jaime Santana Pomares',
+    'SCIT' => 'Scitex Corporation, Ltd.',
+    'Scit' => 'Scitex Corporation, Ltd.',
+    'scit' => 'Scitex Corporation, Ltd.',
+    'SCRN' => 'Dainippon Screen',
+    'scrn' => 'Dainippon Screen',
+    'SDP ' => 'Scitex Corporation, Ltd.',
+    'Sdp ' => 'Scitex Corporation, Ltd.',
+    'sdp ' => 'Scitex Corporation, Ltd.',
+    'SEC ' => 'SAMSUNG ELECTRONICS CO.,LTD',
+    'SEIK' => 'Seiko Instruments U.S.A., Inc.',
+    'SEIk' => 'Seikosha',
+    'SGUY' => 'ScanGuy.com',
+    'SHAR' => 'Sharp Laboratories',
+    'SICC' => 'International Color Consortium',
+    'siwi' => 'SIWI GRAFIKA CORPORATION',
+    'SONY' => 'SONY Corporation',
+    'Sony' => 'Sony Corporation',
+    'SPCL' => 'SpectraCal',
+    'STAR' => 'Star',
+    'STC ' => 'Sampo Technology Corporation',
+    'TALO' => 'Talon Technology Corporation',
+    'TAND' => 'Tandy',
+    'TATU' => 'Tatung Co. of America, Inc.',
+    'TAXA' => 'TAXAN America, Inc.',
+    'TDS ' => 'Tokyo Denshi Sekei K.K.',
+    'TECO' => 'TECO Information Systems, Inc.',
+    'TEGR' => 'Tegra',
+    'TEKT' => 'Tektronix, Inc.',
+    'TI  ' => 'Texas Instruments',
+    'TMKR' => 'TypeMaker Ltd.',
+    'TOSB' => 'TOSHIBA corp.',
+    'TOSH' => 'Toshiba, Inc.',
+    'TOTK' => 'TOTOKU ELECTRIC Co., LTD',
+    'TRIU' => 'Triumph',
+    'TSBT' => 'TOSHIBA TEC CORPORATION',
+    'TTX ' => 'TTX Computer Products, Inc.',
+    'TVM ' => 'TVM Professional Monitor Corporation',
+    'TW  ' => 'TW Casper Corporation',
+    'ULSX' => 'Ulead Systems',
+    'UNIS' => 'Unisys',
+    'UTZF' => 'Utz Fehlau & Sohn',
+    'VARI' => 'Varityper',
+    'VIEW' => 'Viewsonic',
+    'VISL' => 'Visual communication',
+    'VIVO' => 'Vivo Mobile Communication Co., Ltd',
+    'WANG' => 'Wang',
+    'WLBR' => 'Wilbur Imaging',
+    'WTG2' => 'Ware To Go',
+    'WYSE' => 'WYSE Technology',
+    'XERX' => 'Xerox Corporation',
+    'XRIT' => 'X-Rite',
+    'yxym' => 'YxyMaster GmbH',
+    'Z123' => "Lavanya's test Company",
+    'Zebr' => 'Zebra Technologies Inc',
+    'ZRAN' => 'Zoran Corporation',
+    # also seen: "    ",ACMS,KCMS,UCCM,etc2,SCTX
+);
 
 # ICC_Profile tag table
 %Image::ExifTool::ICC_Profile::Main = (
@@ -85,7 +363,7 @@ my %profileClass = (
     },
     targ => {
         Name => 'CharTarget',
-        ValueConv => 'length $val > 128 ? \$val : $val',
+        ValueConv => '$val=~s/\0.*//; length $val > 128 ? \$val : $val',
     },
     chad => 'ChromaticAdaptation',
     chrm => {
@@ -256,6 +534,11 @@ my %profileClass = (
     # Microsoft custom tags (ref http://msdn2.microsoft.com/en-us/library/ms536870.aspx)
     MS00 => 'WCSProfiles',
 
+    psd3 => { #6
+        Name => 'PostScript2CRD3',
+        Binary => 1, # (NC)
+    },
+
     # the following entry represents the ICC profile header, and doesn't
     # exist as a tag in the directory.  It is only in this table to provide
     # a link so ExifTool can locate the header tags
@@ -274,7 +557,8 @@ my %profileClass = (
     4 => {
         Name => 'ProfileCMMType',
         Format => 'string[4]',
-        # seen: "    ",ACMS,ADBE,APPLE,KCMS,Lino,NKON,UCCM,appl,etc2,lino,none
+        SeparateTable => 'ManuSig',
+        PrintConv => \%manuSig,
     },
     8 => {
         Name => 'ProfileVersion',
@@ -327,24 +611,13 @@ my %profileClass = (
     48 => {
         Name => 'DeviceManufacturer',
         Format => 'string[4]',
-        # KODA = Kodak
-        # ADBE = Adobe ...?
-        # appl = Apple
-        # HP   = HP
-        # CANO = Canon
-        # ISL  = ?
-        # JPEG = JPEG
-        # Leaf = Leaf
-        # MNLT = ?
-        # MSFT = Microsoft
-        # POne = ?
-        # etc2 = ?
-        # lcms = ?
+        SeparateTable => 'ManuSig',
+        PrintConv => \%manuSig,
     },
     52 => {
         Name => 'DeviceModel',
         Format => 'string[4]',
-        # ROMM = Refrence Output Medium Metric
+        # ROMM = Reference Output Medium Metric
     },
     56 => {
         Name => 'DeviceAttributes',
@@ -374,7 +647,8 @@ my %profileClass = (
     80 => {
         Name => 'ProfileCreator',
         Format => 'string[4]',
-        # KODA = Kodak
+        SeparateTable => 'ManuSig',
+        PrintConv => \%manuSig,
     },
     84 => {
         Name => 'ProfileID',
@@ -530,7 +804,7 @@ my %profileClass = (
 );
 
 #------------------------------------------------------------------------------
-# print ICC Profile ID in hex
+# Print ICC Profile ID in hex
 # Inputs: 1) string of numbers
 # Returns: string of hex digits
 sub HexID($)
@@ -545,7 +819,7 @@ sub HexID($)
 }
 
 #------------------------------------------------------------------------------
-# get formatted value from ICC tag (which has the type embedded)
+# Get formatted value from ICC tag (which has the type embedded)
 # Inputs: 0) data reference, 1) offset to tag data, 2) tag data size
 # Returns: Formatted value or undefined if format not supported
 # Notes: The following types are handled by BinaryTables:
@@ -906,7 +1180,7 @@ sub ProcessICC_Profile($$$)
                         DataPt => $dataPt,
                         Size   => $strLen,
                         Start  => $valuePtr + $strPos,
-                        Format => "type '$fmt'",
+                        Format => "type '${fmt}'",
                     );
                 }
                 $et->Warn("Corrupted $$tagInfo{Name} data") if $i < $count;
@@ -923,7 +1197,7 @@ sub ProcessICC_Profile($$$)
             DataPt => $dataPt,
             Size   => $size,
             Start  => $valuePtr,
-            Format => "type '$fmt'",
+            Format => "type '${fmt}'",
         );
         if ($subdir) {
             my $name = $$tagInfo{Name};
@@ -990,7 +1264,7 @@ data created on one device into another device's native color space.
 
 =head1 AUTHOR
 
-Copyright 2003-2017, Phil Harvey (phil at owl.phy.queensu.ca)
+Copyright 2003-2019, Phil Harvey (phil at owl.phy.queensu.ca)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.