exiftool_vendored 12.22.0 → 12.34.0

data/bin/config_files/acdsee.config

@@ -2,20 +2,76 @@
 # File:         acdsee.config
 #
 # Description:  This config file defines ACDSee XMP region tags for writing.
+#               The following tags are created in the XMP-acdsee-rs group
 #
-# Usage:        exiftool -config acdsee.config -ACDSEETAG=VALUE FILE ...
+#                   RegionInfoACDSee : The structured tag for the ACDSee regions
+#                                      (similar to XMP-mwg-rs:RegionInfo)
+#
+#                   The following tags are the width, height, and unit of the
+#                   image at the time of processing  when storing image region
+#                   metadata.  They are similar to the AppliedToDimensions tags
+#                   of the MWG regions.
+#                       ACDSeeRegionAppliedToDimensionsH : Height of the image
+#                       ACDSeeRegionAppliedToDimensionsUnit : Unit of the image
+#                       ACDSeeRegionAppliedToDimensionsW : Width of the image
+#
+#                   Actual region data, stored in an array.  These flattened tags
+#                   are treated as List Type tags.  There are two region types,
+#                   the ALYArea and the DLYArea.  The ALYArea tags tags assigned
+#                   by ACDSee and are usually square in dimensions.  The DLYArea
+#                   tags are both the tags assigned by ACDSee (but possibly
+#                   rectangular instead of square) as well as any  manual
+#                   assigned tags.  They are similar to the area tags of the MWG
+#                   regions.
+#                       ACDSeeRegionDLYAreaH : Height of DLY region
+#                       ACDSeeRegionDLYAreaW : Width of DLY region
+#                       ACDSeeRegionDLYAreaX : X centerpoint of DLY region
+#                       ACDSeeRegionDLYAreaY : Y centerpoint of DLY region
+#                       ACDSeeRegionALYAreaH : Height of ALY region
+#                       ACDSeeRegionALYAreaW : Width of ALY region
+#                       ACDSeeRegionALYAreaX : X centerpoint of ALY region
+#                       ACDSeeRegionALYAreaY : Y centerpoint of ALY region
+#                       ACDSeeRegionName : Name of region
+#                       ACDSeeRegionType : Type of region
+#                       ACDSeeRegionNameAssignType : How the type was assigned.
+#                                                    "Manual" is the only known
+#                                                    entry at this time
+#
+#               Conversion tags.  These tags can be used to convert other region
+#               type tags to ACDSee regions.
+#                   MPRegion2ACDSeeRegion : Converts a Microsoft RegionInfoMP
+#                   IPTCRegion2ACDSeeRegion : Converts an IPTC ImageRegion
+#                   MWGRegion2ACDSeeRegion : Converts a MWG RegionInfo
+#
+# Usage:        To set individual tags
+#               exiftool -config acdsee.config -ACDSEETAG=VALUE FILE ...
+#
+#               To convert Microsoft Regions to ACDSee regions
+#               exiftool -config acdsee.config "-RegionInfoACDSee<MPRegion2ACDSeeRegion" File ...
+#               To convert IPTC regions to ACDSee regions
+#               exiftool -config acdsee.config "-RegionInfoACDSee<IPTCRegion2ACDSeeRegion" File ...
+#               To convert MWG Regions to ACDSee regions
+#               exiftool -config acdsee.config "-RegionInfoACDSee<MWGRegion2ACDSeeRegion" File ...
 #
 # Requires:     ExifTool version 10.28 or later
 #
 # Revisions:    2020/01/28 - Bryan K. Williams (aka StarGeek) Created
+#               2021/04/08 - BKW Added tags to convert from Microsoft, IPTC,
+#                            and MWG regions to ACDSee regions based upon
+#                            convert_regions.config.  Expanded docs.
+#                            Shortened ADCSee tag names and added shortcuts
+#                            from original names to new names, for example
+#                            "RegionInfoACDSeeAppliedToDimensions*" -> "ACDSeeRegionAppliedToDimensions*"
+#                            "RegionInfoACDSeeRegionList* -> "ACDSeeRegion*"
 #------------------------------------------------------------------------------
+use Data::Dumper;
 
 my %sACDSeeDimensions = (
     STRUCT_NAME => 'ACDSee Dimensions',
     NAMESPACE   => {'acdsee-stDim' => 'http://ns.acdsee.com/sType/Dimensions#'},
-    'w'           => { Writable => 'real' },
-    'h'           => { Writable => 'real' },
-    'unit'        => { },
+    'w'         => { Writable => 'real' },
+    'h'         => { Writable => 'real' },
+    'unit'      => { },
 );
 
 my %sACDSeeArea = (
@@ -38,7 +94,7 @@ my %sACDSeeRegionStruct = (
 );
 
 %Image::ExifTool::UserDefined = (
-    # new XMP namespaces (eg. xxx) must be added to the Main XMP table:
+    # new XMP namespaces for ACDSee regions
     'Image::ExifTool::XMP::Main' => {
         'acdsee-rs' => { # <-- must be the same as the NAMESPACE prefix
             SubDirectory => { 
@@ -46,6 +102,112 @@ my %sACDSeeRegionStruct = (
             },
         },
     },
+    'Image::ExifTool::Composite' => {
+    # create an ACDSee RegionInfo structure from a Microsoft RegionInfoMP structure
+        MPRegion2ACDSeeRegion => {
+            Require => {
+                0 => 'RegionInfoMP',
+                1 => 'ImageWidth',
+                2 => 'ImageHeight',
+            },
+            ValueConv => q{
+                my ($rgn, @newRgns);
+                foreach $rgn (@{$val[0]{Regions}}) {
+                    my $name = $$rgn{PersonDisplayName};
+                    next unless $$rgn{Rectangle} or defined $name;
+                    my %newRgn = ( Type => 'Face' );
+                    if (defined $name) {
+                        # don't add ignored faces
+                        next if $name eq 'ffffffffffffffff';
+                        $newRgn{Name} = $name;
+                    }
+                    if ($$rgn{Rectangle}) {
+                        my @rect = split /\s*,\s*/, $$rgn{Rectangle};
+                        $newRgn{DLYArea} = {
+                            X => $rect[0] + $rect[2]/2,
+                            Y => $rect[1] + $rect[3]/2,
+                            W => $rect[2],
+                            H => $rect[3],
+                        } if @rect == 4;
+                    }
+                    push @newRgns, \%newRgn;
+                }
+                return {
+                    AppliedToDimensions => { W => $val[1], H => $val[2], Unit => 'pixel' },
+                    RegionList => \@newRgns,
+                };
+            },
+        },
+        # create an ACDSee RegionInfo structure from an IPTC ImageRegion list
+        IPTCRegion2ACDSeeRegion => {
+            Require => {
+                0 => 'ImageRegion',
+                1 => 'ImageWidth',
+                2 => 'ImageHeight',
+            },
+            ValueConv => q{
+                my ($rgn, @newRgns);
+                my $rgns = ref $val[0] eq 'ARRAY' ? $val[0] : [ $val[0] ]; 
+                foreach $rgn (@$rgns) {
+                    my %newRgn = ( Type => 'Face' );
+                    if ($$rgn{RegionBoundary} and $$rgn{RegionBoundary}{RbShape} eq 'rectangle') {
+                        my @rect = @{$$rgn{RegionBoundary}}{'RbX','RbY','RbW','RbH'};
+                        if ($$rgn{RegionBoundary}{RbUnit} eq 'pixel') {
+                            $rect[0] /= $val[1],  $rect[2] /= $val[1];
+                            $rect[1] /= $val[2];  $rect[3] /= $val[2];
+                        }
+                        $newRgn{'DLYArea'} = {
+                            X => $rect[0] + $rect[2]/2,
+                            Y => $rect[1] + $rect[3]/2,
+                            W => $rect[2],
+                            H => $rect[3],
+                        };
+                    } else {
+                        next unless defined $$rgn{Name};
+                    }
+                    $newRgn{Name} = $$rgn{Name} if defined $$rgn{Name};
+                    push @newRgns, \%newRgn;
+                }
+                return {
+                    AppliedToDimensions => { 'W' => $val[1], 'H' => $val[2], 'Unit' => 'pixel' },
+                    RegionList => \@newRgns,
+                };
+            },
+        },
+
+        # create an MWG RegionInfo structure from an IPTC ImageRegion list
+        MWGRegion2ACDSeeRegion => {
+            Require => {
+                0 => 'RegionInfo',
+                1 => 'ImageWidth',
+                2 => 'ImageHeight',
+            },
+            ValueConv => q{
+                my ($rgn, @newRgns);
+                my %newRgn;
+                foreach $rgn (@{$val[0]{RegionList}}) {
+                    next unless $$rgn{Area} or defined $$rgn{Name};
+                    my %newRgn;
+                    if ($$rgn{Area}) {
+                        $newRgn{'DLYArea'} = {
+                            'X' => $$rgn{Area}{'X'},
+                            'Y' => $$rgn{Area}{'Y'},
+                            'W' => $$rgn{Area}{'W'},
+                            'H' => $$rgn{Area}{'H'},
+                        };
+                    };
+                    $newRgn{Name} = $$rgn{Name} if defined $$rgn{Name};
+                    $newRgn{'Type'} = $$rgn{'Type'} if defined $$rgn{'Type'};
+                    push @newRgns, \%newRgn;
+                }
+                return {
+                    'AppliedToDimensions' => $val[0]{'AppliedToDimensions'},
+                    RegionList => \@newRgns,
+                }
+            },
+        },
+        ####
+    },
 );
 
 %Image::ExifTool::UserDefined::ACDSeeRegions = (
@@ -54,18 +216,43 @@ my %sACDSeeRegionStruct = (
     WRITABLE => 'string', # (default to string-type tags)
     Regions => {
         Name => 'RegionInfoACDSee',
+        FlatName => 'ACDSee',
         # the "Struct" entry defines the structure fields
         Struct => {
             # optional structure name (used for warning messages only)
             STRUCT_NAME => 'ACDSee RegionInfo',        
             RegionList => {
+                FlatName => 'Region',
                 Struct => \%sACDSeeRegionStruct,
                 List => 'Bag',
             },
-            AppliedToDimensions => { Struct => \%sACDSeeDimensions },
+            AppliedToDimensions => { 
+            FlatName => 'RegionAppliedToDimensions',Struct => \%sACDSeeDimensions },
         },
     },
 );
 
+# Shortcuts to old names added so as not to break previously used commands
+%Image::ExifTool::UserDefined::Shortcuts = (
+    RegionInfoACDSeeAppliedToDimensionsH        => 'ACDSeeRegionAppliedToDimensionsH',
+    RegionInfoACDSeeAppliedToDimensionsUnit     => 'ACDSeeRegionAppliedToDimensionsUnit',
+    RegionInfoACDSeeAppliedToDimensionsW        => 'ACDSeeRegionAppliedToDimensionsW',
+    RegionInfoACDSeeRegionListDLYAreaH          => 'ACDSeeRegionDLYAreaH',
+    RegionInfoACDSeeRegionListDLYAreaW          => 'ACDSeeRegionDLYAreaW',
+    RegionInfoACDSeeRegionListDLYAreaX          => 'ACDSeeRegionDLYAreaX',  
+    RegionInfoACDSeeRegionListDLYAreaY          => 'ACDSeeRegionDLYAreaY',
+    RegionInfoACDSeeRegionListALGAreaH          => 'ACDSeeRegionALGAreaH',
+    RegionInfoACDSeeRegionListALGAreaW          => 'ACDSeeRegionALGAreaW',
+    RegionInfoACDSeeRegionListALGAreaX          => 'ACDSeeRegionALGAreaX',
+    RegionInfoACDSeeRegionListALGAreaY          => 'ACDSeeRegionALGAreaY',
+    RegionInfoACDSeeRegionListName              => 'ACDSeeRegionName',
+    RegionInfoACDSeeRegionListType              => 'ACDSeeRegionType',
+    RegionInfoACDSeeRegionListNameAssignType    => 'ACDSeeRegionNameAssignType',
+);
+
+# Forced -struct option during debugging
+#%Image::ExifTool::UserDefined::Options = (
+#   Struct => 1,
+#);
 #------------------------------------------------------------------------------
 1;  #end

data/bin/config_files/convert_regions.config

@@ -7,15 +7,15 @@
 #
 # Usage:     1) Convert from MP WLPG or IPTC regions to MWG regions:
 #
-#               exiftool -config convert_regions.config "-regioninfo<myregion" FILE
+#               exiftool -config convert_regions.config "-RegionInfo<MPRegion2MWGRegion" FILE
 #
 #            2) Convert from MWG or IPTC to MP WLPG regions:
 #
-#               exiftool -config convert_regions.config "-regioninfomp<myregionmp" FILE
+#               exiftool -config convert_regions.config "-RegionInfoMP<MWGRegion2MPRegion" FILE
 #
 #            3) Convert from MWG or MP WLPG to IPTC regions:
 #
-#               exiftool -config convert_regions.config "-imageregion<myregioniptc" FILE
+#               exiftool -config convert_regions.config "-ImageRegion<MWGRegion2IPTCRegion" FILE
 #
 # Requires:     ExifTool version 11.74 or later
 #
@@ -23,6 +23,8 @@
 #               2013/02/20 - PH Don't add ignored MP faces
 #               2017/02/13 - PH Handle MP regions without Rectangle or Name entries
 #               2019/10/26 - PH Added support for the new IPTC ImageRegion
+#               2021/05-27 - PH Changed a few tag names and added shortcuts for
+#                            backward compatibility
 #
 # References:   http://www.metadataworkinggroup.org/specs/
 #------------------------------------------------------------------------------
@@ -32,7 +34,7 @@
     'Image::ExifTool::Composite' => {
 
         # create an MWG RegionInfo structure from a Microsoft RegionInfoMP structure
-        MyRegion => {
+        MPRegion2MWGRegion => {
             Require => {
                 0 => 'RegionInfoMP',
                 1 => 'ImageWidth',
@@ -69,8 +71,8 @@
         },
 
         # create an MWG RegionInfo structure from an IPTC ImageRegion list
-        MyRegion2 => {
-            Name => 'MyRegion',
+        IPTCRegion2MWGRegion => {
+            Name => 'MPRegion2MWGRegion',
             Require => {
                 0 => 'ImageRegion',
                 1 => 'ImageWidth',
@@ -78,7 +80,7 @@
             },
             ValueConv => q{
                 my ($rgn, @newRgns);
-                my $rgns = ref $val[0] eq 'ARRAY' ? $val[0] : [ $val[0] ]; 
+                my $rgns = ref $val[0] eq 'ARRAY' ? $val[0] : [ $val[0] ];
                 foreach $rgn (@$rgns) {
                     my %newRgn = ( Type => 'Face' );
                     if ($$rgn{RegionBoundary} and $$rgn{RegionBoundary}{RbShape} eq 'rectangle') {
@@ -108,7 +110,7 @@
         },
 
         # create a Microsoft RegionInfoMP structure from an MWG RegionInfo structure
-        MyRegionMP => {
+        MWGRegion2MPRegion => {
             Require => 'RegionInfo',
             ValueConv => q{
                 my ($rgn, @newRgns);
@@ -129,8 +131,8 @@
         },
 
         # create a Microsoft RegionInfoMP structure from an IPTC ImageRegion list
-        MyRegionMP2 => {
-            Name => 'MyRegionMP',
+        IPTCRegion2MPRegion => {
+            Name => 'MWGRegion2MPRegion',
             Require => {
                 0 => 'ImageRegion',
                 1 => 'ImageWidth',
@@ -138,7 +140,7 @@
             },
             ValueConv => q{
                 my ($rgn, @newRgns);
-                my $rgns = ref $val[0] eq 'ARRAY' ? $val[0] : [ $val[0] ]; 
+                my $rgns = ref $val[0] eq 'ARRAY' ? $val[0] : [ $val[0] ];
                 foreach $rgn (@$rgns) {
                     my %newRgn;
                     if ($$rgn{RegionBoundary} and $$rgn{RegionBoundary}{RbShape} eq 'rectangle') {
@@ -159,7 +161,7 @@
         },
 
         # create an IPTC ImageRegion list from an MWG RegionInfo structure
-        MyRegionIPTC => {
+        MWGRegion2IPTCRegion => {
             Require => 'RegionInfo',
             ValueConv => q{
                 my ($rgn, @newRgns);
@@ -187,8 +189,8 @@
         },
 
         # create an IPTC ImageRegion list from a Microsoft RegionInfoMP structure
-        MyRegionIPTC2 => {
-            Name => 'MyRegionIPTC',
+        MPRegion2IPTCRegion => {
+            Name => 'MWGRegion2IPTCRegion',
             Require => 'RegionInfoMP',
             ValueConv => q{
                 my ($rgn, @newRgns);
@@ -220,4 +222,13 @@
     },
 );
 
+%Image::ExifTool::UserDefined::Shortcuts = (
+    MyRegion    => 'MPRegion2MWGRegion',
+    MyRegion2   => 'IPTCRegion2MWGRegion',
+    MyRegionMP  => 'MWGRegion2MPRegion',
+    MyRegionMP2 => 'IPTCRegion2MPRegion',
+    MyRegionIPTC    => 'MWGRegion2IPTCRegion',
+    MyRegionIPTC2   => 'MPRegion2IPTCRegion',
+);
+
 1;  #end

data/bin/config_files/cuepointlist.config

@@ -0,0 +1,70 @@
+#------------------------------------------------------------------------------
+# File:         cuepointlist.config
+#
+# Description:  ExifTool config file to generate list of cue points and labels
+#               in WAV audio files
+#
+# Usage:        exiftool -config cuepointlist.config -cuepointlist -b FILE
+#
+# Requires:     ExifTool version 12.25 or later
+#
+# Revisions:    2021-04-20 - P. Harvey Created
+#------------------------------------------------------------------------------
+
+%Image::ExifTool::UserDefined = (
+    'Image::ExifTool::Composite' => {
+        CuePointList => {
+            Require => {
+                0 => 'CuePoints',
+                1 => 'SampleRate',
+            },
+            Desire => {
+                2 => 'CuePointLabel',
+                3 => 'CuePointNotes',
+                4 => 'LabeledText',
+            },
+            ValueConv => q{
+                SetByteOrder('II');
+                my (%lbl, %rgn, %rtyp, %rlbl, %note, $pos, $i);
+                # get labels if available
+                for ($i=1; defined $val[2]; ++$i) {
+                    $lbl{$1} = $2 if $val[2] =~ /^(\d+) (.*)/ and length $2;
+                    $val[2] = $self->GetValue("CuePointLabel ($i)");
+                }
+                # get notes if available
+                for ($i=1; defined $val[3]; ++$i) {
+                    $note{$1} = $2 if $val[3] =~ /^(\d+) (.*)/ and length $2;
+                    $val[3] = $self->GetValue("CuePointNotes ($i)");
+                }
+                # get regions if available
+                for ($i=1; defined $val[4]; ++$i) {
+                    if ($val[4] =~ /^(\d+) (\d+) '(.*)' \d+ \d+ \d+ \d+ (.*)/) {
+                        $rgn{$1} = $2;
+                        $rtyp{$1} = $3;
+                        $rlbl{$1} = $4;
+                    }
+                    $val[4] = $self->GetValue("LabeledText ($i)");
+                }
+                my $buff = "Cue\tStart\tEnd\tLabel\tPurpose\tText\tNotes\n";
+                for ($pos=4; $pos+24<=length(${$val[0]}); $pos+=24) {
+                    my $n = Get32u($val[0], $pos);
+                    my $start = Get32u($val[0], $pos + 4);
+                    my (@lbl, $lbl);
+                    push @lbl, $lbl{$n} if defined $lbl{$n};
+                    push @lbl, $rlbl{$n} if defined $rlbl{$n};
+                    push @lbl, '-', $note{$n} if defined $note{$n};
+                    my $lbl = join ' ', @lbl;
+                    $buff .= sprintf("%d\t%.3f\t%.3f\t%s\t%s\t%s\t%s\n",
+                             $n, $start/$val[1], ($start+($rgn{$n}||0))/$val[1],
+                             defined($lbl{$n}) ? $lbl{$n} : '',
+                             defined($rtyp{$n}) ? $rtyp{$n} : '',
+                             defined($rlbl{$n}) ? $rlbl{$n} : '',
+                             defined($note{$n}) ? $note{$n} : '');
+                }
+                return $buff;
+            },
+        },
+    },
+);
+
+1; # end

data/bin/config_files/example.config

@@ -133,7 +133,7 @@
         # Example 12.  PNG:NewPngTag1
         NewPngTag1 => { },
         # Example 13.  PNG:NewPngTag2
-        NewPngTag2 => { },
+        NewPngTag2 => { iTXt => 1 }, # (force this tag to be written as iTXt)
         # Example 14.  PNG:NewPngTag3
         NewPngTag3 => { },
     },