Imported Upstream version 8.60

1 files changed, 245 insertions, 0 deletions

diff --git a/t/CanonRaw_7.out b/t/CanonRaw_7.out
new file mode 100644
index 00000000..5d517280
--- /dev/null
+++ b/t/CanonRaw_7.out
@@ -0,0 +1,245 @@
+[ExifTool, ExifTool, ExifTool] ExifToolVersion - ExifTool Version Number: 8.60
+[File, System, Image] FileName - File Name: CanonRaw_7_failed.jpg
+[File, System, Image] Directory - Directory: t
+[File, System, Image] FileSize - File Size: 12 kB
+[File, System, Time] FileModifyDate - File Modification Date/Time: 2011:06:22 14:05:14-04:00
+[File, System, Image] FilePermissions - File Permissions: rw-r--r--
+[File, File, Image] FileType - File Type: JPEG
+[File, File, Image] MIMEType - MIME Type: image/jpeg
+[File, File, Image] ExifByteOrder - Exif Byte Order: Little-endian (Intel, II)
+[File, File, Image] ImageWidth - Image Width: 8
+[File, File, Image] ImageHeight - Image Height: 8
+[File, File, Image] EncodingProcess - Encoding Process: Baseline DCT, Huffman coding
+[File, File, Image] BitsPerSample - Bits Per Sample: 8
+[File, File, Image] ColorComponents - Color Components: 3
+[File, File, Image] YCbCrSubSampling - Y Cb Cr Sub Sampling: YCbCr4:2:0 (2 2)
+[EXIF, IFD0, Camera] 271 - Make: Canon
+[EXIF, IFD0, Camera] 272 - Camera Model Name: Canon EOS 350D DIGITAL
+[EXIF, IFD0, Image] 274 - Orientation: Horizontal (normal)
+[EXIF, IFD0, Image] 282 - X Resolution: 72
+[EXIF, IFD0, Image] 283 - Y Resolution: 72
+[EXIF, IFD0, Image] 296 - Resolution Unit: inches
+[EXIF, IFD0, Time] 306 - Modify Date: 2005:08:03 18:59:18
+[EXIF, IFD0, Image] 531 - Y Cb Cr Positioning: Centered
+[EXIF, ExifIFD, Image] 33434 - Exposure Time: 1/15
+[EXIF, ExifIFD, Image] 33437 - F Number: 8.0
+[EXIF, ExifIFD, Camera] 34850 - Exposure Program: Aperture-priority AE
+[EXIF, ExifIFD, Image] 34855 - ISO: 400
+[EXIF, ExifIFD, Image] 36864 - Exif Version: 0221
+[EXIF, ExifIFD, Time] 36867 - Date/Time Original: 2005:08:03 18:59:18
+[EXIF, ExifIFD, Time] 36868 - Create Date: 2005:08:03 18:59:18
+[EXIF, ExifIFD, Image] 37121 - Components Configuration: Y, Cb, Cr, -
+[EXIF, ExifIFD, Image] 37377 - Shutter Speed Value: 1/15
+[EXIF, ExifIFD, Image] 37378 - Aperture Value: 8.0
+[EXIF, ExifIFD, Image] 37380 - Exposure Compensation: 0
+[EXIF, ExifIFD, Camera] 37383 - Metering Mode: Center-weighted average
+[EXIF, ExifIFD, Camera] 37386 - Focal Length: 55.0 mm
+[EXIF, ExifIFD, Image] 37510 - User Comment: 
+[EXIF, ExifIFD, Image] 40960 - Flashpix Version: 0100
+[EXIF, ExifIFD, Image] 40961 - Color Space: sRGB
+[EXIF, ExifIFD, Image] 40962 - Exif Image Width: 3456
+[EXIF, ExifIFD, Image] 40963 - Exif Image Height: 2304
+[EXIF, ExifIFD, Camera] 41486 - Focal Plane X Resolution: 3954.23341
+[EXIF, ExifIFD, Camera] 41487 - Focal Plane Y Resolution: 3958.762887
+[EXIF, ExifIFD, Camera] 41488 - Focal Plane Resolution Unit: inches
+[EXIF, ExifIFD, Image] 41985 - Custom Rendered: Normal
+[EXIF, ExifIFD, Camera] 41986 - Exposure Mode: Auto
+[EXIF, ExifIFD, Camera] 41987 - White Balance: Auto
+[EXIF, ExifIFD, Camera] 41990 - Scene Capture Type: Standard
+[EXIF, ExifIFD, Camera] 41992 - Contrast: Normal
+[EXIF, ExifIFD, Camera] 41993 - Saturation: Normal
+[EXIF, ExifIFD, Camera] 41994 - Sharpness: Normal
+[EXIF, ExifIFD, Image] 42032 - Owner Name: unknown
+[EXIF, ExifIFD, Image] 42033 - Serial Number: 0123456789
+[MakerNotes, Canon, Camera] 1 - Macro Mode: Normal
+[MakerNotes, Canon, Camera] 2 - Self Timer: Off
+[MakerNotes, Canon, Camera] 3 - Quality: RAW
+[MakerNotes, Canon, Camera] 4 - Canon Flash Mode: Off
+[MakerNotes, Canon, Camera] 5 - Continuous Drive: Single
+[MakerNotes, Canon, Camera] 7 - Focus Mode: One-shot AF
+[MakerNotes, Canon, Camera] 9 - Record Mode: CR2
+[MakerNotes, Canon, Camera] 10 - Canon Image Size: Unknown (-1)
+[MakerNotes, Canon, Camera] 11 - Easy Mode: Manual
+[MakerNotes, Canon, Camera] 12 - Digital Zoom: None
+[MakerNotes, Canon, Camera] 13 - Contrast: Normal
+[MakerNotes, Canon, Camera] 14 - Saturation: Normal
+[MakerNotes, Canon, Camera] 15 - Sharpness: 0
+[MakerNotes, Canon, Camera] 17 - Metering Mode: Center-weighted average
+[MakerNotes, Canon, Camera] 18 - Focus Range: Not Known
+[MakerNotes, Canon, Camera] 20 - Canon Exposure Mode: Aperture-priority AE
+[MakerNotes, Canon, Camera] 22 - Lens Type: Unknown (-1)
+[MakerNotes, Canon, Camera] 23 - Long Focal: 55 mm
+[MakerNotes, Canon, Camera] 24 - Short Focal: 18 mm
+[MakerNotes, Canon, Camera] 25 - Focal Units: 1/mm
+[MakerNotes, Canon, Camera] 26 - Max Aperture: 4
+[MakerNotes, Canon, Camera] 27 - Min Aperture: 27
+[MakerNotes, Canon, Camera] 28 - Flash Activity: 0
+[MakerNotes, Canon, Camera] 29 - Flash Bits: (none)
+[MakerNotes, Canon, Camera] 32 - Focus Continuous: Single
+[MakerNotes, Canon, Camera] 36 - Zoom Source Width: 0
+[MakerNotes, Canon, Camera] 37 - Zoom Target Width: 0
+[MakerNotes, Canon, Camera] 40 - Photo Effect: Off
+[MakerNotes, Canon, Camera] 41 - Manual Flash Output: n/a
+[MakerNotes, Canon, Camera] 42 - Color Tone: Normal
+[MakerNotes, Canon, Image] 0 - Focal Type: Zoom
+[MakerNotes, Canon, Image] 1 - Focal Length: 55 mm
+[MakerNotes, Canon, Image] 2 - Focal Plane X Size: 23.04 mm
+[MakerNotes, Canon, Image] 3 - Focal Plane Y Size: 15.37 mm
+[MakerNotes, Canon, Camera] 3 - Canon Flash Info: 100 0 0 0
+[MakerNotes, Canon, Image] 1 - Auto ISO: 100
+[MakerNotes, Canon, Image] 2 - Base ISO: 400
+[MakerNotes, Canon, Image] 3 - Measured EV: 8.00
+[MakerNotes, Canon, Image] 4 - Target Aperture: 8
+[MakerNotes, Canon, Image] 5 - Target Exposure Time: 1/15
+[MakerNotes, Canon, Image] 6 - Exposure Compensation: 0
+[MakerNotes, Canon, Image] 7 - White Balance: Auto
+[MakerNotes, Canon, Image] 8 - Slow Shutter: None
+[MakerNotes, Canon, Image] 9 - Shot Number In Continuous Burst: 0
+[MakerNotes, Canon, Camera] 10 - Optical Zoom Code: n/a
+[MakerNotes, Canon, Image] 13 - Flash Guide Number: 0
+[MakerNotes, Canon, Image] 15 - Flash Exposure Compensation: 0
+[MakerNotes, Canon, Image] 16 - Auto Exposure Bracketing: Off
+[MakerNotes, Canon, Image] 17 - AEB Bracket Value: 0
+[MakerNotes, Canon, Image] 18 - Control Mode: Camera Local Control
+[MakerNotes, Canon, Image] 21 - F Number: 8
+[MakerNotes, Canon, Image] 22 - Exposure Time: 1/16
+[MakerNotes, Canon, Image] 23 - Measured EV 2: 8.125
+[MakerNotes, Canon, Image] 24 - Bulb Duration: 0
+[MakerNotes, Canon, Camera] 26 - Camera Type: EOS Mid-range
+[MakerNotes, Canon, Image] 27 - Auto Rotate: None
+[MakerNotes, Canon, Image] 28 - ND Filter: n/a
+[MakerNotes, Canon, Image] 29 - Self Timer 2: 0
+[MakerNotes, Canon, Image] 6 - Canon Image Type: Canon EOS 350D DIGITAL
+[MakerNotes, Canon, Camera] 7 - Canon Firmware Version: Firmware 1.0.2
+[MakerNotes, Canon, Camera] 9 - Owner Name: unknown
+[MakerNotes, Canon, Camera] 12 - Serial Number: 0123456789
+[MakerNotes, CanonCustom, Camera] 0 - Set Button Cross Keys Func: Normal
+[MakerNotes, CanonCustom, Camera] 1 - Long Exposure Noise Reduction: Off
+[MakerNotes, CanonCustom, Camera] 2 - Flash Sync Speed Av: Auto
+[MakerNotes, CanonCustom, Camera] 3 - Shutter-AE Lock: AF/AE lock
+[MakerNotes, CanonCustom, Camera] 4 - AF Assist Beam: Emits
+[MakerNotes, CanonCustom, Camera] 5 - Exposure Level Increments: 1/3 Stop
+[MakerNotes, CanonCustom, Camera] 6 - Mirror Lockup: Disable
+[MakerNotes, CanonCustom, Camera] 7 - E-TTL II: Evaluative
+[MakerNotes, CanonCustom, Camera] 8 - Shutter Curtain Sync: 1st-curtain sync
+[MakerNotes, Canon, Camera] 16 - Canon Model ID: EOS Digital Rebel XT / 350D / Kiss Digital N
+[MakerNotes, Canon, Camera] 0 - Num AF Points: 7
+[MakerNotes, Canon, Camera] 1 - Valid AF Points: 7
+[MakerNotes, Canon, Image] 2 - Canon Image Width: 3456
+[MakerNotes, Canon, Image] 3 - Canon Image Height: 2304
+[MakerNotes, Canon, Camera] 4 - AF Image Width: 3456
+[MakerNotes, Canon, Camera] 5 - AF Image Height: 2304
+[MakerNotes, Canon, Camera] 6 - AF Area Width: 189
+[MakerNotes, Canon, Camera] 7 - AF Area Height: 188
+[MakerNotes, Canon, Camera] 8 - AF Area X Positions: 0 -1237 -742 0 742 1237 0
+[MakerNotes, Canon, Camera] 9 - AF Area Y Positions: -617 0 0 0 0 0 617
+[MakerNotes, Canon, Camera] 10 - AF Points In Focus: 3
+[MakerNotes, Canon, Camera] 19 - Thumbnail Image Valid Area: 0 159 7 112
+[MakerNotes, Canon, Camera] 21 - Serial Number Format: Format 2
+[MakerNotes, Canon, Camera] 25 - Canon 0x0019: 1
+[MakerNotes, Canon, Camera] 131 - Original Decision Data Offset: 0
+[MakerNotes, Canon, Image] 1 - File Number: 100-0024
+[MakerNotes, Canon, Image] 3 - Bracket Mode: Off
+[MakerNotes, Canon, Image] 4 - Bracket Value: 0
+[MakerNotes, Canon, Image] 5 - Bracket Shot Number: 0
+[MakerNotes, Canon, Image] 8 - Long Exposure Noise Reduction 2: Off
+[MakerNotes, Canon, Image] 9 - WB Bracket Mode: Off
+[MakerNotes, Canon, Image] 12 - WB Bracket Value AB: 0
+[MakerNotes, Canon, Image] 13 - WB Bracket Value GM: 0
+[MakerNotes, Canon, Image] 14 - Filter Effect: None
+[MakerNotes, Canon, Image] 15 - Toning Effect: None
+[MakerNotes, Canon, Image] 1 - Tone Curve: Standard
+[MakerNotes, Canon, Image] 3 - Sharpness Frequency: n/a
+[MakerNotes, Canon, Image] 4 - Sensor Red Level: 0
+[MakerNotes, Canon, Image] 5 - Sensor Blue Level: 0
+[MakerNotes, Canon, Image] 6 - White Balance Red: 0
+[MakerNotes, Canon, Image] 7 - White Balance Blue: 0
+[MakerNotes, Canon, Image] 9 - Color Temperature: 5200
+[MakerNotes, Canon, Image] 10 - Picture Style: None
+[MakerNotes, Canon, Image] 11 - Digital Gain: 0
+[MakerNotes, Canon, Image] 12 - WB Shift AB: 0
+[MakerNotes, Canon, Image] 13 - WB Shift GM: 0
+[MakerNotes, Canon, Camera] 1 - Measured RGGB: 580 1024 1024 500
+[MakerNotes, Canon, Camera] 208 - VRD Offset: 0
+[MakerNotes, Canon, Image] 1 - Sensor Width: 3516
+[MakerNotes, Canon, Image] 2 - Sensor Height: 2328
+[MakerNotes, Canon, Image] 5 - Sensor Left Border: 52
+[MakerNotes, Canon, Image] 6 - Sensor Top Border: 19
+[MakerNotes, Canon, Image] 7 - Sensor Right Border: 3507
+[MakerNotes, Canon, Image] 8 - Sensor Bottom Border: 2322
+[MakerNotes, Canon, Image] 9 - Black Mask Left Border: 0
+[MakerNotes, Canon, Image] 10 - Black Mask Top Border: 0
+[MakerNotes, Canon, Image] 11 - Black Mask Right Border: 0
+[MakerNotes, Canon, Image] 12 - Black Mask Bottom Border: 0
+[MakerNotes, Canon, Camera] 25 - WB RGGB Levels As Shot: 2002 1185 1187 2364
+[MakerNotes, Canon, Camera] 29 - Color Temp As Shot: 3064
+[MakerNotes, Canon, Camera] 30 - WB RGGB Levels Auto: 1720 1022 1024 2031
+[MakerNotes, Canon, Camera] 34 - Color Temp Auto: 3064
+[MakerNotes, Canon, Camera] 35 - WB RGGB Levels Daylight: 2312 1022 1024 1501
+[MakerNotes, Canon, Camera] 39 - Color Temp Daylight: 5200
+[MakerNotes, Canon, Camera] 40 - WB RGGB Levels Shade: 2714 1022 1024 1246
+[MakerNotes, Canon, Camera] 44 - Color Temp Shade: 7000
+[MakerNotes, Canon, Camera] 45 - WB RGGB Levels Cloudy: 2512 1022 1024 1355
+[MakerNotes, Canon, Camera] 49 - Color Temp Cloudy: 6000
+[MakerNotes, Canon, Camera] 50 - WB RGGB Levels Tungsten: 1523 1022 1024 2397
+[MakerNotes, Canon, Camera] 54 - Color Temp Tungsten: 3201
+[MakerNotes, Canon, Camera] 55 - WB RGGB Levels Fluorescent: 1944 1022 1024 2015
+[MakerNotes, Canon, Camera] 59 - Color Temp Fluorescent: 3905
+[MakerNotes, Canon, Camera] 60 - WB RGGB Levels Flash: 2606 1022 1024 1308
+[MakerNotes, Canon, Camera] 64 - Color Temp Flash: 6440
+[MakerNotes, Canon, Camera] 65 - WB RGGB Levels Custom 1: 2312 1022 1024 1501
+[MakerNotes, Canon, Camera] 69 - Color Temp Custom 1: 5200
+[MakerNotes, Canon, Camera] 70 - WB RGGB Levels Custom 2: 2312 1022 1024 1501
+[MakerNotes, Canon, Camera] 74 - Color Temp Custom 2: 5200
+[MakerNotes, Canon, Camera] 0 - Camera Color Calibration 01:  333 1013 -410 (11109K)
+[MakerNotes, Canon, Camera] 4 - Camera Color Calibration 02:  346  963 -376 (9523K)
+[MakerNotes, Canon, Camera] 8 - Camera Color Calibration 03:  364  897 -329 (8000K)
+[MakerNotes, Canon, Camera] 12 - Camera Color Calibration 04:  386  841 -284 (7000K)
+[MakerNotes, Canon, Camera] 16 - Camera Color Calibration 05:  417  773 -225 (6000K)
+[MakerNotes, Canon, Camera] 20 - Camera Color Calibration 06:  433  738 -194 (5600K)
+[MakerNotes, Canon, Camera] 24 - Camera Color Calibration 07:  453  698 -156 (5200K)
+[MakerNotes, Canon, Camera] 28 - Camera Color Calibration 08:  482  650 -108 (4749K)
+[MakerNotes, Canon, Camera] 32 - Camera Color Calibration 09:  518  600  -53 (4312K)
+[MakerNotes, Canon, Camera] 36 - Camera Color Calibration 10:  549  565  -10 (4023K)
+[MakerNotes, Canon, Camera] 40 - Camera Color Calibration 11:  596  516   51 (3696K)
+[MakerNotes, Canon, Camera] 44 - Camera Color Calibration 12:  677  443  151 (3250K)
+[MakerNotes, Canon, Camera] 48 - Camera Color Calibration 13:  720  415  196 (3051K)
+[MakerNotes, Canon, Camera] 52 - Camera Color Calibration 14:  770  382  248 (2871K)
+[MakerNotes, Canon, Camera] 56 - Camera Color Calibration 15:  949  307  397 (2413K)
+[MakerNotes, Canon, Camera] 16386 - CRW Param: (Binary data 5352 bytes)
+[MakerNotes, Canon, Camera] 2 - Color Tone: Normal
+[XMP, XMP-x, Document] xmptk - XMP Toolkit: Image::ExifTool 8.60
+[XMP, XMP-aux, Camera] Lens - Lens: 18.0 - 55.0 mm
+[XMP, XMP-exif, Image] ComponentsConfiguration - Components Configuration: -, -, -, -
+[XMP, XMP-exif, Camera] FlashFired - Flash Fired: False
+[XMP, XMP-exif, Camera] FlashFunction - Flash Function: False
+[XMP, XMP-exif, Camera] FlashMode - Flash Mode: Off
+[XMP, XMP-exif, Camera] FlashRedEyeMode - Flash Red Eye Mode: False
+[XMP, XMP-exif, Camera] FlashReturn - Flash Return: No return detection
+[XMP, XMP-tiff, Image] BitsPerSample - Bits Per Sample: 8, 8, 8
+[XMP, XMP-tiff, Image] Compression - Compression: JPEG (old-style)
+[XMP, XMP-tiff, Image] ImageLength - Image Height: 1024
+[XMP, XMP-tiff, Image] ImageWidth - Image Width: 1536
+[XMP, XMP-tiff, Image] PhotometricInterpretation - Photometric Interpretation: RGB
+[XMP, XMP-tiff, Image] PlanarConfiguration - Planar Configuration: Chunky
+[XMP, XMP-tiff, Image] SamplesPerPixel - Samples Per Pixel: 3
+[XMP, XMP-crs, Image] ToneCurve - Tone Curve: Standard
+[Composite, Composite, Image] Aperture - Aperture: 8.0
+[Composite, Composite, Camera] DriveMode - Drive Mode: Single-frame Shooting
+[Composite, Composite, Other] Flash - Flash: Off, Did not fire
+[Composite, Composite, Camera] ISO - ISO: 400
+[Composite, Composite, Camera] Lens - Lens: 18.0 - 55.0 mm
+[Composite, Composite, Camera] LensID - Lens ID: Unknown 18-55mm
+[Composite, Composite, Camera] ScaleFactor35efl - Scale Factor To 35 mm Equivalent: 1.6
+[Composite, Composite, Camera] ShootingMode - Shooting Mode: Aperture-priority AE
+[Composite, Composite, Image] ShutterSpeed - Shutter Speed: 1/15
+[Composite, Composite, Camera] WB_RGGBLevels - WB RGGB Levels: 2002 1185 1187 2364
+[Composite, Composite, Camera] BlueBalance - Blue Balance: 1.993255
+[Composite, Composite, Camera] CircleOfConfusion - Circle Of Confusion: 0.019 mm
+[Composite, Composite, Image] FOV - Field Of View: 23.7 deg
+[Composite, Composite, Camera] FocalLength35efl - Focal Length: 55.0 mm (35 mm equivalent: 85.9 mm)
+[Composite, Composite, Camera] HyperfocalDistance - Hyperfocal Distance: 19.66 m
+[Composite, Composite, Image] ImageSize - Image Size: 8x8
+[Composite, Composite, Camera] Lens35efl - Lens: 18.0 - 55.0 mm (35 mm equivalent: 28.1 - 85.9 mm)
+[Composite, Composite, Image] LightValue - Light Value: 7.9
+[Composite, Composite, Camera] RedBalance - Red Balance: 1.688027