third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated test results, renamed Nikon3Preview group to NikonPreview.

Browse Source
This commit is contained in:
Andreas Huggel
2008-08-03 06:26:14 +00:00
parent cd5508f16c
commit cbb52db524
9 changed files with 98 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/data/bugfixes-test.out
+1
View File
@@ -208,6 +208,7 @@ Set Exif.Photo.UserComment "A comment" (Comment)
Exif.Image.ExifTag Long 1 26
Exif.Photo.UserComment Undefined 17 A comment
------> Bug 447 <-------
Error: Directory NikonPreview with 8224 entries considered invalid; not read.
Warning: Directory Photo, entry 0x9286 has unknown Exif (TIFF) type 14; setting type size 1.
Iptc.Application2.Caption String 0
Iptc.Application2.DateCreated Date 8 2005-08-09
test/data/exifdata-test.out
+37 -9
View File
@@ -711,6 +711,13 @@ Exif.Nikon3.WhiteBalanceBias 0x000b Makernote SShort 1
Exif.Nikon3.ProgramShift 0x000d Makernote Undefined 4 0 1 6 0
Exif.Nikon3.ExposureDiff 0x000e Makernote Undefined 4 0 1 12 0
Exif.Nikon3.Preview 0x0011 Makernote Long 1 1430
Exif.NikonPreview.Compression 0x0103 Makernote Short 1 6
Exif.NikonPreview.XResolution 0x011a Makernote Rational 1 300/1
Exif.NikonPreview.YResolution 0x011b Makernote Rational 1 300/1
Exif.NikonPreview.ResolutionUnit 0x0128 Makernote Short 1 2
Exif.NikonPreview.JPEGInterchangeFormat 0x0201 Makernote Long 1 1538
Exif.NikonPreview.JPEGInterchangeFormatLength 0x0202 Makernote Long 1 27773
Exif.NikonPreview.YCbCrPositioning 0x0213 Makernote Short 1 2
Exif.Nikon3.FlashComp 0x0012 Makernote Undefined 4 0 1 6 0
Exif.Nikon3.ISOSettings 0x0013 Makernote Short 2 0 200
Exif.Nikon3.ImageBoundary 0x0016 Makernote Short 4 0 0 3008 2000
@@ -815,7 +822,14 @@ Exif.Nikon3.FlashDevice 0x0009 Makernote Ascii 13
Exif.Nikon3.WhiteBalanceBias 0x000b Makernote SShort 1 0
Exif.Nikon3.ProgramShift 0x000d Makernote Undefined 4 0 1 6 0
Exif.Nikon3.ExposureDiff 0x000e Makernote Undefined 4 0 1 12 0
Exif.Nikon3.Preview 0x0011 Makernote Long 1 1430
Exif.Nikon3.Preview 0x0011 Makernote Long 1 1414
Exif.NikonPreview.Compression 0x0103 Makernote Short 1 6
Exif.NikonPreview.XResolution 0x011a Makernote Rational 1 300/1
Exif.NikonPreview.YResolution 0x011b Makernote Rational 1 300/1
Exif.NikonPreview.ResolutionUnit 0x0128 Makernote Short 1 2
Exif.NikonPreview.JPEGInterchangeFormat 0x0201 Makernote Long 1 1520
Exif.NikonPreview.JPEGInterchangeFormatLength 0x0202 Makernote Long 1 27773
Exif.NikonPreview.YCbCrPositioning 0x0213 Makernote Short 1 2
Exif.Nikon3.FlashComp 0x0012 Makernote Undefined 4 0 1 6 0
Exif.Nikon3.ISOSettings 0x0013 Makernote Short 2 0 200
Exif.Nikon3.ImageBoundary 0x0016 Makernote Short 4 0 0 3008 2000
@@ -854,7 +868,7 @@ Exif.Photo.FlashpixVersion 0xa000 Exif Undefined 4
Exif.Photo.ColorSpace 0xa001 Exif Short 1 65535
Exif.Photo.PixelXDimension 0xa002 Exif Short 1 3008
Exif.Photo.PixelYDimension 0xa003 Exif Short 1 2000
Exif.Photo.InteroperabilityTag 0xa005 Exif Long 1 2438
Exif.Photo.InteroperabilityTag 0xa005 Exif Long 1 30318
Exif.Iop.InteroperabilityIndex 0x0001 Iop Ascii 5 1234
Exif.Iop.InteroperabilityVersion 0x0002 Iop Undefined 4 48 49 48 48
Exif.Photo.SensingMethod 0xa217 Exif Short 1 2
@@ -878,7 +892,7 @@ Exif.Thumbnail.Orientation 0x0112 IFD1 Short 5
Exif.Thumbnail.XResolution 0x011a IFD1 Rational 1 300/1
Exif.Thumbnail.YResolution 0x011b IFD1 Rational 1 300/1
Exif.Thumbnail.ResolutionUnit 0x0128 IFD1 Short 1 2
Exif.Thumbnail.JPEGInterchangeFormat 0x0201 IFD1 Long 1 2602
Exif.Thumbnail.JPEGInterchangeFormat 0x0201 IFD1 Long 1 30482
Exif.Thumbnail.JPEGInterchangeFormatLength 0x0202 IFD1 Long 1 8930
Exif.Thumbnail.YCbCrPositioning 0x0213 IFD1 Short 1 2
----------------------------------------------
@@ -921,7 +935,14 @@ Exif.Nikon3.FlashDevice 0x0009 Makernote Ascii 13
Exif.Nikon3.WhiteBalanceBias 0x000b Makernote SShort 1 0
Exif.Nikon3.ProgramShift 0x000d Makernote Undefined 4 0 1 6 0
Exif.Nikon3.ExposureDiff 0x000e Makernote Undefined 4 0 1 12 0
Exif.Nikon3.Preview 0x0011 Makernote Long 1 1430
Exif.Nikon3.Preview 0x0011 Makernote Long 1 1414
Exif.NikonPreview.Compression 0x0103 Makernote Short 1 6
Exif.NikonPreview.XResolution 0x011a Makernote Rational 1 300/1
Exif.NikonPreview.YResolution 0x011b Makernote Rational 1 300/1
Exif.NikonPreview.ResolutionUnit 0x0128 Makernote Short 1 2
Exif.NikonPreview.JPEGInterchangeFormat 0x0201 Makernote Long 1 1520
Exif.NikonPreview.JPEGInterchangeFormatLength 0x0202 Makernote Long 1 27773
Exif.NikonPreview.YCbCrPositioning 0x0213 Makernote Short 1 2
Exif.Nikon3.FlashComp 0x0012 Makernote Undefined 4 0 1 6 0
Exif.Nikon3.ISOSettings 0x0013 Makernote Short 2 0 200
Exif.Nikon3.ImageBoundary 0x0016 Makernote Short 4 0 0 3008 2000
@@ -960,7 +981,7 @@ Exif.Photo.FlashpixVersion 0xa000 Exif Undefined 4
Exif.Photo.ColorSpace 0xa001 Exif Short 1 65535
Exif.Photo.PixelXDimension 0xa002 Exif Short 1 3008
Exif.Photo.PixelYDimension 0xa003 Exif Short 1 2000
Exif.Photo.InteroperabilityTag 0xa005 Exif Long 1 2438
Exif.Photo.InteroperabilityTag 0xa005 Exif Long 1 30318
Exif.Iop.InteroperabilityIndex 0x0001 Iop Ascii 4 123
Exif.Iop.InteroperabilityVersion 0x0002 Iop Undefined 4 48 49 48 48
Exif.Photo.SensingMethod 0xa217 Exif Short 1 2
@@ -984,7 +1005,7 @@ Exif.Thumbnail.Orientation 0x0112 IFD1 Short 1
Exif.Thumbnail.XResolution 0x011a IFD1 Rational 1 300/1
Exif.Thumbnail.YResolution 0x011b IFD1 Rational 1 300/1
Exif.Thumbnail.ResolutionUnit 0x0128 IFD1 Short 1 2
Exif.Thumbnail.JPEGInterchangeFormat 0x0201 IFD1 Long 1 2602
Exif.Thumbnail.JPEGInterchangeFormat 0x0201 IFD1 Long 1 30482
Exif.Thumbnail.JPEGInterchangeFormatLength 0x0202 IFD1 Long 1 8930
Exif.Thumbnail.YCbCrPositioning 0x0213 IFD1 Short 1 2
----------------------------------------------
@@ -1027,7 +1048,14 @@ Exif.Nikon3.FlashDevice 0x0009 Makernote Ascii 13
Exif.Nikon3.WhiteBalanceBias 0x000b Makernote SShort 1 0
Exif.Nikon3.ProgramShift 0x000d Makernote Undefined 4 0 1 6 0
Exif.Nikon3.ExposureDiff 0x000e Makernote Undefined 4 0 1 12 0
Exif.Nikon3.Preview 0x0011 Makernote Long 1 1430
Exif.Nikon3.Preview 0x0011 Makernote Long 1 1414
Exif.NikonPreview.Compression 0x0103 Makernote Short 1 6
Exif.NikonPreview.XResolution 0x011a Makernote Rational 1 300/1
Exif.NikonPreview.YResolution 0x011b Makernote Rational 1 300/1
Exif.NikonPreview.ResolutionUnit 0x0128 Makernote Short 1 2
Exif.NikonPreview.JPEGInterchangeFormat 0x0201 Makernote Long 1 1520
Exif.NikonPreview.JPEGInterchangeFormatLength 0x0202 Makernote Long 1 27773
Exif.NikonPreview.YCbCrPositioning 0x0213 Makernote Short 1 2
Exif.Nikon3.FlashComp 0x0012 Makernote Undefined 4 0 1 6 0
Exif.Nikon3.ISOSettings 0x0013 Makernote Short 2 0 200
Exif.Nikon3.ImageBoundary 0x0016 Makernote Short 4 0 0 3008 2000
@@ -1066,7 +1094,7 @@ Exif.Photo.FlashpixVersion 0xa000 Exif Undefined 4
Exif.Photo.ColorSpace 0xa001 Exif Short 1 65535
Exif.Photo.PixelXDimension 0xa002 Exif Short 1 3008
Exif.Photo.PixelYDimension 0xa003 Exif Short 1 2000
Exif.Photo.InteroperabilityTag 0xa005 Exif Long 1 2426
Exif.Photo.InteroperabilityTag 0xa005 Exif Long 1 30306
Exif.Iop.InteroperabilityIndex 0x0001 Iop Ascii 4 123
Exif.Iop.InteroperabilityVersion 0x0002 Iop Undefined 4 48 49 48 48
Exif.Photo.SensingMethod 0xa217 Exif Short 1 2
@@ -1090,6 +1118,6 @@ Exif.Thumbnail.Orientation 0x0112 IFD1 Short 1
Exif.Thumbnail.XResolution 0x011a IFD1 Rational 1 300/1
Exif.Thumbnail.YResolution 0x011b IFD1 Rational 1 300/1
Exif.Thumbnail.ResolutionUnit 0x0128 IFD1 Short 1 2
Exif.Thumbnail.JPEGInterchangeFormat 0x0201 IFD1 Long 1 2574
Exif.Thumbnail.JPEGInterchangeFormat 0x0201 IFD1 Long 1 30454
Exif.Thumbnail.JPEGInterchangeFormatLength 0x0202 IFD1 Long 1 8930
Exif.Thumbnail.YCbCrPositioning 0x0213 IFD1 Short 1 2
test/data/exiv2-test.out
+43 -8
View File
@@ -815,6 +815,13 @@ File 4/15: 20040329_224245.jpg
20040329_224245.jpg Exif.Nikon3.ProgramShift Undefined 4 0 1 6 0
20040329_224245.jpg Exif.Nikon3.ExposureDiff Undefined 4 0 1 12 0
20040329_224245.jpg Exif.Nikon3.Preview Long 1 1430
20040329_224245.jpg Exif.NikonPreview.Compression Short 1 JPEG (old-style)
20040329_224245.jpg Exif.NikonPreview.XResolution Rational 1 300
20040329_224245.jpg Exif.NikonPreview.YResolution Rational 1 300
20040329_224245.jpg Exif.NikonPreview.ResolutionUnit Short 1 inch
20040329_224245.jpg Exif.NikonPreview.JPEGInterchangeFormat Long 1 1538
20040329_224245.jpg Exif.NikonPreview.JPEGInterchangeFormatLength Long 1 27773
20040329_224245.jpg Exif.NikonPreview.YCbCrPositioning Short 1 Co-sited
20040329_224245.jpg Exif.Nikon3.FlashComp Undefined 4 0.0 EV
20040329_224245.jpg Exif.Nikon3.ISOSettings Short 2 200
20040329_224245.jpg Exif.Nikon3.ImageBoundary Short 4 0 0 3008 2000
@@ -2066,7 +2073,7 @@ Writing thumbnail (image/jpeg, 6137 Bytes) to file ./20060127_225027-thumb.jpg
exiv2-empty.exv: No Exif data found in the file
Compare image data and extracted data ------------------------------------
1,1404c1,1404
1,1411c1,1411
< File 1/15: exiv2-empty.jpg
< File 2/15: 20031214_000043.jpg
< 20031214_000043.jpg Exif.Image.Make Ascii 6 Canon
@@ -2292,6 +2299,13 @@ Compare image data and extracted data ------------------------------------
< 20040329_224245.jpg Exif.Nikon3.ProgramShift Undefined 4 0 1 6 0
< 20040329_224245.jpg Exif.Nikon3.ExposureDiff Undefined 4 0 1 12 0
< 20040329_224245.jpg Exif.Nikon3.Preview Long 1 1430
< 20040329_224245.jpg Exif.NikonPreview.Compression Short 1 JPEG (old-style)
< 20040329_224245.jpg Exif.NikonPreview.XResolution Rational 1 300
< 20040329_224245.jpg Exif.NikonPreview.YResolution Rational 1 300
< 20040329_224245.jpg Exif.NikonPreview.ResolutionUnit Short 1 inch
< 20040329_224245.jpg Exif.NikonPreview.JPEGInterchangeFormat Long 1 1538
< 20040329_224245.jpg Exif.NikonPreview.JPEGInterchangeFormatLength Long 1 27773
< 20040329_224245.jpg Exif.NikonPreview.YCbCrPositioning Short 1 Co-sited
< 20040329_224245.jpg Exif.Nikon3.FlashComp Undefined 4 0.0 EV
< 20040329_224245.jpg Exif.Nikon3.ISOSettings Short 2 200
< 20040329_224245.jpg Exif.Nikon3.ImageBoundary Short 4 0 0 3008 2000
@@ -3696,7 +3710,14 @@ Compare image data and extracted data ------------------------------------
> 20040329_224245.exv Exif.Nikon3.WhiteBalanceBias SShort 1 0
> 20040329_224245.exv Exif.Nikon3.ProgramShift Undefined 4 0 1 6 0
> 20040329_224245.exv Exif.Nikon3.ExposureDiff Undefined 4 0 1 12 0
> 20040329_224245.exv Exif.Nikon3.Preview Long 1 1430
> 20040329_224245.exv Exif.Nikon3.Preview Long 1 1414
> 20040329_224245.exv Exif.NikonPreview.Compression Short 1 JPEG (old-style)
> 20040329_224245.exv Exif.NikonPreview.XResolution Rational 1 300
> 20040329_224245.exv Exif.NikonPreview.YResolution Rational 1 300
> 20040329_224245.exv Exif.NikonPreview.ResolutionUnit Short 1 inch
> 20040329_224245.exv Exif.NikonPreview.JPEGInterchangeFormat Long 1 1520
> 20040329_224245.exv Exif.NikonPreview.JPEGInterchangeFormatLength Long 1 27773
> 20040329_224245.exv Exif.NikonPreview.YCbCrPositioning Short 1 Co-sited
> 20040329_224245.exv Exif.Nikon3.FlashComp Undefined 4 0.0 EV
> 20040329_224245.exv Exif.Nikon3.ISOSettings Short 2 200
> 20040329_224245.exv Exif.Nikon3.ImageBoundary Short 4 0 0 3008 2000
@@ -3735,7 +3756,7 @@ Compare image data and extracted data ------------------------------------
> 20040329_224245.exv Exif.Photo.ColorSpace Short 1 Uncalibrated
> 20040329_224245.exv Exif.Photo.PixelXDimension Short 1 3008
> 20040329_224245.exv Exif.Photo.PixelYDimension Short 1 2000
> 20040329_224245.exv Exif.Photo.InteroperabilityTag Long 1 2398
> 20040329_224245.exv Exif.Photo.InteroperabilityTag Long 1 30278
> 20040329_224245.exv Exif.Iop.InteroperabilityIndex Ascii 4 R03
> 20040329_224245.exv Exif.Iop.InteroperabilityVersion Undefined 4 1.00
> 20040329_224245.exv Exif.Photo.SensingMethod Short 1 One-chip color area
@@ -3758,7 +3779,7 @@ Compare image data and extracted data ------------------------------------
> 20040329_224245.exv Exif.Thumbnail.XResolution Rational 1 300
> 20040329_224245.exv Exif.Thumbnail.YResolution Rational 1 300
> 20040329_224245.exv Exif.Thumbnail.ResolutionUnit Short 1 inch
> 20040329_224245.exv Exif.Thumbnail.JPEGInterchangeFormat Long 1 2534
> 20040329_224245.exv Exif.Thumbnail.JPEGInterchangeFormat Long 1 30414
> 20040329_224245.exv Exif.Thumbnail.JPEGInterchangeFormatLength Long 1 8930
> 20040329_224245.exv Exif.Thumbnail.YCbCrPositioning Short 1 Co-sited
> File 5/15: 20010405_235039.exv
@@ -5096,7 +5117,7 @@ Writing Exif data from ./20060127_225027.exv to 20060127_225027.jpg
exiv2-empty.exv: No Exif data found in the file
Compare original and inserted image data ---------------------------------
1,1404c1,1404
1,1411c1,1411
< File 1/15: exiv2-empty.jpg
< File 2/15: 20031214_000043.jpg
< 20031214_000043.jpg Exif.Image.Make Ascii 6 Canon
@@ -5322,6 +5343,13 @@ Compare original and inserted image data ---------------------------------
< 20040329_224245.jpg Exif.Nikon3.ProgramShift Undefined 4 0 1 6 0
< 20040329_224245.jpg Exif.Nikon3.ExposureDiff Undefined 4 0 1 12 0
< 20040329_224245.jpg Exif.Nikon3.Preview Long 1 1430
< 20040329_224245.jpg Exif.NikonPreview.Compression Short 1 JPEG (old-style)
< 20040329_224245.jpg Exif.NikonPreview.XResolution Rational 1 300
< 20040329_224245.jpg Exif.NikonPreview.YResolution Rational 1 300
< 20040329_224245.jpg Exif.NikonPreview.ResolutionUnit Short 1 inch
< 20040329_224245.jpg Exif.NikonPreview.JPEGInterchangeFormat Long 1 1538
< 20040329_224245.jpg Exif.NikonPreview.JPEGInterchangeFormatLength Long 1 27773
< 20040329_224245.jpg Exif.NikonPreview.YCbCrPositioning Short 1 Co-sited
< 20040329_224245.jpg Exif.Nikon3.FlashComp Undefined 4 0.0 EV
< 20040329_224245.jpg Exif.Nikon3.ISOSettings Short 2 200
< 20040329_224245.jpg Exif.Nikon3.ImageBoundary Short 4 0 0 3008 2000
@@ -6726,7 +6754,14 @@ Compare original and inserted image data ---------------------------------
> 20040329_224245.exv Exif.Nikon3.WhiteBalanceBias SShort 1 0
> 20040329_224245.exv Exif.Nikon3.ProgramShift Undefined 4 0 1 6 0
> 20040329_224245.exv Exif.Nikon3.ExposureDiff Undefined 4 0 1 12 0
> 20040329_224245.exv Exif.Nikon3.Preview Long 1 1430
> 20040329_224245.exv Exif.Nikon3.Preview Long 1 1414
> 20040329_224245.exv Exif.NikonPreview.Compression Short 1 JPEG (old-style)
> 20040329_224245.exv Exif.NikonPreview.XResolution Rational 1 300
> 20040329_224245.exv Exif.NikonPreview.YResolution Rational 1 300
> 20040329_224245.exv Exif.NikonPreview.ResolutionUnit Short 1 inch
> 20040329_224245.exv Exif.NikonPreview.JPEGInterchangeFormat Long 1 1520
> 20040329_224245.exv Exif.NikonPreview.JPEGInterchangeFormatLength Long 1 27773
> 20040329_224245.exv Exif.NikonPreview.YCbCrPositioning Short 1 Co-sited
> 20040329_224245.exv Exif.Nikon3.FlashComp Undefined 4 0.0 EV
> 20040329_224245.exv Exif.Nikon3.ISOSettings Short 2 200
> 20040329_224245.exv Exif.Nikon3.ImageBoundary Short 4 0 0 3008 2000
@@ -6765,7 +6800,7 @@ Compare original and inserted image data ---------------------------------
> 20040329_224245.exv Exif.Photo.ColorSpace Short 1 Uncalibrated
> 20040329_224245.exv Exif.Photo.PixelXDimension Short 1 3008
> 20040329_224245.exv Exif.Photo.PixelYDimension Short 1 2000
> 20040329_224245.exv Exif.Photo.InteroperabilityTag Long 1 2398
> 20040329_224245.exv Exif.Photo.InteroperabilityTag Long 1 30278
> 20040329_224245.exv Exif.Iop.InteroperabilityIndex Ascii 4 R03
> 20040329_224245.exv Exif.Iop.InteroperabilityVersion Undefined 4 1.00
> 20040329_224245.exv Exif.Photo.SensingMethod Short 1 One-chip color area
@@ -6788,7 +6823,7 @@ Compare original and inserted image data ---------------------------------
> 20040329_224245.exv Exif.Thumbnail.XResolution Rational 1 300
> 20040329_224245.exv Exif.Thumbnail.YResolution Rational 1 300
> 20040329_224245.exv Exif.Thumbnail.ResolutionUnit Short 1 inch
> 20040329_224245.exv Exif.Thumbnail.JPEGInterchangeFormat Long 1 2534
> 20040329_224245.exv Exif.Thumbnail.JPEGInterchangeFormat Long 1 30414
> 20040329_224245.exv Exif.Thumbnail.JPEGInterchangeFormatLength Long 1 8930
> 20040329_224245.exv Exif.Thumbnail.YCbCrPositioning Short 1 Co-sited
> File 5/15: 20010405_235039.exv
test/data/write-test.out
+8 -4
View File
@@ -218,11 +218,15 @@ Case 11: Intrusive change to the Nikon3 makernote metadata
< Exif.Nikon3.Quality 0x0004 Ascii 8 FINE
---
> Exif.Nikon3.Quality 0x0004 Ascii 23 Typical Nikon3 Quality
78c78
44c44
< Exif.NikonPreview.JPEGInterchangeFormat 0x0201 Long 1 1538
---
> Exif.NikonPreview.JPEGInterchangeFormat 0x0201 Long 1 1536
85c85
< Exif.Photo.InteroperabilityTag 0xa005 Long 1 30306
---
> Exif.Photo.InteroperabilityTag 0xa005 Long 1 2414
101c101
> Exif.Photo.InteroperabilityTag 0xa005 Long 1 30294
108c108
< Exif.Thumbnail.JPEGInterchangeFormat 0x0201 Long 1 30444
---
> Exif.Thumbnail.JPEGInterchangeFormat 0x0201 Long 1 2550
> Exif.Thumbnail.JPEGInterchangeFormat 0x0201 Long 1 30430