Update to 9.96

21 files changed, 382 insertions, 33 deletions

diff --git a/t/ASF_2.out b/t/ASF_2.out
index 30ed1be0..8e4aac0e 100644
--- a/t/ASF_2.out
+++ b/t/ASF_2.out
@@ -1,10 +1,10 @@
-[ExifTool, ExifTool, ExifTool] ExifToolVersion - ExifTool Version Number: 9.94
+[ExifTool, ExifTool, ExifTool] ExifToolVersion - ExifTool Version Number: 9.96
 [File, System, Image] FileName - File Name: ASF.wmv
 [File, System, Image] Directory - Directory: t/images
 [File, System, Image] FileSize - File Size: 12 kB
 [File, System, Time] FileModifyDate - File Modification Date/Time: 2005:12:27 07:29:29-05:00
-[File, System, Time] FileAccessDate - File Access Date/Time: 2015:04:29 20:10:38-04:00
-[File, System, Time] FileInodeChangeDate - File Inode Change Date/Time: 2015:04:25 10:57:00-04:00
+[File, System, Time] FileAccessDate - File Access Date/Time: 2015:05:13 13:33:45-04:00
+[File, System, Time] FileInodeChangeDate - File Inode Change Date/Time: 2015:03:07 15:31:02-05:00
 [File, System, Image] FilePermissions - File Permissions: rw-r--r--
 [File, File, Image] FileType - File Type: WMV
 [File, File, Image] FileTypeExtension - File Type Extension: wmv
@@ -14,7 +14,7 @@
 [ASF, ASF, Video] ToolVersion - Tool Version: 3.0.1115.0
 [ASF, ASF, Video] Genre - Genre: Photo Story
 [ASF, ASF, Image] 0 - Picture Type: Front Cover
-[ASF, ASF, Image] 1 - Picture Mime Type: image/jpeg
+[ASF, ASF, Image] 1 - Picture MIME Type: image/jpeg
 [ASF, ASF, Preview] 3 - Picture: (Binary data 6587 bytes)
 [ASF, ASF, Video] IsVBR - Is VBR: True
 [ASF, ASF, Video] ASFLeakyBucketPairs - ASF Leaky Bucket Pairs: (Binary data 114 bytes)
diff --git a/t/CanonVRD.t b/t/CanonVRD.t
index 588aa3ce..6bafac65 100644
--- a/t/CanonVRD.t
+++ b/t/CanonVRD.t
@@ -1,7 +1,7 @@
 # Before "make install", this script should be runnable with "make test".
 # After "make install" it should work as "perl t/CanonVRD.t".
 
-BEGIN { $| = 1; print "1..12\n"; $Image::ExifTool::noConfig = 1; }
+BEGIN { $| = 1; print "1..22\n"; $Image::ExifTool::noConfig = 1; }
 END {print "not ok 1\n" unless $loaded;}
 
 # test 1: Load the module(s)
@@ -17,12 +17,13 @@ my $testnum = 1;
 
 # short list of tags to check in tests
 my @checkTags = qw(FileSize Warning VRDVersion VRDOffset);
+my @checkDR4 = qw(FileSize Warning GammaBlackPoint RedHSL GreenHSL SharpnessAdjOn);
 
 # test 2: Extract information from CanonVRD.vrd
 {
     ++$testnum;
     my $exifTool = new Image::ExifTool;
-    my $info = $exifTool->ImageInfo('t/images/CanonVRD.vrd', {Duplicates => 1});
+    my $info = $exifTool->ImageInfo('t/images/CanonVRD.vrd');
     print 'not ' unless check($exifTool, $info, $testname, $testnum);
     print "ok $testnum\n";
 }
@@ -126,4 +127,94 @@ my @checkTags = qw(FileSize Warning VRDVersion VRDOffset);
     }
 }
 
+# test 13: Extract information from CanonVRD.dr4
+{
+    ++$testnum;
+    my $exifTool = new Image::ExifTool;
+    my $info = $exifTool->ImageInfo('t/images/CanonVRD.dr4');
+    print 'not ' unless check($exifTool, $info, $testname, $testnum);
+    print "ok $testnum\n";
+}
+
+# test 14: Test writing to DR4
+{
+    ++$testnum;
+    my $exifTool = new Image::ExifTool;
+    $exifTool->Options(PrintConv => 0);
+    $exifTool->SetNewValue(CropX => 123);
+    $exifTool->SetNewValue(SharpnessAdjOn => 0);
+    $exifTool->SetNewValue(RedHSL => '-4.3 1.2 3.8');
+    $exifTool->SetNewValue('CanonVRD:GammaBlackPoint' => '1.234');
+    my $testfile = "t/${testname}_${testnum}_failed.dr4";
+    unlink $testfile;
+    $exifTool->WriteInfo('t/images/CanonVRD.dr4', $testfile);
+    my $info = $exifTool->ImageInfo($testfile, '-filename');
+    print 'not ' unless check($exifTool, $info, $testname, $testnum);
+    print "ok $testnum\n";
+}
+
+# tests 15-20: Write CanonDR4 as a block to various images
+{
+    my $exifTool = new Image::ExifTool;
+    my $srcfile = "t/${testname}_14_failed.dr4";
+    $exifTool->SetNewValuesFromFile($srcfile, 'CanonDR4');
+    $exifTool->Options(PrintConv => 0);
+    my ($file, $ext);
+    foreach $file (qw(Writer.jpg ExifTool.jpg CanonRaw.cr2 CanonRaw.crw CanonVRD.vrd CanonVRD.dr4)) {
+        ++$testnum;
+        ($ext = $file) =~ s/^\w+//;
+        my $testfile = "t/${testname}_${testnum}_failed$ext";
+        unlink $testfile;
+        $exifTool->WriteInfo("t/images/$file", $testfile);
+        my $info = $exifTool->ImageInfo($testfile, @checkDR4);
+        if (check($exifTool, $info, $testname, $testnum)) {
+            unlink $testfile unless $testnum == 15 or $testnum == 17;
+            unlink $srcfile if $testnum == 20;
+        } else {
+            print 'not ';
+        }
+        print "ok $testnum\n";
+    }
+}
+
+# test 21: Delete DR4(VRD) as a block
+{
+    ++$testnum;
+    my $exifTool = new Image::ExifTool;
+    my $srcfile = "t/${testname}_15_failed.jpg";
+    $exifTool->SetNewValue(CanonDR4 => undef, Protected => 1);
+    my $testfile = "t/${testname}_${testnum}_failed.jpg";
+    unlink $testfile;
+    $exifTool->WriteInfo($srcfile, $testfile);
+    $exifTool->Options(PrintConv => 0);
+    my $info = $exifTool->ImageInfo($testfile, @checkDR4);
+    if (check($exifTool, $info, $testname, $testnum)) {
+        unlink $testfile;
+        unlink $srcfile;
+    } else {
+        print 'not ';
+    }
+    print "ok $testnum\n";
+}
+
+# test 22: Create a DR4 file from scratch
+{
+    ++$testnum;
+    my $exifTool = new Image::ExifTool;
+    $exifTool->Options(PrintConv => 0);
+    my $srcfile = "t/${testname}_17_failed.cr2";
+    $exifTool->SetNewValuesFromFile($srcfile, 'CanonDR4');
+    my $testfile = "t/${testname}_${testnum}_failed.dr4";
+    unlink $testfile;
+    $exifTool->WriteInfo(undef, $testfile);
+    my $info = $exifTool->ImageInfo($testfile, '-filename');
+    if (check($exifTool, $info, $testname, $testnum, 14)) {
+        unlink $testfile;
+        unlink $srcfile;
+    } else {
+        print 'not ';
+    }
+    print "ok $testnum\n";
+}
+
 # end
diff --git a/t/CanonVRD_11.out b/t/CanonVRD_11.out
index c3836dc6..0794a11b 100644
--- a/t/CanonVRD_11.out
+++ b/t/CanonVRD_11.out
@@ -1,10 +1,10 @@
-[ExifTool, ExifTool, ExifTool] ExifToolVersion - ExifTool Version Number: 9.93
+[ExifTool, ExifTool, ExifTool] ExifToolVersion - ExifTool Version Number: 9.96
 [File, System, Image] FileName - File Name: CanonVRD_11_failed.vrd
 [File, System, Image] Directory - Directory: t
 [File, System, Image] FileSize - File Size: 4.5 kB
-[File, System, Time] FileModifyDate - File Modification Date/Time: 2015:04:18 07:17:37-04:00
-[File, System, Time] FileAccessDate - File Access Date/Time: 2015:04:18 07:17:37-04:00
-[File, System, Time] FileInodeChangeDate - File Inode Change Date/Time: 2015:04:18 07:17:37-04:00
+[File, System, Time] FileModifyDate - File Modification Date/Time: 2015:05:19 10:17:08-04:00
+[File, System, Time] FileAccessDate - File Access Date/Time: 2015:05:19 10:17:08-04:00
+[File, System, Time] FileInodeChangeDate - File Inode Change Date/Time: 2015:05:19 10:17:08-04:00
 [File, System, Image] FilePermissions - File Permissions: rw-r--r--
 [File, File, Image] FileType - File Type: VRD
 [File, File, Image] FileTypeExtension - File Type Extension: vrd
@@ -108,6 +108,8 @@
 [CanonVRD, CanonVRD, Image] 64 - Monochrome Raw Shadow Point: 0
 [CanonVRD, CanonVRD, Image] 65 - Monochrome Output Highlight Point: 4095
 [CanonVRD, CanonVRD, Image] 66 - Monochrome Output Shadow Point: 0
+[CanonVRD, CanonVRD, Image] 76 - Custom Color Tone: 4
+[CanonVRD, CanonVRD, Image] 77 - Custom Saturation: 2
 [CanonVRD, CanonVRD, Image] 78 - Custom Contrast: 0
 [CanonVRD, CanonVRD, Image] 79 - Custom Linear: No
 [CanonVRD, CanonVRD, Image] 80 - Custom Sharpness: 7
@@ -115,5 +117,5 @@
 [CanonVRD, CanonVRD, Image] 82 - Custom Raw Shadow Point: 6
 [CanonVRD, CanonVRD, Image] 83 - Custom Output Highlight Point: 4095
 [CanonVRD, CanonVRD, Image] 84 - Custom Output Shadow Point: 0
-[XMP, XMP-x, Document] xmptk - XMP Toolkit: Image::ExifTool 9.93
+[XMP, XMP-x, Document] xmptk - XMP Toolkit: Image::ExifTool 9.96
 [XMP, XMP-dc, Image] title - Title: XMP in VRD test
diff --git a/t/CanonVRD_13.out b/t/CanonVRD_13.out
new file mode 100644
index 00000000..07f7b9a2
--- /dev/null
+++ b/t/CanonVRD_13.out
@@ -0,0 +1,102 @@
+[ExifTool, ExifTool, ExifTool] ExifToolVersion - ExifTool Version Number: 9.96
+[File, System, Image] FileName - File Name: CanonVRD.dr4
+[File, System, Image] Directory - Directory: t/images
+[File, System, Image] FileSize - File Size: 5.3 kB
+[File, System, Time] FileModifyDate - File Modification Date/Time: 2015:05:18 15:43:16-04:00
+[File, System, Time] FileAccessDate - File Access Date/Time: 2015:05:19 20:13:59-04:00
+[File, System, Time] FileInodeChangeDate - File Inode Change Date/Time: 2015:05:18 15:47:03-04:00
+[File, System, Image] FilePermissions - File Permissions: rw-r--r--
+[File, File, Image] FileType - File Type: DR4
+[File, File, Image] FileTypeExtension - File Type Extension: dr4
+[File, File, Image] MIMEType - MIME Type: application/unknown
+[CanonVRD, CanonVRD, Image] 3 - DR4 Camera Model: EOS 7D Mark II
+[CanonVRD, CanonVRD, Image] 65538 - Rotation: 0
+[CanonVRD, CanonVRD, Image] 65539 - Angle Adj: 13.08
+[CanonVRD, CanonVRD, Image] 65793 - Check Mark: Clear
+[CanonVRD, CanonVRD, Image] 66048 - Work Color Space: Wide Gamut RGB
+[CanonVRD, CanonVRD, Image] 131073 - Raw Brightness Adj: 0
+[CanonVRD, CanonVRD, Image] 131329 - White Balance Adj: Cloudy
+[CanonVRD, CanonVRD, Image] 131330 - WB Adj Color Temp: 5200
+[CanonVRD, CanonVRD, Image] 131333 - WB Adj Magenta Green: -5
+[CanonVRD, CanonVRD, Image] 131334 - WB Adj Blue Amber: 3
+[CanonVRD, CanonVRD, Image] 131584 - Gamma Linear: No
+[CanonVRD, CanonVRD, Image] 131841 - Picture Style: Neutral
+[CanonVRD, CanonVRD, Image] 131843 - Contrast Adj: -1
+[CanonVRD, CanonVRD, Image] 131844 - Color Tone Adj: 0.7
+[CanonVRD, CanonVRD, Image] 131845 - Color Saturation Adj: 1.6
+[CanonVRD, CanonVRD, Image] 131846 - Monochrome Toning Effect: None
+[CanonVRD, CanonVRD, Image] 131847 - Monochrome Filter Effect: None
+[CanonVRD, CanonVRD, Image] 131848 - Unsharp Mask Strength: 3
+[CanonVRD, CanonVRD, Image] 131849 - Unsharp Mask Fineness: 2
+[CanonVRD, CanonVRD, Image] 131850 - Unsharp Mask Threshold: 7.2
+[CanonVRD, CanonVRD, Image] 131851 - Shadow Adj: -0.1
+[CanonVRD, CanonVRD, Image] 131852 - Highlight Adj: 0.5
+[CanonVRD, CanonVRD, Image] 0 - Tone Curve Color Space: Luminance
+[CanonVRD, CanonVRD, Image] 1 - Tone Curve Shape: Straight
+[CanonVRD, CanonVRD, Image] 3 - Tone Curve Input Level: 0 242
+[CanonVRD, CanonVRD, Image] 5 - Tone Curve Output Level: 79 255
+[CanonVRD, CanonVRD, Image] 7 - RGB Curve Points: (0,79) (117,172) (242,255)
+[CanonVRD, CanonVRD, Image] 10 - Tone Curve X: 117
+[CanonVRD, CanonVRD, Image] 11 - Tone Curve Y: 172
+[CanonVRD, CanonVRD, Image] 45 - Red Curve Points: (2,3) (126,116) (254,253)
+[CanonVRD, CanonVRD, Image] 83 - Green Curve Points: (1,2) (125,139) (254,253)
+[CanonVRD, CanonVRD, Image] 121 - Blue Curve Points: (3,4) (132,113) (255,255)
+[CanonVRD, CanonVRD, Image] 0x20400.1 - Tone Curve Original: No
+[CanonVRD, CanonVRD, Image] 132112 - Tone Curve Brightness: 34
+[CanonVRD, CanonVRD, Image] 132113 - Tone Curve Contrast: -20
+[CanonVRD, CanonVRD, Image] 132352 - Auto Lighting Optimizer: Strong
+[CanonVRD, CanonVRD, Image] 0x20500.0 - Auto Lighting Optimizer On: Yes
+[CanonVRD, CanonVRD, Image] 131856 - Sharpness Adj: Unsharp Mask
+[CanonVRD, CanonVRD, Image] 0x20310.0 - Sharpness Adj On: Yes
+[CanonVRD, CanonVRD, Image] 131857 - Sharpness Strength: 0
+[CanonVRD, CanonVRD, Image] 133376 - Color Hue: -10
+[CanonVRD, CanonVRD, Image] 133377 - Saturation Adj: 98
+[CanonVRD, CanonVRD, Image] 133392 - Red HSL: -1 -0.9 -0.8
+[CanonVRD, CanonVRD, Image] 133393 - Orange HSL: -0.7 -0.6 -0.5
+[CanonVRD, CanonVRD, Image] 133394 - Green HSL: -0.4 -0.3 -0.2
+[CanonVRD, CanonVRD, Image] 133395 - Aqua HSL: -0.1 0 0.1
+[CanonVRD, CanonVRD, Image] 133396 - Blue HSL: 0.2 0.3 0.4
+[CanonVRD, CanonVRD, Image] 133397 - Blue HSL: 0.5 0.6 0.7
+[CanonVRD, CanonVRD, Image] 133398 - Purple HSL: 0.8 0.9 1
+[CanonVRD, CanonVRD, Image] 133399 - Magenta HSL: 1.1 1.2 1.3
+[CanonVRD, CanonVRD, Image] 132608 - Luminance Noise Reduction: 4.4
+[CanonVRD, CanonVRD, Image] 132609 - Chrominance Noise Reduction: 2.7
+[CanonVRD, CanonVRD, Image] 132865 - Shooting Distance: 100%
+[CanonVRD, CanonVRD, Image] 132866 - Peripheral Illumination: 34
+[CanonVRD, CanonVRD, Image] 0x20702.0 - Peripheral Illumination On: Yes
+[CanonVRD, CanonVRD, Image] 132867 - Chromatic Aberration: 121
+[CanonVRD, CanonVRD, Image] 0x20703.0 - Chromatic Aberration On: Yes
+[CanonVRD, CanonVRD, Image] 132868 - Color Blur On: Yes
+[CanonVRD, CanonVRD, Image] 132869 - Distortion Correction: 48
+[CanonVRD, CanonVRD, Image] 0x20705.0 - Distortion Correction On: Yes
+[CanonVRD, CanonVRD, Image] 132870 - DLO Setting: 50
+[CanonVRD, CanonVRD, Image] 0x20706.0 - DLO On: No
+[CanonVRD, CanonVRD, Image] 132871 - Chromatic Aberration Red: -0.1
+[CanonVRD, CanonVRD, Image] 132872 - Chromatic Aberration Blue: -0.5
+[CanonVRD, CanonVRD, Image] 2 - Gamma Contrast: 0
+[CanonVRD, CanonVRD, Image] 3 - Gamma Color Tone: 0
+[CanonVRD, CanonVRD, Image] 4 - Gamma Saturation: 0
+[CanonVRD, CanonVRD, Image] 5 - Gamma Unsharp Mask Strength: 3
+[CanonVRD, CanonVRD, Image] 6 - Gamma Unsharp Mask Fineness: 4
+[CanonVRD, CanonVRD, Image] 7 - Gamma Unsharp Mask Threshold: 4
+[CanonVRD, CanonVRD, Image] 8 - Gamma Sharpness Strength: 3
+[CanonVRD, CanonVRD, Image] 9 - Gamma Shadow: 0
+[CanonVRD, CanonVRD, Image] 10 - Gamma Highlight: 0
+[CanonVRD, CanonVRD, Image] 12 - Gamma Black Point: +0.000
+[CanonVRD, CanonVRD, Image] 13 - Gamme White Point: -0.000
+[CanonVRD, CanonVRD, Image] 14 - Gamma Mid Point: +0.000
+[CanonVRD, CanonVRD, Image] 15 - Gamma Curve Output Level: 0 16383
+[CanonVRD, CanonVRD, Image] 0 - Crop Active: Yes
+[CanonVRD, CanonVRD, Image] 1 - Crop Rotated Original Width: 6089
+[CanonVRD, CanonVRD, Image] 2 - Crop Rotated Original Height: 4740
+[CanonVRD, CanonVRD, Image] 3 - Crop X: 2060
+[CanonVRD, CanonVRD, Image] 4 - Crop Y: 1291
+[CanonVRD, CanonVRD, Image] 5 - Crop Width: 2952
+[CanonVRD, CanonVRD, Image] 6 - Crop Height: 1476
+[CanonVRD, CanonVRD, Image] 8 - Crop Rotation: 13.08
+[CanonVRD, CanonVRD, Image] 10 - Crop Original Width: 5472
+[CanonVRD, CanonVRD, Image] 11 - Crop Original Height: 3648
+[CanonVRD, CanonVRD, Image] 2 - Stamp Tool Count: 0
+[CanonVRD, CanonVRD, Image] 196865 - Crop Aspect Ratio: Custom
+[CanonVRD, CanonVRD, Image] 196866 - Crop Aspect Ratio Custom: 2 1
+[CanonVRD, CanonVRD, Image] 984338 - Lens Focal Length: 135
diff --git a/t/CanonVRD_14.out b/t/CanonVRD_14.out
new file mode 100644
index 00000000..a5a4e113
--- /dev/null
+++ b/t/CanonVRD_14.out
@@ -0,0 +1,101 @@
+[ExifTool, ExifTool, ExifTool] ExifToolVersion - ExifTool Version Number: 9.96
+[File, System, Image] Directory - Directory: t
+[File, System, Image] FileSize - File Size: 5472
+[File, System, Time] FileModifyDate - File Modification Date/Time: 2015:05:19 20:14:59-04:00
+[File, System, Time] FileAccessDate - File Access Date/Time: 2015:05:19 20:14:59-04:00
+[File, System, Time] FileInodeChangeDate - File Inode Change Date/Time: 2015:05:19 20:14:59-04:00
+[File, System, Image] FilePermissions - File Permissions: 644
+[File, File, Image] FileType - File Type: DR4
+[File, File, Image] FileTypeExtension - File Type Extension: DR4
+[File, File, Image] MIMEType - MIME Type: application/unknown
+[CanonVRD, CanonVRD, Image] 3 - DR4 Camera Model: 2147484297
+[CanonVRD, CanonVRD, Image] 65538 - Rotation: 0
+[CanonVRD, CanonVRD, Image] 65539 - Angle Adj: 13.08
+[CanonVRD, CanonVRD, Image] 65793 - Check Mark: 0
+[CanonVRD, CanonVRD, Image] 66048 - Work Color Space: 3
+[CanonVRD, CanonVRD, Image] 131073 - Raw Brightness Adj: 0
+[CanonVRD, CanonVRD, Image] 131329 - White Balance Adj: 2
+[CanonVRD, CanonVRD, Image] 131330 - WB Adj Color Temp: 5200
+[CanonVRD, CanonVRD, Image] 131333 - WB Adj Magenta Green: -5
+[CanonVRD, CanonVRD, Image] 131334 - WB Adj Blue Amber: 3
+[CanonVRD, CanonVRD, Image] 131584 - Gamma Linear: 0
+[CanonVRD, CanonVRD, Image] 131841 - Picture Style: 132
+[CanonVRD, CanonVRD, Image] 131843 - Contrast Adj: -1
+[CanonVRD, CanonVRD, Image] 131844 - Color Tone Adj: 0.7
+[CanonVRD, CanonVRD, Image] 131845 - Color Saturation Adj: 1.6
+[CanonVRD, CanonVRD, Image] 131846 - Monochrome Toning Effect: 0
+[CanonVRD, CanonVRD, Image] 131847 - Monochrome Filter Effect: 0
+[CanonVRD, CanonVRD, Image] 131848 - Unsharp Mask Strength: 3
+[CanonVRD, CanonVRD, Image] 131849 - Unsharp Mask Fineness: 2
+[CanonVRD, CanonVRD, Image] 131850 - Unsharp Mask Threshold: 7.2
+[CanonVRD, CanonVRD, Image] 131851 - Shadow Adj: -0.1
+[CanonVRD, CanonVRD, Image] 131852 - Highlight Adj: 0.5
+[CanonVRD, CanonVRD, Image] 0 - Tone Curve Color Space: 1
+[CanonVRD, CanonVRD, Image] 1 - Tone Curve Shape: 1
+[CanonVRD, CanonVRD, Image] 3 - Tone Curve Input Level: 0 242
+[CanonVRD, CanonVRD, Image] 5 - Tone Curve Output Level: 79 255
+[CanonVRD, CanonVRD, Image] 7 - RGB Curve Points: 3 0 79 117 172 242 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+[CanonVRD, CanonVRD, Image] 10 - Tone Curve X: 117
+[CanonVRD, CanonVRD, Image] 11 - Tone Curve Y: 172
+[CanonVRD, CanonVRD, Image] 45 - Red Curve Points: 3 2 3 126 116 254 253 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+[CanonVRD, CanonVRD, Image] 83 - Green Curve Points: 3 1 2 125 139 254 253 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+[CanonVRD, CanonVRD, Image] 121 - Blue Curve Points: 3 3 4 132 113 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+[CanonVRD, CanonVRD, Image] 0x20400.1 - Tone Curve Original: 0
+[CanonVRD, CanonVRD, Image] 132112 - Tone Curve Brightness: 34
+[CanonVRD, CanonVRD, Image] 132113 - Tone Curve Contrast: -20
+[CanonVRD, CanonVRD, Image] 132352 - Auto Lighting Optimizer: 2
+[CanonVRD, CanonVRD, Image] 0x20500.0 - Auto Lighting Optimizer On: 1
+[CanonVRD, CanonVRD, Image] 131856 - Sharpness Adj: 1
+[CanonVRD, CanonVRD, Image] 0x20310.0 - Sharpness Adj On: 0
+[CanonVRD, CanonVRD, Image] 131857 - Sharpness Strength: 0
+[CanonVRD, CanonVRD, Image] 133376 - Color Hue: -10
+[CanonVRD, CanonVRD, Image] 133377 - Saturation Adj: 98
+[CanonVRD, CanonVRD, Image] 133392 - Red HSL: -4.3 1.2 3.8
+[CanonVRD, CanonVRD, Image] 133393 - Orange HSL: -0.7 -0.6 -0.5
+[CanonVRD, CanonVRD, Image] 133394 - Green HSL: -0.4 -0.3 -0.2
+[CanonVRD, CanonVRD, Image] 133395 - Aqua HSL: -0.1 0 0.1
+[CanonVRD, CanonVRD, Image] 133396 - Blue HSL: 0.2 0.3 0.4
+[CanonVRD, CanonVRD, Image] 133397 - Blue HSL: 0.5 0.6 0.7
+[CanonVRD, CanonVRD, Image] 133398 - Purple HSL: 0.8 0.9 1
+[CanonVRD, CanonVRD, Image] 133399 - Magenta HSL: 1.1 1.2 1.3
+[CanonVRD, CanonVRD, Image] 132608 - Luminance Noise Reduction: 4.4
+[CanonVRD, CanonVRD, Image] 132609 - Chrominance Noise Reduction: 2.7
+[CanonVRD, CanonVRD, Image] 132865 - Shooting Distance: 1
+[CanonVRD, CanonVRD, Image] 132866 - Peripheral Illumination: 34
+[CanonVRD, CanonVRD, Image] 0x20702.0 - Peripheral Illumination On: 1
+[CanonVRD, CanonVRD, Image] 132867 - Chromatic Aberration: 121
+[CanonVRD, CanonVRD, Image] 0x20703.0 - Chromatic Aberration On: 1
+[CanonVRD, CanonVRD, Image] 132868 - Color Blur On: 1
+[CanonVRD, CanonVRD, Image] 132869 - Distortion Correction: 48
+[CanonVRD, CanonVRD, Image] 0x20705.0 - Distortion Correction On: 1
+[CanonVRD, CanonVRD, Image] 132870 - DLO Setting: 50
+[CanonVRD, CanonVRD, Image] 0x20706.0 - DLO On: 0
+[CanonVRD, CanonVRD, Image] 132871 - Chromatic Aberration Red: -0.1
+[CanonVRD, CanonVRD, Image] 132872 - Chromatic Aberration Blue: -0.5
+[CanonVRD, CanonVRD, Image] 2 - Gamma Contrast: 0
+[CanonVRD, CanonVRD, Image] 3 - Gamma Color Tone: 0
+[CanonVRD, CanonVRD, Image] 4 - Gamma Saturation: 0
+[CanonVRD, CanonVRD, Image] 5 - Gamma Unsharp Mask Strength: 3
+[CanonVRD, CanonVRD, Image] 6 - Gamma Unsharp Mask Fineness: 4
+[CanonVRD, CanonVRD, Image] 7 - Gamma Unsharp Mask Threshold: 4
+[CanonVRD, CanonVRD, Image] 8 - Gamma Sharpness Strength: 3
+[CanonVRD, CanonVRD, Image] 9 - Gamma Shadow: 0
+[CanonVRD, CanonVRD, Image] 10 - Gamma Highlight: 0
+[CanonVRD, CanonVRD, Image] 12 - Gamma Black Point: 1.23403077716592
+[CanonVRD, CanonVRD, Image] 13 - Gamme White Point: -1.77635683940025e-15
+[CanonVRD, CanonVRD, Image] 14 - Gamma Mid Point: 0
+[CanonVRD, CanonVRD, Image] 15 - Gamma Curve Output Level: 0 16383
+[CanonVRD, CanonVRD, Image] 0 - Crop Active: 1
+[CanonVRD, CanonVRD, Image] 1 - Crop Rotated Original Width: 6089
+[CanonVRD, CanonVRD, Image] 2 - Crop Rotated Original Height: 4740
+[CanonVRD, CanonVRD, Image] 3 - Crop X: 123
+[CanonVRD, CanonVRD, Image] 4 - Crop Y: 1291
+[CanonVRD, CanonVRD, Image] 5 - Crop Width: 2952
+[CanonVRD, CanonVRD, Image] 6 - Crop Height: 1476
+[CanonVRD, CanonVRD, Image] 8 - Crop Rotation: 13.08
+[CanonVRD, CanonVRD, Image] 10 - Crop Original Width: 5472
+[CanonVRD, CanonVRD, Image] 11 - Crop Original Height: 3648
+[CanonVRD, CanonVRD, Image] 2 - Stamp Tool Count: 0
+[CanonVRD, CanonVRD, Image] 196865 - Crop Aspect Ratio: 1
+[CanonVRD, CanonVRD, Image] 196866 - Crop Aspect Ratio Custom: 2 1
+[CanonVRD, CanonVRD, Image] 984338 - Lens Focal Length: 135
diff --git a/t/CanonVRD_15.out b/t/CanonVRD_15.out
new file mode 100644
index 00000000..1f9c1305
--- /dev/null
+++ b/t/CanonVRD_15.out
@@ -0,0 +1,5 @@
+[File, System, Image] FileSize - File Size: 5831
+[CanonVRD, CanonVRD, Image] 0x20310.0 - Sharpness Adj On: 0
+[CanonVRD, CanonVRD, Image] 133392 - Red HSL: -4.3 1.2 3.8
+[CanonVRD, CanonVRD, Image] 133394 - Green HSL: -0.4 -0.3 -0.2
+[CanonVRD, CanonVRD, Image] 12 - Gamma Black Point: 1.23403077716592
diff --git a/t/CanonVRD_16.out b/t/CanonVRD_16.out
new file mode 100644
index 00000000..11f7bd36
--- /dev/null
+++ b/t/CanonVRD_16.out
@@ -0,0 +1,5 @@
+[File, System, Image] FileSize - File Size: 34205
+[CanonVRD, CanonVRD, Image] 0x20310.0 - Sharpness Adj On: 0
+[CanonVRD, CanonVRD, Image] 133392 - Red HSL: -4.3 1.2 3.8
+[CanonVRD, CanonVRD, Image] 133394 - Green HSL: -0.4 -0.3 -0.2
+[CanonVRD, CanonVRD, Image] 12 - Gamma Black Point: 1.23403077716592
diff --git a/t/CanonVRD_17.out b/t/CanonVRD_17.out
new file mode 100644
index 00000000..3f911ec7
--- /dev/null
+++ b/t/CanonVRD_17.out
@@ -0,0 +1,5 @@
+[File, System, Image] FileSize - File Size: 14306
+[CanonVRD, CanonVRD, Image] 0x20310.0 - Sharpness Adj On: 0
+[CanonVRD, CanonVRD, Image] 133392 - Red HSL: -4.3 1.2 3.8
+[CanonVRD, CanonVRD, Image] 133394 - Green HSL: -0.4 -0.3 -0.2
+[CanonVRD, CanonVRD, Image] 12 - Gamma Black Point: 1.23403077716592
diff --git a/t/CanonVRD_18.out b/t/CanonVRD_18.out
new file mode 100644
index 00000000..e4f19152
--- /dev/null
+++ b/t/CanonVRD_18.out
@@ -0,0 +1,5 @@
+[File, System, Image] FileSize - File Size: 11836
+[CanonVRD, CanonVRD, Image] 0x20310.0 - Sharpness Adj On: 0
+[CanonVRD, CanonVRD, Image] 133392 - Red HSL: -4.3 1.2 3.8
+[CanonVRD, CanonVRD, Image] 133394 - Green HSL: -0.4 -0.3 -0.2
+[CanonVRD, CanonVRD, Image] 12 - Gamma Black Point: 1.23403077716592
diff --git a/t/CanonVRD_19.out b/t/CanonVRD_19.out
new file mode 100644
index 00000000..d2a21809
--- /dev/null
+++ b/t/CanonVRD_19.out
@@ -0,0 +1,5 @@
+[File, System, Image] FileSize - File Size: 5580
+[CanonVRD, CanonVRD, Image] 0x20310.0 - Sharpness Adj On: 0
+[CanonVRD, CanonVRD, Image] 133392 - Red HSL: -4.3 1.2 3.8
+[CanonVRD, CanonVRD, Image] 133394 - Green HSL: -0.4 -0.3 -0.2
+[CanonVRD, CanonVRD, Image] 12 - Gamma Black Point: 1.23403077716592
diff --git a/t/CanonVRD_2.out b/t/CanonVRD_2.out
index f60d9596..8cb31159 100644
--- a/t/CanonVRD_2.out
+++ b/t/CanonVRD_2.out
@@ -1,9 +1,9 @@
-[ExifTool, ExifTool, ExifTool] ExifToolVersion - ExifTool Version Number: 9.93
+[ExifTool, ExifTool, ExifTool] ExifToolVersion - ExifTool Version Number: 9.96
 [File, System, Image] FileName - File Name: CanonVRD.vrd
 [File, System, Image] Directory - Directory: t/images
 [File, System, Image] FileSize - File Size: 1768 bytes
 [File, System, Time] FileModifyDate - File Modification Date/Time: 2006:11:07 22:13:23-05:00
-[File, System, Time] FileAccessDate - File Access Date/Time: 2015:04:18 07:17:07-04:00
+[File, System, Time] FileAccessDate - File Access Date/Time: 2015:05:18 16:16:03-04:00
 [File, System, Time] FileInodeChangeDate - File Inode Change Date/Time: 2015:03:07 15:31:02-05:00
 [File, System, Image] FilePermissions - File Permissions: rw-r--r--
 [File, File, Image] FileType - File Type: VRD
@@ -108,6 +108,8 @@
 [CanonVRD, CanonVRD, Image] 64 - Monochrome Raw Shadow Point: 0
 [CanonVRD, CanonVRD, Image] 65 - Monochrome Output Highlight Point: 4095
 [CanonVRD, CanonVRD, Image] 66 - Monochrome Output Shadow Point: 0
+[CanonVRD, CanonVRD, Image] 76 - Custom Color Tone: 4
+[CanonVRD, CanonVRD, Image] 77 - Custom Saturation: 2
 [CanonVRD, CanonVRD, Image] 78 - Custom Contrast: 0
 [CanonVRD, CanonVRD, Image] 79 - Custom Linear: No
 [CanonVRD, CanonVRD, Image] 80 - Custom Sharpness: 7
diff --git a/t/CanonVRD_20.out b/t/CanonVRD_20.out
new file mode 100644
index 00000000..19bf491c
--- /dev/null
+++ b/t/CanonVRD_20.out
@@ -0,0 +1,5 @@
+[File, System, Image] FileSize - File Size: 5472
+[CanonVRD, CanonVRD, Image] 0x20310.0 - Sharpness Adj On: 0
+[CanonVRD, CanonVRD, Image] 133392 - Red HSL: -4.3 1.2 3.8
+[CanonVRD, CanonVRD, Image] 133394 - Green HSL: -0.4 -0.3 -0.2
+[CanonVRD, CanonVRD, Image] 12 - Gamma Black Point: 1.23403077716592
diff --git a/t/CanonVRD_21.out b/t/CanonVRD_21.out
new file mode 100644
index 00000000..f31c8c6d
--- /dev/null
+++ b/t/CanonVRD_21.out
@@ -0,0 +1 @@
+[File, System, Image] FileSize - File Size: 251
diff --git a/t/CanonVRD_3.out b/t/CanonVRD_3.out
index 1f36df44..388fed12 100644
--- a/t/CanonVRD_3.out
+++ b/t/CanonVRD_3.out
@@ -1,10 +1,10 @@
-[ExifTool, ExifTool, ExifTool] ExifToolVersion - ExifTool Version Number: 9.93
+[ExifTool, ExifTool, ExifTool] ExifToolVersion - ExifTool Version Number: 9.96
 [File, System, Image] FileName - File Name: CanonVRD_3_failed.vrd
 [File, System, Image] Directory - Directory: t
 [File, System, Image] FileSize - File Size: 1768 bytes
-[File, System, Time] FileModifyDate - File Modification Date/Time: 2015:04:18 07:17:37-04:00
-[File, System, Time] FileAccessDate - File Access Date/Time: 2015:04:18 07:17:37-04:00
-[File, System, Time] FileInodeChangeDate - File Inode Change Date/Time: 2015:04:18 07:17:37-04:00
+[File, System, Time] FileModifyDate - File Modification Date/Time: 2015:05:19 10:17:08-04:00
+[File, System, Time] FileAccessDate - File Access Date/Time: 2015:05:19 10:17:08-04:00
+[File, System, Time] FileInodeChangeDate - File Inode Change Date/Time: 2015:05:19 10:17:08-04:00
 [File, System, Image] FilePermissions - File Permissions: rw-r--r--
 [File, File, Image] FileType - File Type: VRD
 [File, File, Image] FileTypeExtension - File Type Extension: vrd
@@ -108,6 +108,8 @@
 [CanonVRD, CanonVRD, Image] 64 - Monochrome Raw Shadow Point: 0
 [CanonVRD, CanonVRD, Image] 65 - Monochrome Output Highlight Point: 4095
 [CanonVRD, CanonVRD, Image] 66 - Monochrome Output Shadow Point: 0
+[CanonVRD, CanonVRD, Image] 76 - Custom Color Tone: 4
+[CanonVRD, CanonVRD, Image] 77 - Custom Saturation: 2
 [CanonVRD, CanonVRD, Image] 78 - Custom Contrast: 0
 [CanonVRD, CanonVRD, Image] 79 - Custom Linear: No
 [CanonVRD, CanonVRD, Image] 80 - Custom Sharpness: 7
diff --git a/t/CanonVRD_5.out b/t/CanonVRD_5.out
index 5fbac259..46c8e9b7 100644
--- a/t/CanonVRD_5.out
+++ b/t/CanonVRD_5.out
@@ -1,3 +1,2 @@
-[File, System, Image] FileSize - File Size: 28389
-[CanonVRD, CanonVRD, Image] 2 - VRD Version: 200
+[File, System, Image] FileSize - File Size: 26621
 [CanonVRD, CanonVRD, Image] 2 - VRD Version: 200
diff --git a/t/DPX_2.out b/t/DPX_2.out
index 4e2a1f6f..56d2bc36 100644
--- a/t/DPX_2.out
+++ b/t/DPX_2.out
@@ -1,9 +1,9 @@
-[ExifTool, ExifTool, ExifTool] ExifToolVersion - ExifTool Version Number: 9.93
+[ExifTool, ExifTool, ExifTool] ExifToolVersion - ExifTool Version Number: 9.96
 [File, System, Image] FileName - File Name: DPX.dpx
 [File, System, Image] Directory - Directory: t/images
 [File, System, Image] FileSize - File Size: 2.0 kB
 [File, System, Time] FileModifyDate - File Modification Date/Time: 2013:09:20 08:49:38-04:00
-[File, System, Time] FileAccessDate - File Access Date/Time: 2015:04:18 07:17:35-04:00
+[File, System, Time] FileAccessDate - File Access Date/Time: 2015:05:11 13:05:40-04:00
 [File, System, Time] FileInodeChangeDate - File Inode Change Date/Time: 2015:03:07 15:31:02-05:00
 [File, System, Image] FilePermissions - File Permissions: rw-r--r--
 [File, File, Image] FileType - File Type: DPX
@@ -24,12 +24,14 @@
 [File, File, Image] 772 - Image Width: 2048
 [File, File, Image] 776 - Image Height: 1556
 [File, File, Image] 780 - Data Sign: Unsigned
+[File, File, Image] 800 - Components Configuration: R, G, B
 [File, File, Image] 803 - Bit Depth: 10
 [File, File, Image] 820 - Image Description: CPD
 [File, File, Image] 1432 - Source File Name: 
 [File, File, Image] 1532 - Source Create Date: 
 [File, File, Image] 1556 - Input Device Name: SPIRIT-4K DATACINE 
 [File, File, Image] 1588 - Input Device Serial Number: 01018
+[File, File, Image] 1724 - Frame Rate: 0
 [File, File, Image] 1732 - Frame ID: 
 [File, File, Image] 1764 - Slate Information: 
 [File, File, Image] 2048 - User ID: Thomson BTS        
diff --git a/t/EXE_2.out b/t/EXE_2.out
index c4dc71b6..d5a3c6e5 100644
--- a/t/EXE_2.out
+++ b/t/EXE_2.out
@@ -1,9 +1,9 @@
-[ExifTool, ExifTool, ExifTool] ExifToolVersion - ExifTool Version Number: 9.93
+[ExifTool, ExifTool, ExifTool] ExifToolVersion - ExifTool Version Number: 9.96
 [File, System, Image] FileName - File Name: EXE.exe
 [File, System, Image] Directory - Directory: t/images
 [File, System, Image] FileSize - File Size: 5.0 kB
 [File, System, Time] FileModifyDate - File Modification Date/Time: 2008:09:08 08:09:09-04:00
-[File, System, Time] FileAccessDate - File Access Date/Time: 2015:04:19 08:31:07-04:00
+[File, System, Time] FileAccessDate - File Access Date/Time: 2015:05:13 13:33:45-04:00
 [File, System, Time] FileInodeChangeDate - File Inode Change Date/Time: 2015:03:07 15:31:09-05:00
 [File, System, Image] FilePermissions - File Permissions: rwxr-xr-x
 [File, File, Image] FileType - File Type: Win32 EXE
@@ -36,6 +36,6 @@
 [EXE, EXE, Other] InternalName - Internal Name: Skippy the wonder cow
 [EXE, EXE, Other] LegalCopyright - Legal Copyright: Copyright (c) 2008
 [EXE, EXE, Other] LegalTrademarks - Legal Trademarks: none
-[EXE, EXE, Other] OriginalFilename - Original Filename: EXE.exe
+[EXE, EXE, Other] OriginalFilename - Original File Name: EXE.exe
 [EXE, EXE, Other] ProductName - Product Name: This is not a product
 [EXE, EXE, Other] ProductVersion - Product Version: 5.6.7.8b
diff --git a/t/Writer_13.out b/t/Writer_13.out
index dc755ee5..723beef2 100644
--- a/t/Writer_13.out
+++ b/t/Writer_13.out
@@ -1,10 +1,10 @@
-[ExifTool, ExifTool, ExifTool] ExifToolVersion - ExifTool Version Number: 9.93
+[ExifTool, ExifTool, ExifTool] ExifToolVersion - ExifTool Version Number: 9.96
 [File, System, Image] FileName - File Name: Writer_13_failed.jpg
 [File, System, Image] Directory - Directory: t
 [File, System, Image] FileSize - File Size: 5.0 kB
-[File, System, Time] FileModifyDate - File Modification Date/Time: 2015:04:18 07:17:52-04:00
-[File, System, Time] FileAccessDate - File Access Date/Time: 2015:04:18 07:17:52-04:00
-[File, System, Time] FileInodeChangeDate - File Inode Change Date/Time: 2015:04:18 07:17:52-04:00
+[File, System, Time] FileModifyDate - File Modification Date/Time: 2015:05:14 08:24:49-04:00
+[File, System, Time] FileAccessDate - File Access Date/Time: 2015:05:14 08:24:49-04:00
+[File, System, Time] FileInodeChangeDate - File Inode Change Date/Time: 2015:05:14 08:24:49-04:00
 [File, System, Image] FilePermissions - File Permissions: rw-r--r--
 [File, File, Image] FileType - File Type: JPEG
 [File, File, Image] FileTypeExtension - File Type Extension: jpg
@@ -132,8 +132,8 @@
 [MakerNotes, Canon, Camera] 1 - Measured RGGB: 554 1022 1026 754
 [MakerNotes, Canon, Camera] 174 - Color Temperature: 5200
 [MakerNotes, Canon, Camera] 180 - Color Space: sRGB
-[XMP, XMP-x, Document] xmptk - XMP Toolkit: Image::ExifTool 9.93
-[XMP, XMP-getty, Image] OriginalFilename - Original Filename: CRW_1602.CRW
+[XMP, XMP-x, Document] xmptk - XMP Toolkit: Image::ExifTool 9.96
+[XMP, XMP-getty, Image] OriginalFilename - Original File Name: CRW_1602.CRW
 [XMP, XMP-aux, Camera] Lens - Lens: 18.0 - 55.0 mm
 [XMP, XMP-dc, Image] description - Description: CRW with embedded XMP
 [XMP, XMP-pmi, Image] sequenceNumber - Sequence Number: 0
diff --git a/t/XMP.t b/t/XMP.t
index f161df45..1d963eb2 100644
--- a/t/XMP.t
+++ b/t/XMP.t
@@ -1,7 +1,7 @@
 # Before "make install", this script should be runnable with "make test".
 # After "make install" it should work as "perl t/XMP.t".
 
-BEGIN { $| = 1; print "1..41\n"; $Image::ExifTool::noConfig = 1; }
+BEGIN { $| = 1; print "1..42\n"; $Image::ExifTool::noConfig = 1; }
 END {print "not ok 1\n" unless $loaded;}
 
 # definitions for user-defined tag test (#26)
@@ -488,7 +488,7 @@ my $testnum = 1;
     print "ok $testnum\n";
 }
 
-# test 40: copy by flattened tag name and structure at the same time
+# test 40: Copy by flattened tag name and structure at the same time
 {
     ++$testnum;
     my $exifTool = new Image::ExifTool;
@@ -505,7 +505,7 @@ my $testnum = 1;
     print "ok $testnum\n";
 }
 
-# test 41: test writing/reading all DarwinCore tags
+# test 41: Rest writing/reading all DarwinCore tags
 {
     ++$testnum;
     my $exifTool = new Image::ExifTool;
@@ -522,4 +522,13 @@ my $testnum = 1;
     print "ok $testnum\n";
 }
 
+# test 42: Read extended XMP
+{
+    ++$testnum;
+    my $exifTool = new Image::ExifTool;
+    my $info = $exifTool->ImageInfo('t/images/ExtendedXMP.jpg', 'xmp:all');
+    print 'not ' unless check($exifTool, $info, $testname, $testnum);
+    print "ok $testnum\n";
+}
+
 # end
diff --git a/t/XMP_42.out b/t/XMP_42.out
new file mode 100644
index 00000000..97060475
--- /dev/null
+++ b/t/XMP_42.out
@@ -0,0 +1,8 @@
+[XMP, XMP-x, Document] xmptk - XMP Toolkit: Image::ExifTool 7.50
+[XMP, XMP-xmpNote, Other] HasExtendedXMP - Has Extended XMP: 04B9E48040A30A6308713BD1E4223B41
+[XMP, XMP-pdf, Author] Author - Author: PhilToo
+[XMP, XMP-pdf, Time] CreationDate - Creation Date: 2008:10:20 19:54:15
+[XMP, XMP-pdf, Author] Creator - Creator: Guess Who
+[XMP, XMP-pdf, Time] ModDate - Mod Date: 2008:10:20 19:54:15
+[XMP, XMP-pdf, Author] Producer - Producer: Just ExifTool again
+[XMP, XMP-pdf, Image] Title - Title: PDF Title
diff --git a/t/images/CanonVRD.dr4 b/t/images/CanonVRD.dr4
new file mode 100644
index 00000000..0ba820b4
--- /dev/null
+++ b/t/images/CanonVRD.dr4