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

Fix regressionTests with modified reference files. cp test/tmp/* test/data/test_reference_files/

Browse Source
This commit is contained in:
Robin Mills
2022-02-15 16:51:49 +00:00
parent 72b1e2249e
commit 2f135f7e4b
45 changed files with 1121 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/data/test_reference_files/CanonEF100mmF2.8LMacroISUSM.exv.out
+13 -6
View File
File diff suppressed because one or more lines are too long
test/data/test_reference_files/Canon_Sigma_18_35_F18_DC_HSM_firmware_1xx.exv.out
+29 -12
View File
File diff suppressed because one or more lines are too long
test/data/test_reference_files/Canon_Sigma_18_35_F18_DC_HSM_firmware_2xx.exv.out
+29 -12
View File
File diff suppressed because one or more lines are too long
test/data/test_reference_files/IMG_0246.exv.out
+11 -3
View File
@@ -52,36 +52,44 @@ Exif.CanonCs.MinAperture Short 1 203 F9
Exif.CanonCs.FlashActivity Short 1 65535 (65535)
Exif.CanonCs.FlashDetails Short 1 0
Exif.CanonCs.FocusContinuous Short 1 1 Continuous
Exif.CanonCs.AESetting Short 1 65535 (65535)
Exif.CanonCs.AESetting Short 1 65535 n/a
Exif.CanonCs.ImageStabilization Short 1 65535 (65535)
Exif.CanonCs.DisplayAperture Short 1 0 0
Exif.CanonCs.ZoomSourceWidth Short 1 5152 5152
Exif.CanonCs.ZoomTargetWidth Short 1 5152 5152
Exif.CanonCs.SpotMeteringMode Short 1 0 Center
Exif.CanonCs.PhotoEffect Short 1 65535 (65535)
Exif.CanonCs.PhotoEffect Short 1 65535 n/a
Exif.CanonCs.ManualFlashOutput Short 1 0 n/a
Exif.CanonCs.ColorTone Short 1 32767 32767
Exif.CanonCs.SRAWQuality Short 1 65535 (65535)
Exif.Canon.CanonFlashInfo Short 4 0 0 0 0 0 0 0 0
Exif.CanonSi.AutoISO Short 1 65533 1.84093e+21
Exif.CanonSi.ISOSpeed Short 1 192 200
Exif.CanonSi.MeasuredEV Short 1 123 8.84
Exif.CanonSi.TargetAperture Short 1 107 F3.2
Exif.CanonSi.TargetShutterSpeed Short 1 202 1/79 s
Exif.CanonSi.ExposureCompensation Short 1 0 0
Exif.CanonSi.WhiteBalance Short 1 0 Auto
Exif.CanonSi.SlowShutter Short 1 0 Off
Exif.CanonSi.Sequence Short 1 0 0
Exif.CanonSi.OpticalZoomCode Short 1 0 0
Exif.CanonSi.CameraTemperature Short 1 0 --
Exif.CanonSi.FlashGuideNumber Short 1 0 0
Exif.CanonSi.AFPointUsed Short 1 0 0 focus points; none used
Exif.CanonSi.FlashBias Short 1 0 0 EV
Exif.CanonSi.AutoExposureBracketing Short 1 0 Off
Exif.CanonSi.AEBBracketValue Short 1 0 0
Exif.CanonSi.ControlMode Short 1 1 1
Exif.CanonSi.SubjectDistance Short 1 107 1.07 m
Exif.CanonSi.ApertureValue Short 1 109 F3.3
Exif.CanonSi.ShutterSpeedValue Short 1 201 1/78 s
Exif.CanonSi.MeasuredEV2 Short 1 0 -6.00
Exif.CanonSi.BulbDuration Short 1 0 0
Exif.CanonSi.CameraType Short 1 250 Compact
Exif.CanonSi.AutoRotate Short 1 0 0
Exif.CanonSi.AutoRotate Short 1 0 None
Exif.CanonSi.NDFilter Short 1 0 Off
Exif.CanonSi.SelfTimer2 Short 1 0 Selftimer 2s
Exif.CanonSi.FlashOutput Short 1 0 0
Exif.Canon.ImageType Ascii 19 IMG:IXUS 185 JPEG IMG:IXUS 185 JPEG
Exif.Canon.FirmwareVersion Ascii 22 Firmware Version 1.00 Firmware Version 1.00
Exif.Canon.FileNumber Long 1 1200246 120-0246
test/data/test_reference_files/Sigma_14-24mm_F2.8_DG_HSM_A_for_EOS.exv.out
+47 -11
View File
File diff suppressed because one or more lines are too long
test/data/test_reference_files/Sigma_28mm_F1.4_DG_HSM_A_for_EOS.exv.out
+47 -11
View File
File diff suppressed because one or more lines are too long
test/data/test_reference_files/Sigma_35mm_F1.4_DG_HSM_A_for_EOS.exv.out
+48 -11
View File
File diff suppressed because one or more lines are too long
test/data/test_reference_files/Sigma_40mm_F1.4_DG_HSM_A_for_EOS.exv.out
+47 -11
View File
File diff suppressed because one or more lines are too long
test/data/test_reference_files/Sigma_50mm_F1.4_DG_HSM_A_for_EOS.exv.out
+48 -11
View File
File diff suppressed because one or more lines are too long
test/data/test_reference_files/Sigma_60-600mm_F4.5-6.3_DG_OS_HSM_S_for_EOS.exv.out
+47 -11
View File
File diff suppressed because one or more lines are too long
test/data/test_reference_files/TamronSP15-30mmF2.8DiVCUSDA012.exv.out
+29 -11
View File
File diff suppressed because one or more lines are too long
test/data/test_reference_files/TamronSP90mmF2.8DiVCUSDMacroF004.exv.out
+15 -6
View File
@@ -49,37 +49,45 @@ Exif.CanonCs.MinAperture Short 1 320 F32
Exif.CanonCs.FlashActivity Short 1 0 Did not fire
Exif.CanonCs.FlashDetails Short 1 8 E-TTL
Exif.CanonCs.FocusContinuous Short 1 65535 (65535)
Exif.CanonCs.AESetting Short 1 65535 (65535)
Exif.CanonCs.AESetting Short 1 65535 n/a
Exif.CanonCs.ImageStabilization Short 1 65535 (65535)
Exif.CanonCs.DisplayAperture Short 1 0 0
Exif.CanonCs.ZoomSourceWidth Short 1 0 0
Exif.CanonCs.ZoomTargetWidth Short 1 0 0
Exif.CanonCs.SpotMeteringMode Short 1 65535 (65535)
Exif.CanonCs.PhotoEffect Short 1 65535 (65535)
Exif.CanonCs.SpotMeteringMode Short 1 65535 n/a
Exif.CanonCs.PhotoEffect Short 1 65535 n/a
Exif.CanonCs.ManualFlashOutput Short 1 0 n/a
Exif.CanonCs.ColorTone Short 1 0 0
Exif.CanonCs.SRAWQuality Short 1 65535 (65535)
Exif.Canon.FocalLength Short 4 0 90 11353 50055 90.0 mm
Exif.Canon.CanonFlashInfo Short 4 0 0 0 0 0 0 0 0
Exif.CanonSi.AutoISO Short 1 0 100
Exif.CanonSi.ISOSpeed Short 1 192 200
Exif.CanonSi.MeasuredEV Short 1 184 10.75
Exif.CanonSi.TargetAperture Short 1 192 F8
Exif.CanonSi.TargetShutterSpeed Short 1 160 1/32 s
Exif.CanonSi.ExposureCompensation Short 1 20 20
Exif.CanonSi.WhiteBalance Short 1 9 Manual Temperature (Kelvin)
Exif.CanonSi.SlowShutter Short 1 3 None
Exif.CanonSi.Sequence Short 1 0 0
Exif.CanonSi.OpticalZoomCode Short 1 8 8
Exif.CanonSi.CameraTemperature Short 1 160 32 °C
Exif.CanonSi.FlashGuideNumber Short 1 0 0
Exif.CanonSi.AFPointUsed Short 1 0 0 focus points; none used
Exif.CanonSi.FlashBias Short 1 0 0 EV
Exif.CanonSi.AutoExposureBracketing Short 1 0 Off
Exif.CanonSi.AEBBracketValue Short 1 0 0
Exif.CanonSi.ControlMode Short 1 1 1
Exif.CanonSi.SubjectDistance Short 1 0 0 m
Exif.CanonSi.ApertureValue Short 1 192 F8
Exif.CanonSi.ShutterSpeedValue Short 1 164 1/35 s
Exif.CanonSi.MeasuredEV2 Short 1 136 11.00
Exif.CanonSi.BulbDuration Short 1 0 0
Exif.CanonSi.CameraType Short 1 248 EOS High-end
Exif.CanonSi.AutoRotate Short 1 65535 65535
Exif.CanonSi.AutoRotate Short 1 65535 (65535)
Exif.CanonSi.NDFilter Short 1 65535 n/a
Exif.CanonSi.SelfTimer2 Short 1 65535 n/a
Exif.CanonSi.FlashOutput Short 1 0 0
Exif.Canon.ImageType Ascii 23 Canon EOS-1Ds Mark III Canon EOS-1Ds Mark III
Exif.Canon.FirmwareVersion Ascii 24 Firmware Version 1.2.0 Firmware Version 1.2.0
Exif.Canon.OwnerName Ascii 32
@@ -109,7 +117,7 @@ Exif.CanonFi.FileNumber Long 1 0 (0)
Exif.CanonFi.BracketMode SShort 1 0 Off
Exif.CanonFi.BracketValue SShort 1 0 0
Exif.CanonFi.BracketShotNumber SShort 1 0 0
Exif.CanonFi.RawJpgQuality SShort 1 0 (0)
Exif.CanonFi.RawJpgQuality SShort 1 0 unkown
Exif.CanonFi.RawJpgSize SShort 1 0 Large
Exif.CanonFi.NoiseReduction SShort 1 0 Off
Exif.CanonFi.WBBracketMode SShort 1 0 Off
@@ -146,7 +154,8 @@ Exif.Canon.SensorInfo Short 17 34 5712 3774 1 1 72
Exif.Canon.ColorData Short 702 4 853 1024 1024 333 577 1024 1024 492 375 1024 1024 784 850 1010 1010 339 657 1146 1146 571 431 1152 1150 923 0 65534 255 258 252 0 1874 4348 4337 2723 897 215 216 14 98 885 881 1868 1778 3390 3388 496 2317 5161 5142 3321 1102 270 270 19 114 979 973 2257 2158 4033 4024 592 1512 1117 1117 2785 3000 2050 1122 1122 1791 4490 1439 1121 1122 2670 2962 49165 59894 54415 1710 54254 2110 1024 1024 1494 5200 2444 1024 1024 1219 7000 2270 1024 1024 1339 6000 1572 1093 1093 2510 3200 1865 1032 1032 2281 3705 1512 1117 1117 2785 3000 2335 1024 1024 1296 6343 1428 1140 1140 3008 2811 2093 1024 1024 1485 5190 2056 1024 1024 1716 4603 2036 1024 1024 1496 5065 2036 1024 1024 1496 5065 2162 1024 1024 1664 4853 1028 1024 1024 963 4345 1028 1024 1024 963 4345 1028 1024 1024 963 4345 1028 1024 1024 963 4345 65148 372 1024 10900 65174 384 986 10000 65238 414 901 8300 65271 429 860 7000 65335 462 783 6000 65368 478 744 5600 65406 497 702 5200 65458 530 651 4700 65520 572 594 4200 46 617 543 3800 101 659 500 3500 170 712 446 3200 220 756 411 3000 273 810 377 2800 397 953 312 2400 500 2068 2085 1024 1024 1024 1024 0 0 0 0 0 0 0 0 0 0 0 0 0 0 34 33 0 0 0 0 0 0 0 0 55 133 144 121 112 116 192 43 0 0 0 0 0 0 0 0 92 90 104 61 64 61 284 50 0 0 0 114 50 75 54 93 40 45 42 40 42 39 41 50 0 0 0 0 0 0 0 0 0 0 0 0 0 0 33 30 0 0 0 0 0 0 0 0 64 152 165 141 132 140 244 46 0 0 0 0 0 0 0 0 112 108 128 75 81 77 366 57 0 0 0 132 76 94 71 122 52 58 55 53 55 50 52 59 0 0 0 0 0 0 0 0 0 0 0 0 0 0 39 33 0 0 0 0 0 0 0 0 84 199 209 170 154 157 246 48 0 0 0 0 0 0 0 0 148 141 156 88 91 85 366 57 0 0 0 204 99 132 96 161 68 73 66 60 62 56 52 59 0 0 0 0 0 0 0 0 0 0 0 0 0 0 13 10 0 0 0 0 0 0 0 0 35 78 79 65 59 62 103 15 0 0 0 0 0 0 0 0 60 55 61 34 36 33 154 19 0 0 0 77 42 53 37 66 26 27 25 23 23 20 19 20 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 14 3 0 0 0 0 0 0 0 0 2 5 10 30 44 188 16731 673 0 0 0 0 0 0 0 0 3 7 25 74 88 209 48862 3085 0 0 0 5 2 3 6 4 28 18 75 95 76 166 25799 6068 0 0 0 32768 0 1162 1024 1024 2629 3778 7354 4044 65472 58 4403 4147 60 65481 3810 0 254 2 11550 2 22808 2 22847 0 48704 1024 1024 0 1024 0 0 0 0 0 8191 256 8191 256 37573 38975 512 703 430 489 671 410 849 512 512 512 512 42961 35427 40082 5229 24044 65143 57523 5399 48667 30309 51653 50953 8464 16690 825 15673 1584 42305 1023 1024 1023 1024 29836 16383 10000 4096 0 40377 4 853 1024 1024 333 577 1024 1024 492 375 1024 1024 784 850 1010 1010 339 657 1146 1146 571 431 1152 1150 923 0 65534 255 258 252 0 1874 4348 4337 2723 897 215 216 14 98 885 881 1868 1778 3390 3388 496 2317 5161 5142 3321 1102 270 270 19 114 979 973 2257 2158 4033 4024 592 1512 1117 1117 2785 3000 2050 1122 1122 1791 4490 1439 1121 1122 2670 2962 49165 59894 54415 1710 54254 2110 1024 1024 1494 5200 2444 1024 1024 1219 7000 2270 1024 1024 1339 6000 1572 1093 1093 2510 3200 1865 1032 1032 2281 3705 1512 1117 1117 2785 3000 2335 1024 1024 1296 6343 1428 1140 1140 3008 2811 2093 1024 1024 1485 5190 2056 1024 1024 1716 4603 2036 1024 1024 1496 5065 2036 1024 1024 1496 5065 2162 1024 1024 1664 4853 1028 1024 1024 963 4345 1028 1024 1024 963 4345 1028 1024 1024 963 4345 1028 1024 1024 963 4345 65148 372 1024 10900 65174 384 986 10000 65238 414 901 8300 65271 429 860 7000 65335 462 783 6000 65368 478 744 5600 65406 497 702 5200 65458 530 651 4700 65520 572 594 4200 46 617 543 3800 101 659 500 3500 170 712 446 3200 220 756 411 3000 273 810 377 2800 397 953 312 2400 500 2068 2085 1024 1024 1024 1024 0 0 0 0 0 0 0 0 0 0 0 0 0 0 34 33 0 0 0 0 0 0 0 0 55 133 144 121 112 116 192 43 0 0 0 0 0 0 0 0 92 90 104 61 64 61 284 50 0 0 0 114 50 75 54 93 40 45 42 40 42 39 41 50 0 0 0 0 0 0 0 0 0 0 0 0 0 0 33 30 0 0 0 0 0 0 0 0 64 152 165 141 132 140 244 46 0 0 0 0 0 0 0 0 112 108 128 75 81 77 366 57 0 0 0 132 76 94 71 122 52 58 55 53 55 50 52 59 0 0 0 0 0 0 0 0 0 0 0 0 0 0 39 33 0 0 0 0 0 0 0 0 84 199 209 170 154 157 246 48 0 0 0 0 0 0 0 0 148 141 156 88 91 85 366 57 0 0 0 204 99 132 96 161 68 73 66 60 62 56 52 59 0 0 0 0 0 0 0 0 0 0 0 0 0 0 13 10 0 0 0 0 0 0 0 0 35 78 79 65 59 62 103 15 0 0 0 0 0 0 0 0 60 55 61 34 36 33 154 19 0 0 0 77 42 53 37 66 26 27 25 23 23 20 19 20 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 14 3 0 0 0 0 0 0 0 0 2 5 10 30 44 188 16731 673 0 0 0 0 0 0 0 0 3 7 25 74 88 209 48862 3085 0 0 0 5 2 3 6 4 28 18 75 95 76 166 25799 6068 0 0 0 32768 0 1162 1024 1024 2629 3778 7354 4044 65472 58 4403 4147 60 65481 3810 0 254 2 11550 2 22808 2 22847 0 48704 1024 1024 0 1024 0 0 0 0 0 8191 256 8191 256 37573 38975 512 703 430 489 671 410 849 512 512 512 512 42961 35427 40082 5229 24044 65143 57523 5399 48667 30309 51653 50953 8464 16690 825 15673 1584 42305 1023 1024 1023 1024 29836 16383 10000 4096 0 40377
Exif.Canon.PictureStyleUserDef Short 3 129 129 129 Standard
Exif.Canon.CustomPictureStyleFileName Ascii 32
Exif.Canon.AFMicroAdj Long 5 20 2 0 10 0 20 2 0 10 0
Exif.CanonAfMiAdj.AFMicroAdjMode SLong 1 2 Adjust by lens
Exif.CanonAfMiAdj.AFMicroAdjValue SLong 1 0 0
Exif.Photo.UserComment Undefined 264
Exif.Photo.SubSecTime Ascii 3 00 00
Exif.Photo.SubSecTimeOriginal Ascii 3 00 00
test/data/test_reference_files/TamronSP90mmF2.8DiVCUSDMacroF017.exv.out
+18 -8
View File
@@ -56,37 +56,45 @@ Exif.CanonCs.MinAperture Short 1 320 F32
Exif.CanonCs.FlashActivity Short 1 0 Did not fire
Exif.CanonCs.FlashDetails Short 1 8200 Internal flash, E-TTL
Exif.CanonCs.FocusContinuous Short 1 65535 (65535)
Exif.CanonCs.AESetting Short 1 65535 (65535)
Exif.CanonCs.AESetting Short 1 65535 n/a
Exif.CanonCs.ImageStabilization Short 1 65535 (65535)
Exif.CanonCs.DisplayAperture Short 1 0 0
Exif.CanonCs.ZoomSourceWidth Short 1 0 0
Exif.CanonCs.ZoomTargetWidth Short 1 0 0
Exif.CanonCs.SpotMeteringMode Short 1 65535 (65535)
Exif.CanonCs.PhotoEffect Short 1 65535 (65535)
Exif.CanonCs.SpotMeteringMode Short 1 65535 n/a
Exif.CanonCs.PhotoEffect Short 1 65535 n/a
Exif.CanonCs.ManualFlashOutput Short 1 0 n/a
Exif.CanonCs.ColorTone Short 1 0 0
Exif.CanonCs.SRAWQuality Short 1 65535 (65535)
Exif.Canon.FocalLength Short 4 0 90 8902 19690 90.0 mm
Exif.Canon.CanonFlashInfo Short 4 0 100 0 0 0 100 0 0
Exif.CanonSi.AutoISO Short 1 0 100
Exif.CanonSi.ISOSpeed Short 1 160 100
Exif.CanonSi.MeasuredEV Short 1 8 5.25
Exif.CanonSi.TargetAperture Short 1 116 F3.5
Exif.CanonSi.TargetShutterSpeed Short 1 192 1/64 s
Exif.CanonSi.ExposureCompensation Short 1 0 0
Exif.CanonSi.WhiteBalance Short 1 0 Auto
Exif.CanonSi.SlowShutter Short 1 3 None
Exif.CanonSi.Sequence Short 1 0 0
Exif.CanonSi.OpticalZoomCode Short 1 8 8
Exif.CanonSi.CameraTemperature Short 1 153 25 °C
Exif.CanonSi.FlashGuideNumber Short 1 65535 --
Exif.CanonSi.AFPointUsed Short 1 0 0 focus points; none used
Exif.CanonSi.FlashBias Short 1 0 0 EV
Exif.CanonSi.AutoExposureBracketing Short 1 0 Off
Exif.CanonSi.AEBBracketValue Short 1 0 0
Exif.CanonSi.ControlMode Short 1 1 1
Exif.CanonSi.SubjectDistance Short 1 0 0 m
Exif.CanonSi.ApertureValue Short 1 116 F3.5
Exif.CanonSi.ShutterSpeedValue Short 1 192 1/64 s
Exif.CanonSi.MeasuredEV2 Short 1 88 5.00
Exif.CanonSi.BulbDuration Short 1 0 0
Exif.CanonSi.CameraType Short 1 248 EOS High-end
Exif.CanonSi.AutoRotate Short 1 65535 65535
Exif.CanonSi.AutoRotate Short 1 65535 (65535)
Exif.CanonSi.NDFilter Short 1 65535 n/a
Exif.CanonSi.SelfTimer2 Short 1 65535 n/a
Exif.CanonSi.FlashOutput Short 1 0 0
Exif.Canon.ImageType Ascii 15 Canon EOS 600D Canon EOS 600D
Exif.Canon.FirmwareVersion Ascii 24 Firmware Version 1.0.1 Firmware Version 1.0.1
Exif.Canon.OwnerName Ascii 32
@@ -114,7 +122,7 @@ Exif.CanonFi.FileNumber Long 1 0 (0)
Exif.CanonFi.BracketMode SShort 1 0 Off
Exif.CanonFi.BracketValue SShort 1 0 0
Exif.CanonFi.BracketShotNumber SShort 1 0 0
Exif.CanonFi.RawJpgQuality SShort 1 0 (0)
Exif.CanonFi.RawJpgQuality SShort 1 0 unkown
Exif.CanonFi.RawJpgSize SShort 1 0 Large
Exif.CanonFi.NoiseReduction SShort 1 4 Auto
Exif.CanonFi.WBBracketMode SShort 1 0 Off
@@ -153,9 +161,11 @@ Exif.Canon.ColorData Short 1273 10 812 1024 1024 36
Exif.Canon.PictureStyleUserDef Short 3 134 135 135 Monochrome
Exif.Canon.CustomPictureStyleFileName Ascii 32
Exif.Canon.VignettingCorr Undefined 116 0 16 116 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 204 16 64 20 128 13 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 16 116 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 204 16 64 20 128 13 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Exif.Canon.VignettingCorr2 Long 6 24 0 1 0 1 0 24 0 1 0 1 0
Exif.Canon.LightingOpt Long 3 12 0 1 12 0 1
Exif.Canon.AmbienceInfo Long 5 20 0 0 0 0 20 0 0 0 0
Exif.CanonVigCor2.PeripheralLightingSetting SLong 1 0 Off
Exif.CanonLiOp.PeripheralIlluminationCorr SLong 1 0 Off
Exif.CanonLiOp.AutoLightingOptimizer SLong 1 1 Low
Exif.CanonLe.LensSerialNumber SLong 1 0 0
Exif.CanonAm.AmbienceSelection SLong 1 0 Standard
Exif.Photo.UserComment Undefined 264
Exif.Photo.SubSecTime Ascii 3 40 40
Exif.Photo.SubSecTimeOriginal Ascii 3 40 40
test/data/test_reference_files/canon_ef_100_400mm_f4.5_5.6_2x_.exv.out
+48 -11
View File
File diff suppressed because one or more lines are too long
test/data/test_reference_files/exiv2-bug1024.exv.out
+29 -11
View File
File diff suppressed because one or more lines are too long
test/data/test_reference_files/exiv2-bug1122.exv.out
+29 -11
View File
File diff suppressed because one or more lines are too long
test/data/test_reference_files/exiv2-bug1140.exv.out
+11 -3
View File
@@ -49,36 +49,44 @@ Exif.CanonCs.MinAperture Short 1 285 F22
Exif.CanonCs.FlashActivity Short 1 0 Did not fire
Exif.CanonCs.FlashDetails Short 1 0
Exif.CanonCs.FocusContinuous Short 1 0 Single
Exif.CanonCs.AESetting Short 1 65535 (65535)
Exif.CanonCs.AESetting Short 1 65535 n/a
Exif.CanonCs.ImageStabilization Short 1 65535 (65535)
Exif.CanonCs.DisplayAperture Short 1 0 0
Exif.CanonCs.ZoomSourceWidth Short 1 0 0
Exif.CanonCs.ZoomTargetWidth Short 1 0 0
Exif.CanonCs.SpotMeteringMode Short 1 65535 (65535)
Exif.CanonCs.SpotMeteringMode Short 1 65535 n/a
Exif.CanonCs.PhotoEffect Short 1 0 Off
Exif.CanonCs.ManualFlashOutput Short 1 32767 (32767)
Exif.CanonCs.ColorTone Short 1 0 0
Exif.Canon.FocalLength Short 4 1 24 907 605 24.0 mm
Exif.Canon.CanonFlashInfo Short 4 100 0 0 0 100 0 0 0
Exif.CanonSi.AutoISO Short 1 0 100
Exif.CanonSi.ISOSpeed Short 1 276 1269.92
Exif.CanonSi.MeasuredEV Short 1 136 9.25
Exif.CanonSi.TargetAperture Short 1 172 F6.3
Exif.CanonSi.TargetShutterSpeed Short 1 244 1/203 s
Exif.CanonSi.ExposureCompensation Short 1 0 0
Exif.CanonSi.WhiteBalance Short 1 0 Auto
Exif.CanonSi.SlowShutter Short 1 3 None
Exif.CanonSi.Sequence Short 1 0 0
Exif.CanonSi.OpticalZoomCode Short 1 8 8
Exif.CanonSi.CameraTemperature Short 1 156 28 °C
Exif.CanonSi.FlashGuideNumber Short 1 0 0
Exif.CanonSi.AFPointUsed Short 1 0 0 focus points; none used
Exif.CanonSi.FlashBias Short 1 0 0 EV
Exif.CanonSi.AutoExposureBracketing Short 1 0 Off
Exif.CanonSi.AEBBracketValue Short 1 0 0
Exif.CanonSi.ControlMode Short 1 1 1
Exif.CanonSi.SubjectDistance Short 1 0 0 m
Exif.CanonSi.ApertureValue Short 1 172 F6.3
Exif.CanonSi.ShutterSpeedValue Short 1 240 1/181 s
Exif.CanonSi.MeasuredEV2 Short 1 126 9.75
Exif.CanonSi.BulbDuration Short 1 0 0
Exif.CanonSi.CameraType Short 1 252 EOS Mid-range
Exif.CanonSi.AutoRotate Short 1 0 0
Exif.CanonSi.AutoRotate Short 1 0 None
Exif.CanonSi.NDFilter Short 1 65535 n/a
Exif.CanonSi.SelfTimer2 Short 1 0 Selftimer 2s
Exif.CanonSi.FlashOutput Short 1 0 0
Exif.Canon.ImageType Ascii 32 Canon EOS 30D Canon EOS 30D
Exif.Canon.FirmwareVersion Ascii 32 Firmware 1.0.5 Firmware 1.0.5
Exif.Canon.OwnerName Ascii 32 unknown unknown
test/data/test_reference_files/exiv2-bug1166.exv.out
+29 -12
View File
File diff suppressed because one or more lines are too long
test/data/test_reference_files/exiv2-bug1167.exv.out
+28 -11
View File
File diff suppressed because one or more lines are too long
test/data/test_reference_files/exiv2-bug1170.exv.out
+29 -11
View File
File diff suppressed because one or more lines are too long
test/data/test_reference_files/exiv2-bug1202.jpg.out
+11 -4
View File
@@ -50,36 +50,43 @@ Exif.CanonCs.MinAperture Short 1 285 F22
Exif.CanonCs.FlashActivity Short 1 0 Did not fire
Exif.CanonCs.FlashDetails Short 1 0
Exif.CanonCs.FocusContinuous Short 1 65535 (65535)
Exif.CanonCs.AESetting Short 1 65535 (65535)
Exif.CanonCs.AESetting Short 1 65535 n/a
Exif.CanonCs.ImageStabilization Short 1 65535 (65535)
Exif.CanonCs.DisplayAperture Short 1 0 0
Exif.CanonCs.ZoomSourceWidth Short 1 3072 3072
Exif.CanonCs.ZoomTargetWidth Short 1 3072 3072
Exif.CanonCs.SpotMeteringMode Short 1 65535 (65535)
Exif.CanonCs.PhotoEffect Short 1 65535 (65535)
Exif.CanonCs.SpotMeteringMode Short 1 65535 n/a
Exif.CanonCs.PhotoEffect Short 1 65535 n/a
Exif.CanonCs.ManualFlashOutput Short 1 0 n/a
Exif.CanonCs.ColorTone Short 1 0 0
Exif.Canon.FocalLength Short 4 0 18 914 610 18.0 mm
Exif.Canon.CanonFlashInfo Short 4 100 0 0 0 100 0 0 0
Exif.CanonSi.AutoISO Short 1 0 100
Exif.CanonSi.ISOSpeed Short 1 160 100
Exif.CanonSi.MeasuredEV Short 1 200 11.25
Exif.CanonSi.TargetAperture Short 1 159 F5.6
Exif.CanonSi.TargetShutterSpeed Short 1 202 1/79 s
Exif.CanonSi.ExposureCompensation Short 1 0 0
Exif.CanonSi.WhiteBalance Short 1 0 Auto
Exif.CanonSi.SlowShutter Short 1 3 None
Exif.CanonSi.Sequence Short 1 0 0
Exif.CanonSi.OpticalZoomCode Short 1 8 8
Exif.CanonSi.CameraTemperature Short 1 0 --
Exif.CanonSi.FlashGuideNumber Short 1 0 0
Exif.CanonSi.AFPointUsed Short 1 0 0 focus points; none used
Exif.CanonSi.FlashBias Short 1 0 0 EV
Exif.CanonSi.AutoExposureBracketing Short 1 0 Off
Exif.CanonSi.AEBBracketValue Short 1 0 0
Exif.CanonSi.ControlMode Short 1 1 1
Exif.CanonSi.SubjectDistance Short 1 65535 Infinite
Exif.CanonSi.ApertureValue Short 1 156 F5.4
Exif.CanonSi.ShutterSpeedValue Short 1 204 1/81 s
Exif.CanonSi.MeasuredEV2 Short 1 140 11.50
Exif.CanonSi.BulbDuration Short 1 0 0
Exif.CanonSi.CameraType Short 1 252 EOS Mid-range
Exif.CanonSi.AutoRotate Short 1 1 1
Exif.CanonSi.AutoRotate Short 1 1 Rotate 90 CW
Exif.CanonSi.NDFilter Short 1 65535 n/a
Exif.CanonSi.SelfTimer2 Short 1 0 Selftimer 2s
Exif.CanonFi.FileNumber Long 1 0 (0)
Exif.CanonFi.BracketMode SShort 1 0 Off
Exif.CanonFi.BracketValue SShort 1 0 0
test/data/test_reference_files/exiv2-bug1231a.jpg.out
+10 -2
View File
@@ -58,30 +58,38 @@ Exif.CanonCs.DisplayAperture Short 1 0 0
Exif.CanonCs.ZoomSourceWidth Short 1 4000 4000
Exif.CanonCs.ZoomTargetWidth Short 1 4000 4000
Exif.CanonCs.SpotMeteringMode Short 1 0 Center
Exif.CanonCs.PhotoEffect Short 1 65535 (65535)
Exif.CanonCs.PhotoEffect Short 1 65535 n/a
Exif.CanonCs.ManualFlashOutput Short 1 0 n/a
Exif.CanonCs.ColorTone Short 1 32767 32767
Exif.CanonCs.SRAWQuality Short 1 65535 (65535)
Exif.Canon.CanonFlashInfo Short 4 0 0 0 0 0 0 0 0
Exif.CanonSi.AutoISO Short 1 96 106.714
Exif.CanonSi.ISOSpeed Short 1 192 200
Exif.CanonSi.MeasuredEV Short 1 65241 -4.21
Exif.CanonSi.TargetAperture Short 1 116 F3.5
Exif.CanonSi.TargetShutterSpeed Short 1 0 1 s
Exif.CanonSi.ExposureCompensation Short 1 0 0
Exif.CanonSi.WhiteBalance Short 1 0 Auto
Exif.CanonSi.SlowShutter Short 1 0 Off
Exif.CanonSi.Sequence Short 1 1 1
Exif.CanonSi.OpticalZoomCode Short 1 0 0
Exif.CanonSi.CameraTemperature Short 1 0 --
Exif.CanonSi.FlashGuideNumber Short 1 0 0
Exif.CanonSi.AFPointUsed Short 1 0 0 focus points; none used
Exif.CanonSi.FlashBias Short 1 0 0 EV
Exif.CanonSi.AutoExposureBracketing Short 1 0 Off
Exif.CanonSi.AEBBracketValue Short 1 0 0
Exif.CanonSi.ControlMode Short 1 1 1
Exif.CanonSi.SubjectDistance Short 1 135 1.35 m
Exif.CanonSi.ApertureValue Short 1 118 F3.5
Exif.CanonSi.ShutterSpeedValue Short 1 0 1 s
Exif.CanonSi.MeasuredEV2 Short 1 0 -6.00
Exif.CanonSi.BulbDuration Short 1 0 0
Exif.CanonSi.CameraType Short 1 250 Compact
Exif.CanonSi.AutoRotate Short 1 0 0
Exif.CanonSi.AutoRotate Short 1 0 None
Exif.CanonSi.NDFilter Short 1 0 Off
Exif.CanonSi.SelfTimer2 Short 1 0 Selftimer 2s
Exif.CanonSi.FlashOutput Short 1 0 0
Exif.Canon.ImageType Ascii 28 IMG:PowerShot SX240 HS JPEG IMG:PowerShot SX240 HS JPEG
Exif.Canon.FirmwareVersion Ascii 22 Firmware Version 1.00 Firmware Version 1.00
Exif.Canon.FileNumber Long 1 2829622 282-9622
test/data/test_reference_files/exiv2-bug1231b.jpg.out
+10 -2
View File
@@ -58,30 +58,38 @@ Exif.CanonCs.DisplayAperture Short 1 0 0
Exif.CanonCs.ZoomSourceWidth Short 1 4000 4000
Exif.CanonCs.ZoomTargetWidth Short 1 4000 4000
Exif.CanonCs.SpotMeteringMode Short 1 0 Center
Exif.CanonCs.PhotoEffect Short 1 65535 (65535)
Exif.CanonCs.PhotoEffect Short 1 65535 n/a
Exif.CanonCs.ManualFlashOutput Short 1 0 n/a
Exif.CanonCs.ColorTone Short 1 32767 32767
Exif.CanonCs.SRAWQuality Short 1 65535 (65535)
Exif.Canon.CanonFlashInfo Short 4 0 0 0 0 0 0 0 0
Exif.CanonSi.AutoISO Short 1 96 106.714
Exif.CanonSi.ISOSpeed Short 1 192 200
Exif.CanonSi.MeasuredEV Short 1 65241 -4.21
Exif.CanonSi.TargetAperture Short 1 116 F3.5
Exif.CanonSi.TargetShutterSpeed Short 1 0 1 s
Exif.CanonSi.ExposureCompensation Short 1 0 0
Exif.CanonSi.WhiteBalance Short 1 0 Auto
Exif.CanonSi.SlowShutter Short 1 0 Off
Exif.CanonSi.Sequence Short 1 1 1
Exif.CanonSi.OpticalZoomCode Short 1 0 0
Exif.CanonSi.CameraTemperature Short 1 0 --
Exif.CanonSi.FlashGuideNumber Short 1 0 0
Exif.CanonSi.AFPointUsed Short 1 0 0 focus points; none used
Exif.CanonSi.FlashBias Short 1 0 0 EV
Exif.CanonSi.AutoExposureBracketing Short 1 0 Off
Exif.CanonSi.AEBBracketValue Short 1 0 0
Exif.CanonSi.ControlMode Short 1 1 1
Exif.CanonSi.SubjectDistance Short 1 135 1.35 m
Exif.CanonSi.ApertureValue Short 1 118 F3.5
Exif.CanonSi.ShutterSpeedValue Short 1 0 1 s
Exif.CanonSi.MeasuredEV2 Short 1 0 -6.00
Exif.CanonSi.BulbDuration Short 1 0 0
Exif.CanonSi.CameraType Short 1 250 Compact
Exif.CanonSi.AutoRotate Short 1 0 0
Exif.CanonSi.AutoRotate Short 1 0 None
Exif.CanonSi.NDFilter Short 1 0 Off
Exif.CanonSi.SelfTimer2 Short 1 0 Selftimer 2s
Exif.CanonSi.FlashOutput Short 1 0 0
Exif.Canon.ImageType Ascii 28 IMG:PowerShot SX240 HS JPEG IMG:PowerShot SX240 HS JPEG
Exif.Canon.FirmwareVersion Ascii 22 Firmware Version 1.00 Firmware Version 1.00
Exif.Canon.FileNumber Long 1 2829624 282-9624
test/data/test_reference_files/exiv2-bug1252a.exv.out
+46 -11
View File
File diff suppressed because one or more lines are too long
test/data/test_reference_files/exiv2-bug1252b.exv.out
+46 -11
View File
File diff suppressed because one or more lines are too long
test/data/test_reference_files/exiv2-bug445.jpg.out
+5
View File
@@ -56,19 +56,24 @@ Exif.CanonCs.ZoomSourceWidth Short 1 2272 2272
Exif.CanonCs.ZoomTargetWidth Short 1 2272 2272
Exif.CanonCs.SpotMeteringMode Short 1 1 AF Point
Exif.Canon.FocalLength Short 4 2 682 286 215 21.3 mm
Exif.Canon.CanonFlashInfo Short 4 0 0 0 0 0 0 0 0
Exif.CanonSi.AutoISO Short 1 0 100
Exif.CanonSi.ISOSpeed Short 1 160 100
Exif.CanonSi.MeasuredEV Short 1 276 13.63
Exif.CanonSi.TargetAperture Short 1 149 F5
Exif.CanonSi.TargetShutterSpeed Short 1 287 1/501 s
Exif.CanonSi.ExposureCompensation Short 1 0 0
Exif.CanonSi.WhiteBalance Short 1 0 Auto
Exif.CanonSi.SlowShutter Short 1 0 Off
Exif.CanonSi.Sequence Short 1 0 0
Exif.CanonSi.OpticalZoomCode Short 1 6 6
Exif.CanonSi.CameraTemperature Short 1 0 --
Exif.CanonSi.FlashGuideNumber Short 1 0 0
Exif.CanonSi.AFPointUsed Short 1 12290 3 focus points; center used
Exif.CanonSi.FlashBias Short 1 0 0 EV
Exif.CanonSi.AutoExposureBracketing Short 1 0 Off
Exif.CanonSi.AEBBracketValue Short 1 0 0
Exif.CanonSi.ControlMode Short 1 1 1
Exif.CanonSi.SubjectDistance Short 1 782 7.82 m
Exif.CanonSi.ApertureValue Short 1 149 F5
Exif.CanonSi.ShutterSpeedValue Short 1 289 1/523 s
test/data/test_reference_files/exiv2-bug876.jpg.out
+29 -11
View File
File diff suppressed because one or more lines are too long
test/data/test_reference_files/exiv2-canon-eos-20d.jpg.out
+11 -3
View File
@@ -50,36 +50,44 @@ Exif.CanonCs.MinAperture Short 1 65535 65535
Exif.CanonCs.FlashActivity Short 1 133 (133)
Exif.CanonCs.FlashDetails Short 1 16392 External flash, E-TTL
Exif.CanonCs.FocusContinuous Short 1 0 Single
Exif.CanonCs.AESetting Short 1 65535 (65535)
Exif.CanonCs.AESetting Short 1 65535 n/a
Exif.CanonCs.ImageStabilization Short 1 65535 (65535)
Exif.CanonCs.DisplayAperture Short 1 0 0
Exif.CanonCs.ZoomSourceWidth Short 1 0 0
Exif.CanonCs.ZoomTargetWidth Short 1 0 0
Exif.CanonCs.SpotMeteringMode Short 1 65535 (65535)
Exif.CanonCs.SpotMeteringMode Short 1 65535 n/a
Exif.CanonCs.PhotoEffect Short 1 0 Off
Exif.CanonCs.ManualFlashOutput Short 1 32767 (32767)
Exif.CanonCs.ColorTone Short 1 0 0
Exif.Canon.FocalLength Short 4 2 95 907 605 95.0 mm
Exif.Canon.CanonFlashInfo Short 4 0 100 0 0 0 100 0 0
Exif.CanonSi.AutoISO Short 1 0 100
Exif.CanonSi.ISOSpeed Short 1 160 100
Exif.CanonSi.MeasuredEV Short 1 8 5.25
Exif.CanonSi.TargetAperture Short 1 159 F5.6
Exif.CanonSi.TargetShutterSpeed Short 1 189 1/60 s
Exif.CanonSi.ExposureCompensation Short 1 0 0
Exif.CanonSi.WhiteBalance Short 1 6 Custom
Exif.CanonSi.SlowShutter Short 1 3 None
Exif.CanonSi.Sequence Short 1 0 0
Exif.CanonSi.OpticalZoomCode Short 1 8 8
Exif.CanonSi.CameraTemperature Short 1 0 --
Exif.CanonSi.FlashGuideNumber Short 1 65535 --
Exif.CanonSi.AFPointUsed Short 1 0 0 focus points; none used
Exif.CanonSi.FlashBias Short 1 0 0 EV
Exif.CanonSi.AutoExposureBracketing Short 1 0 Off
Exif.CanonSi.AEBBracketValue Short 1 0 0
Exif.CanonSi.ControlMode Short 1 1 1
Exif.CanonSi.SubjectDistance Short 1 0 0 m
Exif.CanonSi.ApertureValue Short 1 156 F5.4
Exif.CanonSi.ShutterSpeedValue Short 1 352 1/2048 s
Exif.CanonSi.MeasuredEV2 Short 1 87 4.88
Exif.CanonSi.BulbDuration Short 1 0 0
Exif.CanonSi.CameraType Short 1 252 EOS Mid-range
Exif.CanonSi.AutoRotate Short 1 0 0
Exif.CanonSi.AutoRotate Short 1 0 None
Exif.CanonSi.NDFilter Short 1 65535 n/a
Exif.CanonSi.SelfTimer2 Short 1 0 Selftimer 2s
Exif.CanonSi.FlashOutput Short 1 0 0
Exif.Canon.ImageType Ascii 32 Canon EOS 20D Canon EOS 20D
Exif.Canon.FirmwareVersion Ascii 32 Firmware 2.0.3 Firmware 2.0.3
Exif.Canon.OwnerName Ascii 32 unknown unknown
test/data/test_reference_files/exiv2-canon-eos-300d.jpg.out
+11 -4
View File
@@ -50,36 +50,43 @@ Exif.CanonCs.MinAperture Short 1 285 F22
Exif.CanonCs.FlashActivity Short 1 0 Did not fire
Exif.CanonCs.FlashDetails Short 1 0
Exif.CanonCs.FocusContinuous Short 1 65535 (65535)
Exif.CanonCs.AESetting Short 1 65535 (65535)
Exif.CanonCs.AESetting Short 1 65535 n/a
Exif.CanonCs.ImageStabilization Short 1 65535 (65535)
Exif.CanonCs.DisplayAperture Short 1 0 0
Exif.CanonCs.ZoomSourceWidth Short 1 3072 3072
Exif.CanonCs.ZoomTargetWidth Short 1 3072 3072
Exif.CanonCs.SpotMeteringMode Short 1 65535 (65535)
Exif.CanonCs.PhotoEffect Short 1 65535 (65535)
Exif.CanonCs.SpotMeteringMode Short 1 65535 n/a
Exif.CanonCs.PhotoEffect Short 1 65535 n/a
Exif.CanonCs.ManualFlashOutput Short 1 0 n/a
Exif.CanonCs.ColorTone Short 1 0 0
Exif.Canon.FocalLength Short 4 0 18 914 610 18.0 mm
Exif.Canon.CanonFlashInfo Short 4 100 0 0 0 100 0 0 0
Exif.CanonSi.AutoISO Short 1 0 100
Exif.CanonSi.ISOSpeed Short 1 160 100
Exif.CanonSi.MeasuredEV Short 1 200 11.25
Exif.CanonSi.TargetAperture Short 1 159 F5.6
Exif.CanonSi.TargetShutterSpeed Short 1 202 1/79 s
Exif.CanonSi.ExposureCompensation Short 1 0 0
Exif.CanonSi.WhiteBalance Short 1 0 Auto
Exif.CanonSi.SlowShutter Short 1 3 None
Exif.CanonSi.Sequence Short 1 0 0
Exif.CanonSi.OpticalZoomCode Short 1 8 8
Exif.CanonSi.CameraTemperature Short 1 0 --
Exif.CanonSi.FlashGuideNumber Short 1 0 0
Exif.CanonSi.AFPointUsed Short 1 0 0 focus points; none used
Exif.CanonSi.FlashBias Short 1 0 0 EV
Exif.CanonSi.AutoExposureBracketing Short 1 0 Off
Exif.CanonSi.AEBBracketValue Short 1 0 0
Exif.CanonSi.ControlMode Short 1 1 1
Exif.CanonSi.SubjectDistance Short 1 65535 Infinite
Exif.CanonSi.ApertureValue Short 1 156 F5.4
Exif.CanonSi.ShutterSpeedValue Short 1 204 1/81 s
Exif.CanonSi.MeasuredEV2 Short 1 140 11.50
Exif.CanonSi.BulbDuration Short 1 0 0
Exif.CanonSi.CameraType Short 1 252 EOS Mid-range
Exif.CanonSi.AutoRotate Short 1 1 1
Exif.CanonSi.AutoRotate Short 1 1 Rotate 90 CW
Exif.CanonSi.NDFilter Short 1 65535 n/a
Exif.CanonSi.SelfTimer2 Short 1 0 Selftimer 2s
Exif.CanonFi.FileNumber Long 1 0 (0)
Exif.CanonFi.BracketMode SShort 1 0 Off
Exif.CanonFi.BracketValue SShort 1 0 0
test/data/test_reference_files/exiv2-canon-eos-d30.jpg.out
+5
View File
@@ -51,19 +51,24 @@ Exif.CanonCs.MinAperture Short 1 285 F22
Exif.CanonCs.FlashActivity Short 1 255 (255)
Exif.CanonCs.FlashDetails Short 1 0
Exif.Canon.FocalLength Short 4 0 70 914 610 70.0 mm
Exif.Canon.CanonFlashInfo Short 4 100 0 0 0 100 0 0 0
Exif.CanonSi.AutoISO Short 1 0 100
Exif.CanonSi.ISOSpeed Short 1 160 100
Exif.CanonSi.MeasuredEV Short 1 248 12.75
Exif.CanonSi.TargetAperture Short 1 128 F4
Exif.CanonSi.TargetShutterSpeed Short 1 270 1/347 s
Exif.CanonSi.ExposureCompensation Short 1 0 0
Exif.CanonSi.WhiteBalance Short 1 1 Daylight
Exif.CanonSi.SlowShutter Short 1 3 None
Exif.CanonSi.Sequence Short 1 1 1
Exif.CanonSi.OpticalZoomCode Short 1 8 8
Exif.CanonSi.CameraTemperature Short 1 0 --
Exif.CanonSi.FlashGuideNumber Short 1 0 0
Exif.CanonSi.AFPointUsed Short 1 12288 3 focus points; none used
Exif.CanonSi.FlashBias Short 1 0 0 EV
Exif.CanonSi.AutoExposureBracketing Short 1 0 Off
Exif.CanonSi.AEBBracketValue Short 1 0 0
Exif.CanonSi.ControlMode Short 1 1 1
Exif.CanonSi.SubjectDistance Short 1 0 0 m
Exif.CanonSi.ApertureValue Short 1 128 F4
Exif.CanonSi.ShutterSpeedValue Short 1 280 1/431 s
test/data/test_reference_files/exiv2-canon-powershot-a520.jpg.out
+9 -1
View File
@@ -59,26 +59,34 @@ Exif.CanonCs.PhotoEffect Short 1 0 Off
Exif.CanonCs.ManualFlashOutput Short 1 0 n/a
Exif.CanonCs.ColorTone Short 1 32767 32767
Exif.Canon.FocalLength Short 4 2 186 229 172 5.8 mm
Exif.Canon.CanonFlashInfo Short 4 0 0 0 0 0 0 0 0
Exif.CanonSi.AutoISO Short 1 0 100
Exif.CanonSi.ISOSpeed Short 1 128 50
Exif.CanonSi.MeasuredEV Short 1 320 15.00
Exif.CanonSi.TargetAperture Short 1 128 F4
Exif.CanonSi.TargetShutterSpeed Short 1 319 1/1002 s
Exif.CanonSi.ExposureCompensation Short 1 0 0
Exif.CanonSi.WhiteBalance Short 1 0 Auto
Exif.CanonSi.SlowShutter Short 1 0 Off
Exif.CanonSi.Sequence Short 1 0 0
Exif.CanonSi.OpticalZoomCode Short 1 0 0
Exif.CanonSi.CameraTemperature Short 1 0 --
Exif.CanonSi.FlashGuideNumber Short 1 0 0
Exif.CanonSi.AFPointUsed Short 1 0 0 focus points; none used
Exif.CanonSi.FlashBias Short 1 0 0 EV
Exif.CanonSi.AutoExposureBracketing Short 1 0 Off
Exif.CanonSi.AEBBracketValue Short 1 0 0
Exif.CanonSi.ControlMode Short 1 1 1
Exif.CanonSi.SubjectDistance Short 1 6553 65.53 m
Exif.CanonSi.ApertureValue Short 1 128 F4
Exif.CanonSi.ShutterSpeedValue Short 1 320 1/1024 s
Exif.CanonSi.MeasuredEV2 Short 1 0 -6.00
Exif.CanonSi.BulbDuration Short 1 0 0
Exif.CanonSi.CameraType Short 1 250 Compact
Exif.CanonSi.AutoRotate Short 1 0 0
Exif.CanonSi.AutoRotate Short 1 0 None
Exif.CanonSi.NDFilter Short 1 0 Off
Exif.CanonSi.SelfTimer2 Short 1 0 Selftimer 2s
Exif.CanonSi.FlashOutput Short 1 0 0
Exif.CanonPa.PanoramaFrame Short 1 0 0
Exif.CanonPa.PanoramaDirection Short 1 1 Right to left
Exif.CanonPi.ImageWidth Short 1 2272 2272
test/data/test_reference_files/exiv2-canon-powershot-s40.crw.out
+4
View File
@@ -18,14 +18,18 @@ Exif.CanonSi.ISOSpeed Short 1 160 100
Exif.CanonSi.MeasuredEV Short 1 63 6.97
Exif.CanonSi.TargetAperture Short 1 95 F2.8
Exif.CanonSi.TargetShutterSpeed Short 1 125 1/15 s
Exif.CanonSi.ExposureCompensation Short 1 0 0
Exif.CanonSi.WhiteBalance Short 1 0 Auto
Exif.CanonSi.SlowShutter Short 1 0 Off
Exif.CanonSi.Sequence Short 1 0 0
Exif.CanonSi.OpticalZoomCode Short 1 0 0
Exif.CanonSi.CameraTemperature Short 1 0 --
Exif.CanonSi.FlashGuideNumber Short 1 0 0
Exif.CanonSi.AFPointUsed Short 1 12290 3 focus points; center used
Exif.CanonSi.FlashBias Short 1 0 0 EV
Exif.CanonSi.AutoExposureBracketing Short 1 0 Off
Exif.CanonSi.AEBBracketValue Short 1 0 0
Exif.CanonSi.ControlMode Short 1 1 1
Exif.CanonSi.SubjectDistance Short 1 892 8.92 m
Exif.CanonSi.ApertureValue Short 1 99 F2.9
Exif.CanonSi.ShutterSpeedValue Short 1 126 1/15 s
test/data/test_reference_files/exiv2-canon-powershot-s40.jpg.out
+5
View File
@@ -56,19 +56,24 @@ Exif.CanonCs.ZoomSourceWidth Short 1 2272 2272
Exif.CanonCs.ZoomTargetWidth Short 1 2272 2272
Exif.CanonCs.SpotMeteringMode Short 1 1 AF Point
Exif.Canon.FocalLength Short 4 2 682 286 215 21.3 mm
Exif.Canon.CanonFlashInfo Short 4 0 0 0 0 0 0 0 0
Exif.CanonSi.AutoISO Short 1 0 100
Exif.CanonSi.ISOSpeed Short 1 160 100
Exif.CanonSi.MeasuredEV Short 1 276 13.63
Exif.CanonSi.TargetAperture Short 1 149 F5
Exif.CanonSi.TargetShutterSpeed Short 1 287 1/501 s
Exif.CanonSi.ExposureCompensation Short 1 0 0
Exif.CanonSi.WhiteBalance Short 1 0 Auto
Exif.CanonSi.SlowShutter Short 1 0 Off
Exif.CanonSi.Sequence Short 1 0 0
Exif.CanonSi.OpticalZoomCode Short 1 6 6
Exif.CanonSi.CameraTemperature Short 1 0 --
Exif.CanonSi.FlashGuideNumber Short 1 0 0
Exif.CanonSi.AFPointUsed Short 1 12290 3 focus points; center used
Exif.CanonSi.FlashBias Short 1 0 0 EV
Exif.CanonSi.AutoExposureBracketing Short 1 0 Off
Exif.CanonSi.AEBBracketValue Short 1 0 0
Exif.CanonSi.ControlMode Short 1 1 1
Exif.CanonSi.SubjectDistance Short 1 782 7.82 m
Exif.CanonSi.ApertureValue Short 1 149 F5
Exif.CanonSi.ShutterSpeedValue Short 1 289 1/523 s
test/data/test_reference_files/exiv2-g20.exv.out
+18 -8
View File
@@ -56,37 +56,45 @@ Exif.CanonCs.MinAperture Short 1 320 F32
Exif.CanonCs.FlashActivity Short 1 0 Did not fire
Exif.CanonCs.FlashDetails Short 1 8200 Internal flash, E-TTL
Exif.CanonCs.FocusContinuous Short 1 65535 (65535)
Exif.CanonCs.AESetting Short 1 65535 (65535)
Exif.CanonCs.AESetting Short 1 65535 n/a
Exif.CanonCs.ImageStabilization Short 1 65535 (65535)
Exif.CanonCs.DisplayAperture Short 1 0 0
Exif.CanonCs.ZoomSourceWidth Short 1 0 0
Exif.CanonCs.ZoomTargetWidth Short 1 0 0
Exif.CanonCs.SpotMeteringMode Short 1 65535 (65535)
Exif.CanonCs.PhotoEffect Short 1 65535 (65535)
Exif.CanonCs.SpotMeteringMode Short 1 65535 n/a
Exif.CanonCs.PhotoEffect Short 1 65535 n/a
Exif.CanonCs.ManualFlashOutput Short 1 0 n/a
Exif.CanonCs.ColorTone Short 1 0 0
Exif.CanonCs.SRAWQuality Short 1 65535 (65535)
Exif.Canon.FocalLength Short 4 0 90 8902 19690 90.0 mm
Exif.Canon.CanonFlashInfo Short 4 0 100 0 0 0 100 0 0
Exif.CanonSi.AutoISO Short 1 0 100
Exif.CanonSi.ISOSpeed Short 1 160 100
Exif.CanonSi.MeasuredEV Short 1 8 5.25
Exif.CanonSi.TargetAperture Short 1 116 F3.5
Exif.CanonSi.TargetShutterSpeed Short 1 192 1/64 s
Exif.CanonSi.ExposureCompensation Short 1 0 0
Exif.CanonSi.WhiteBalance Short 1 0 Auto
Exif.CanonSi.SlowShutter Short 1 3 None
Exif.CanonSi.Sequence Short 1 0 0
Exif.CanonSi.OpticalZoomCode Short 1 8 8
Exif.CanonSi.CameraTemperature Short 1 153 25 °C
Exif.CanonSi.FlashGuideNumber Short 1 65535 --
Exif.CanonSi.AFPointUsed Short 1 0 0 focus points; none used
Exif.CanonSi.FlashBias Short 1 0 0 EV
Exif.CanonSi.AutoExposureBracketing Short 1 0 Off
Exif.CanonSi.AEBBracketValue Short 1 0 0
Exif.CanonSi.ControlMode Short 1 1 1
Exif.CanonSi.SubjectDistance Short 1 0 0 m
Exif.CanonSi.ApertureValue Short 1 116 F3.5
Exif.CanonSi.ShutterSpeedValue Short 1 192 1/64 s
Exif.CanonSi.MeasuredEV2 Short 1 88 5.00
Exif.CanonSi.BulbDuration Short 1 0 0
Exif.CanonSi.CameraType Short 1 248 EOS High-end
Exif.CanonSi.AutoRotate Short 1 65535 65535
Exif.CanonSi.AutoRotate Short 1 65535 (65535)
Exif.CanonSi.NDFilter Short 1 65535 n/a
Exif.CanonSi.SelfTimer2 Short 1 65535 n/a
Exif.CanonSi.FlashOutput Short 1 0 0
Exif.Canon.ImageType Ascii 15 Canon EOS 600D Canon EOS 600D
Exif.Canon.FirmwareVersion Ascii 24 Firmware Version 1.0.1 Firmware Version 1.0.1
Exif.Canon.OwnerName Ascii 32
@@ -114,7 +122,7 @@ Exif.CanonFi.FileNumber Long 1 0 (0)
Exif.CanonFi.BracketMode SShort 1 0 Off
Exif.CanonFi.BracketValue SShort 1 0 0
Exif.CanonFi.BracketShotNumber SShort 1 0 0
Exif.CanonFi.RawJpgQuality SShort 1 0 (0)
Exif.CanonFi.RawJpgQuality SShort 1 0 unkown
Exif.CanonFi.RawJpgSize SShort 1 0 Large
Exif.CanonFi.NoiseReduction SShort 1 4 Auto
Exif.CanonFi.WBBracketMode SShort 1 0 Off
@@ -153,9 +161,11 @@ Exif.Canon.ColorData Short 1273 10 812 1024 1024 36
Exif.Canon.PictureStyleUserDef Short 3 134 135 135 Monochrome
Exif.Canon.CustomPictureStyleFileName Ascii 32
Exif.Canon.VignettingCorr Undefined 116 0 16 116 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 204 16 64 20 128 13 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 16 116 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 204 16 64 20 128 13 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Exif.Canon.VignettingCorr2 Long 6 24 0 1 0 1 0 24 0 1 0 1 0
Exif.Canon.LightingOpt Long 3 12 0 1 12 0 1
Exif.Canon.AmbienceInfo Long 5 20 0 0 0 0 20 0 0 0 0
Exif.CanonVigCor2.PeripheralLightingSetting SLong 1 0 Off
Exif.CanonLiOp.PeripheralIlluminationCorr SLong 1 0 Off
Exif.CanonLiOp.AutoLightingOptimizer SLong 1 1 Low
Exif.CanonLe.LensSerialNumber SLong 1 0 0
Exif.CanonAm.AmbienceSelection SLong 1 0 Standard
Exif.Photo.UserComment Undefined 264
Exif.Photo.SubSecTime Ascii 3 40 40
Exif.Photo.SubSecTimeOriginal Ascii 3 40 40
test/data/test_reference_files/exiv2-g45.exv.out
+29 -11
View File
@@ -51,13 +51,13 @@ Exif.CanonCs.MinAperture Short 1 288 F23
Exif.CanonCs.FlashActivity Short 1 0 Did not fire
Exif.CanonCs.FlashDetails Short 1 0
Exif.CanonCs.FocusContinuous Short 1 65535 (65535)
Exif.CanonCs.AESetting Short 1 65535 (65535)
Exif.CanonCs.AESetting Short 1 65535 n/a
Exif.CanonCs.ImageStabilization Short 1 65535 (65535)
Exif.CanonCs.DisplayAperture Short 1 0 0
Exif.CanonCs.ZoomSourceWidth Short 1 0 0
Exif.CanonCs.ZoomTargetWidth Short 1 0 0
Exif.CanonCs.SpotMeteringMode Short 1 65535 (65535)
Exif.CanonCs.PhotoEffect Short 1 65535 (65535)
Exif.CanonCs.SpotMeteringMode Short 1 65535 n/a
Exif.CanonCs.PhotoEffect Short 1 65535 n/a
Exif.CanonCs.ManualFlashOutput Short 1 0 n/a
Exif.CanonCs.ColorTone Short 1 0 0
Exif.CanonCs.SRAWQuality Short 1 0 n/a
@@ -66,26 +66,33 @@ Exif.CanonSi.ISOSpeed Short 1 160 100
Exif.CanonSi.MeasuredEV Short 1 148 9.63
Exif.CanonSi.TargetAperture Short 1 128 F4
Exif.CanonSi.TargetShutterSpeed Short 1 172 1/40 s
Exif.CanonSi.ExposureCompensation Short 1 0 0
Exif.CanonSi.WhiteBalance Short 1 0 Auto
Exif.CanonSi.SlowShutter Short 1 3 None
Exif.CanonSi.Sequence Short 1 0 0
Exif.CanonSi.OpticalZoomCode Short 1 8 8
Exif.CanonSi.CameraTemperature Short 1 155 27 °C
Exif.CanonSi.FlashGuideNumber Short 1 0 0
Exif.CanonSi.AFPointUsed Short 1 0 0 focus points; none used
Exif.CanonSi.FlashBias Short 1 0 0 EV
Exif.CanonSi.AutoExposureBracketing Short 1 0 Off
Exif.CanonSi.AEBBracketValue Short 1 0 0
Exif.CanonSi.ControlMode Short 1 1 1
Exif.CanonSi.SubjectDistance Short 1 0 0 m
Exif.CanonSi.ApertureValue Short 1 128 F4
Exif.CanonSi.ShutterSpeedValue Short 1 172 1/40 s
Exif.CanonSi.MeasuredEV2 Short 1 124 9.50
Exif.CanonSi.BulbDuration Short 1 0 0
Exif.CanonSi.CameraType Short 1 248 EOS High-end
Exif.CanonSi.AutoRotate Short 1 65535 65535
Exif.CanonSi.AutoRotate Short 1 65535 (65535)
Exif.CanonSi.NDFilter Short 1 65535 n/a
Exif.CanonSi.SelfTimer2 Short 1 65535 n/a
Exif.CanonSi.FlashOutput Short 1 0 0
Exif.CanonFi.FileNumber Long 1 0 (0)
Exif.CanonFi.BracketMode SShort 1 0 Off
Exif.CanonFi.BracketValue SShort 1 0 0
Exif.CanonFi.BracketShotNumber SShort 1 0 0
Exif.CanonFi.RawJpgQuality SShort 1 0 (0)
Exif.CanonFi.RawJpgQuality SShort 1 0 unkown
Exif.CanonFi.RawJpgSize SShort 1 0 Large
Exif.CanonFi.NoiseReduction SShort 1 -1 (-1)
Exif.CanonFi.WBBracketMode SShort 1 0 Off
@@ -112,6 +119,7 @@ Exif.CanonPr.DigitalGain SShort 1 0 0
Exif.CanonPr.WBShiftAB SShort 1 0 0
Exif.CanonPr.WBShiftGM SShort 1 0 0
Exif.Canon.FocalLength Short 4 0 105 28511 61642 105.0 mm
Exif.Canon.CanonFlashInfo Short 4 0 0 0 0 0 0 0 0
Exif.Canon.ImageType Ascii 13 Canon EOS 6D Canon EOS 6D
Exif.Canon.FirmwareVersion Ascii 24 Firmware Version 1.1.6 Firmware Version 1.1.6
Exif.Canon.OwnerName Ascii 32
@@ -161,13 +169,23 @@ Exif.Canon.VRDOffset Long 1 0 0
Exif.Canon.SensorInfo Short 17 34 5568 3708 1 1 84 50 5555 3697 0 0 0 0 0 0 0 0 34 5568 3708 1 1 84 50 5555 3697 0 0 0 0 0 0 0 0
Exif.Canon.PictureStyleUserDef Short 3 135 135 135 Auto
Exif.Canon.CustomPictureStyleFileName Ascii 32
Exif.Canon.AFMicroAdj Long 11 44 0 0 10 4294967295 0 10 0 10 0 10 44 0 0 10 4294967295 0 10 0 10 0 10
Exif.CanonAfMiAdj.AFMicroAdjMode SLong 1 0 Disable
Exif.CanonAfMiAdj.AFMicroAdjValue SLong 1 0 0
Exif.Canon.VignettingCorr Undefined 456 0 33 200 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 150 25 96 21 64 14 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 105 0 0 0 0 33 200 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 150 25 96 21 64 14 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 105 0 0 0
Exif.Canon.VignettingCorr2 Long 7 28 0 1 0 0 0 0 28 0 1 0 0 0 0
Exif.Canon.LightingOpt Long 7 28 1 3 0 1 0 0 28 1 3 0 1 0 0
Exif.Canon.AmbienceInfo Long 7 28 0 0 0 0 2147483647 0 28 0 0 0 0 2147483647 0
Exif.Canon.MultiExp Long 5 20 0 0 0 1 20 0 0 0 1
Exif.Canon.HDRInfo Long 9 36 0 0 0 0 0 0 0 0 36 0 0 0 0 0 0 0 0
Exif.CanonVigCor2.PeripheralLightingSetting SLong 1 0 Off
Exif.CanonVigCor2.ChromaticAberrationSetting SLong 1 0 Off
Exif.CanonLiOp.PeripheralIlluminationCorr SLong 1 1 On
Exif.CanonLiOp.AutoLightingOptimizer SLong 1 3 Off
Exif.CanonLiOp.HighlightTonePriority SLong 1 0 Off
Exif.CanonLiOp.LongExposureNoiseReduction SLong 1 1 Auto
Exif.CanonLiOp.HighISONoiseReduction SLong 1 0 Standard
Exif.CanonLe.LensSerialNumber SLong 1 0 0
Exif.CanonAm.AmbienceSelection SLong 1 0 Standard
Exif.CanonMe.MultiExposure SLong 1 0 Off
Exif.CanonMe.MultiExposureControl SLong 1 0 Additive
Exif.CanonMe.MultiExposureShots SLong 1 0 Off
Exif.CanonHdr.HDR SLong 1 0 Off
Exif.CanonHdr.HDREffect SLong 1 0 Natural
Exif.Photo.SubSecTime Ascii 3 06 06
Exif.Photo.SubSecTimeOriginal Ascii 3 06 06
Exif.Photo.SubSecTimeDigitized Ascii 3 06 06
test/data/test_reference_files/exiv2-pr317.exv.out
+20 -7
View File
@@ -55,36 +55,44 @@ Exif.CanonCs.MinAperture Short 1 285 F22
Exif.CanonCs.FlashActivity Short 1 65535 (65535)
Exif.CanonCs.FlashDetails Short 1 0
Exif.CanonCs.FocusContinuous Short 1 1 Continuous
Exif.CanonCs.AESetting Short 1 65535 (65535)
Exif.CanonCs.AESetting Short 1 65535 n/a
Exif.CanonCs.ImageStabilization Short 1 257 On (2)
Exif.CanonCs.DisplayAperture Short 1 116 116
Exif.CanonCs.ZoomSourceWidth Short 1 6000 6000
Exif.CanonCs.ZoomTargetWidth Short 1 6000 6000
Exif.CanonCs.SpotMeteringMode Short 1 0 Center
Exif.CanonCs.PhotoEffect Short 1 65535 (65535)
Exif.CanonCs.PhotoEffect Short 1 65535 n/a
Exif.CanonCs.ManualFlashOutput Short 1 0 n/a
Exif.CanonCs.ColorTone Short 1 0 0
Exif.CanonCs.SRAWQuality Short 1 65535 (65535)
Exif.Canon.CanonFlashInfo Short 4 0 0 0 0 0 0 0 0
Exif.CanonSi.AutoISO Short 1 0 100
Exif.CanonSi.ISOSpeed Short 1 160 100
Exif.CanonSi.MeasuredEV Short 1 193 11.03
Exif.CanonSi.TargetAperture Short 1 192 F8
Exif.CanonSi.TargetShutterSpeed Short 1 170 1/40 s
Exif.CanonSi.ExposureCompensation Short 1 65524 65524
Exif.CanonSi.WhiteBalance Short 1 0 Auto
Exif.CanonSi.SlowShutter Short 1 0 Off
Exif.CanonSi.Sequence Short 1 0 0
Exif.CanonSi.OpticalZoomCode Short 1 0 0
Exif.CanonSi.CameraTemperature Short 1 0 --
Exif.CanonSi.FlashGuideNumber Short 1 0 0
Exif.CanonSi.AFPointUsed Short 1 0 0 focus points; none used
Exif.CanonSi.FlashBias Short 1 0 0 EV
Exif.CanonSi.AutoExposureBracketing Short 1 0 Off
Exif.CanonSi.AEBBracketValue Short 1 0 0
Exif.CanonSi.ControlMode Short 1 1 1
Exif.CanonSi.SubjectDistance Short 1 0 0 m
Exif.CanonSi.ApertureValue Short 1 192 F8
Exif.CanonSi.ShutterSpeedValue Short 1 173 1/42 s
Exif.CanonSi.MeasuredEV2 Short 1 0 -6.00
Exif.CanonSi.BulbDuration Short 1 0 0
Exif.CanonSi.CameraType Short 1 250 Compact
Exif.CanonSi.AutoRotate Short 1 0 0
Exif.CanonSi.AutoRotate Short 1 0 None
Exif.CanonSi.NDFilter Short 1 65535 n/a
Exif.CanonSi.SelfTimer2 Short 1 0 Selftimer 2s
Exif.CanonSi.FlashOutput Short 1 0 0
Exif.Canon.ImageType Ascii 18 IMG:EOS M100 JPEG IMG:EOS M100 JPEG
Exif.Canon.FirmwareVersion Ascii 22 Firmware Version 1.00 Firmware Version 1.00
Exif.Canon.FileNumber Long 1 1000054 100-0054
@@ -138,10 +146,15 @@ Exif.Canon.MeasuredColor Short 6 12 1588 1024 1024 21
Exif.Canon.VRDOffset Long 1 0 0
Exif.Canon.PictureStyleUserDef Short 3 135 135 135 Auto
Exif.Canon.CustomPictureStyleFileName Ascii 32
Exif.Canon.VignettingCorr2 Long 10 40 0 1 0 1 1 1 0 1 0 40 0 1 0 1 1 1 0 1 0
Exif.Canon.LightingOpt Long 13 52 0 0 0 1 1 1 1 1 1 0 0 0 52 0 0 0 1 1 1 1 1 1 0 0 0
Exif.Canon.AmbienceInfo Long 8 32 0 0 0 0 0 0 1 32 0 0 0 0 0 0 1
Exif.Canon.FilterInfo Long 53 212 7 1 20 1 257 1 4294967295 2 20 1 513 1 4294967295 3 20 1 769 1 4294967295 4 56 4 1025 1 4294967295 1026 1 4294967295 1027 1 4294967295 1028 1 4294967295 5 20 1 1281 1 4294967295 6 20 1 1537 1 4294967295 7 20 1 1793 1 4294967295 212 7 1 20 1 257 1 4294967295 2 20 1 513 1 4294967295 3 20 1 769 1 4294967295 4 56 4 1025 1 4294967295 1026 1 4294967295 1027 1 4294967295 1028 1 4294967295 5 20 1 1281 1 4294967295 6 20 1 1537 1 4294967295 7 20 1 1793 1 4294967295
Exif.CanonVigCor2.PeripheralLightingSetting SLong 1 1 On
Exif.CanonVigCor2.ChromaticAberrationSetting SLong 1 1 On
Exif.CanonVigCor2.DistortionCorrectionSetting SLong 1 0 Off
Exif.CanonLiOp.PeripheralIlluminationCorr SLong 1 0 Off
Exif.CanonLiOp.AutoLightingOptimizer SLong 1 0 Standard
Exif.CanonLiOp.HighlightTonePriority SLong 1 0 Off
Exif.CanonLiOp.LongExposureNoiseReduction SLong 1 1 Auto
Exif.CanonLiOp.HighISONoiseReduction SLong 1 1 Low
Exif.CanonAm.AmbienceSelection SLong 1 0 Standard
Exif.Photo.UserComment Undefined 264
Exif.Photo.SubSecTime Ascii 3 40 40
Exif.Photo.SubSecTimeOriginal Ascii 3 40 40
test/data/test_reference_files/issue_1763_poc.exv.out
+10 -3
View File
File diff suppressed because one or more lines are too long
test/data/test_reference_files/issue_1782_canon_lens_sigma_30mm_f1.4_DC_DN_C.exv.out
+27 -11
View File
@@ -59,37 +59,45 @@ Exif.CanonCs.MinAperture Short 1 256 F16
Exif.CanonCs.FlashActivity Short 1 0 Did not fire
Exif.CanonCs.FlashDetails Short 1 8 E-TTL
Exif.CanonCs.FocusContinuous Short 1 65535 (65535)
Exif.CanonCs.AESetting Short 1 65535 (65535)
Exif.CanonCs.AESetting Short 1 65535 n/a
Exif.CanonCs.ImageStabilization Short 1 65535 (65535)
Exif.CanonCs.DisplayAperture Short 1 0 0
Exif.CanonCs.ZoomSourceWidth Short 1 0 0
Exif.CanonCs.ZoomTargetWidth Short 1 0 0
Exif.CanonCs.SpotMeteringMode Short 1 65535 (65535)
Exif.CanonCs.PhotoEffect Short 1 65535 (65535)
Exif.CanonCs.SpotMeteringMode Short 1 65535 n/a
Exif.CanonCs.PhotoEffect Short 1 65535 n/a
Exif.CanonCs.ManualFlashOutput Short 1 0 n/a
Exif.CanonCs.ColorTone Short 1 0 0
Exif.CanonCs.SRAWQuality Short 1 0 n/a
Exif.Canon.FocalLength Short 4 0 30 25518 18461 30.0 mm
Exif.Canon.CanonFlashInfo Short 4 100 0 0 0 100 0 0 0
Exif.CanonSi.AutoISO Short 1 0 100
Exif.CanonSi.ISOSpeed Short 1 160 100
Exif.CanonSi.MeasuredEV Short 1 308 14.63
Exif.CanonSi.TargetAperture Short 1 128 F4
Exif.CanonSi.TargetShutterSpeed Short 1 340 1/1625 s
Exif.CanonSi.ExposureCompensation Short 1 0 0
Exif.CanonSi.WhiteBalance Short 1 0 Auto
Exif.CanonSi.SlowShutter Short 1 3 None
Exif.CanonSi.Sequence Short 1 0 0
Exif.CanonSi.OpticalZoomCode Short 1 8 8
Exif.CanonSi.CameraTemperature Short 1 157 29 °C
Exif.CanonSi.FlashGuideNumber Short 1 0 0
Exif.CanonSi.AFPointUsed Short 1 0 0 focus points; none used
Exif.CanonSi.FlashBias Short 1 0 0 EV
Exif.CanonSi.AutoExposureBracketing Short 1 0 Off
Exif.CanonSi.AEBBracketValue Short 1 0 0
Exif.CanonSi.ControlMode Short 1 1 1
Exif.CanonSi.SubjectDistance Short 1 0 0 m
Exif.CanonSi.ApertureValue Short 1 128 F4
Exif.CanonSi.ShutterSpeedValue Short 1 340 1/1625 s
Exif.CanonSi.MeasuredEV2 Short 1 175 15.88
Exif.CanonSi.BulbDuration Short 1 0 0
Exif.CanonSi.CameraType Short 1 248 EOS High-end
Exif.CanonSi.AutoRotate Short 1 3 3
Exif.CanonSi.AutoRotate Short 1 3 Rotate 270 CW
Exif.CanonSi.NDFilter Short 1 65535 n/a
Exif.CanonSi.SelfTimer2 Short 1 65535 n/a
Exif.CanonSi.FlashOutput Short 1 0 0
Exif.Canon.ImageType Ascii 14 Canon EOS M50 Canon EOS M50
Exif.Canon.FirmwareVersion Ascii 24 Firmware Version 1.0.3 Firmware Version 1.0.3
Exif.Canon.OwnerName Ascii 32 Danny Heijl Danny Heijl
@@ -120,7 +128,7 @@ Exif.CanonFi.FileNumber Long 1 0 (0)
Exif.CanonFi.BracketMode SShort 1 0 Off
Exif.CanonFi.BracketValue SShort 1 0 0
Exif.CanonFi.BracketShotNumber SShort 1 0 0
Exif.CanonFi.RawJpgQuality SShort 1 0 (0)
Exif.CanonFi.RawJpgQuality SShort 1 0 unkown
Exif.CanonFi.RawJpgSize SShort 1 0 Large
Exif.CanonFi.NoiseReduction SShort 1 -1 (-1)
Exif.CanonFi.WBBracketMode SShort 1 0 Off
@@ -158,12 +166,20 @@ Exif.Canon.VRDOffset Long 1 0 0
Exif.Canon.SensorInfo Short 17 34 6288 4056 1 1 276 48 6275 4047 0 0 0 0 0 0 0 0 34 6288 4056 1 1 276 48 6275 4047 0 0 0 0 0 0 0 0
Exif.Canon.PictureStyleUserDef Short 3 135 135 135 Auto
Exif.Canon.CustomPictureStyleFileName Ascii 32
Exif.Canon.AFMicroAdj Long 11 44 0 0 10 4294967295 0 10 0 10 0 10 44 0 0 10 4294967295 0 10 0 10 0 10
Exif.Canon.VignettingCorr2 Long 10 40 0 1 0 1 1 1 1 1 0 40 0 1 0 1 1 1 1 1 0
Exif.Canon.LightingOpt Long 13 52 0 0 0 0 0 1 1 1 1 1 0 0 52 0 0 0 0 0 1 1 1 1 1 0 0
Exif.Canon.AmbienceInfo Long 8 32 0 0 0 2147483647 0 1 1 32 0 0 0 2147483647 0 1 1
Exif.Canon.FilterInfo Long 53 212 7 1 20 1 257 1 4294967295 2 20 1 513 1 4294967295 3 20 1 769 1 4294967295 4 56 4 1025 1 4294967295 1026 1 0 1027 1 0 1028 1 0 5 20 1 1281 1 4294967295 6 20 1 1537 1 4294967295 7 20 1 1793 1 4294967295 212 7 1 20 1 257 1 4294967295 2 20 1 513 1 4294967295 3 20 1 769 1 4294967295 4 56 4 1025 1 4294967295 1026 1 0 1027 1 0 1028 1 0 5 20 1 1281 1 4294967295 6 20 1 1537 1 4294967295 7 20 1 1793 1 4294967295
Exif.Canon.HDRInfo Long 9 36 0 0 0 0 0 0 0 0 36 0 0 0 0 0 0 0 0
Exif.CanonAfMiAdj.AFMicroAdjMode SLong 1 0 Disable
Exif.CanonAfMiAdj.AFMicroAdjValue SLong 1 0 0
Exif.CanonVigCor2.PeripheralLightingSetting SLong 1 1 On
Exif.CanonVigCor2.ChromaticAberrationSetting SLong 1 1 On
Exif.CanonVigCor2.DistortionCorrectionSetting SLong 1 1 On
Exif.CanonLiOp.PeripheralIlluminationCorr SLong 1 0 Off
Exif.CanonLiOp.AutoLightingOptimizer SLong 1 0 Standard
Exif.CanonLiOp.HighlightTonePriority SLong 1 0 Off
Exif.CanonLiOp.LongExposureNoiseReduction SLong 1 0 Off
Exif.CanonLiOp.HighISONoiseReduction SLong 1 0 Standard
Exif.CanonLe.LensSerialNumber SLong 1 0 0
Exif.CanonAm.AmbienceSelection SLong 1 0 Standard
Exif.CanonHdr.HDR SLong 1 0 Off
Exif.CanonHdr.HDREffect SLong 1 0 Natural
Exif.Photo.UserComment Undefined 264
Exif.Photo.SubSecTime Ascii 3 40 40
Exif.Photo.SubSecTimeOriginal Ascii 3 40 40
test/data/test_reference_files/issue_1838_poc.crw.out
+8 -1
View File
@@ -12,20 +12,27 @@ Exif.CanonSi.ISOSpeed Short 1 513 209285
Exif.CanonSi.MeasuredEV Short 1 1027 37.09
Exif.CanonSi.TargetAperture Short 1 1541 F1.8e+07
Exif.CanonSi.TargetShutterSpeed Short 1 2055 1 s
Exif.CanonSi.ExposureCompensation Short 1 2569 2569
Exif.CanonSi.WhiteBalance Short 1 65291 (65291)
Exif.CanonSi.SlowShutter Short 1 196 (196)
Exif.CanonSi.Sequence Short 1 4277 4277
Exif.CanonSi.OpticalZoomCode Short 1 512 512
Exif.CanonSi.CameraTemperature Short 1 515 387 °C
Exif.CanonSi.FlashGuideNumber Short 1 772 24
Exif.CanonSi.AFPointUsed Short 1 1285 0 focus points; left, right used
Exif.CanonSi.FlashBias Short 1 1028 (1028)
Exif.CanonSi.AutoExposureBracketing Short 1 0 Off
Exif.CanonSi.AEBBracketValue Short 1 32001 32001
Exif.CanonSi.ControlMode Short 1 513 513
Exif.CanonSi.SubjectDistance Short 1 3 0.03 m
Exif.CanonSi.ApertureValue Short 1 4613 F5e+21
Exif.CanonSi.ShutterSpeedValue Short 1 12577 1 s
Exif.CanonSi.MeasuredEV2 Short 1 1601 194.12
Exif.CanonSi.BulbDuration Short 1 20755 2075
Exif.CanonSi.CameraType Short 1 28962 (28962)
Exif.CanonSi.AutoRotate Short 1 12820 12820
Exif.CanonSi.AutoRotate Short 1 12820 (12820)
Exif.CanonSi.NDFilter Short 1 37249 (37249)
Exif.CanonSi.SelfTimer2 Short 1 2209 (2209)
Exif.CanonSi.FlashOutput Short 1 61649 61649
Exif.Photo.FNumber Rational 1 1/0 (1/0)
Exif.Photo.ExposureTime Rational 1 1/1 1 s
test/data/test_reference_files/smiley2.jpg.out
+5
View File
@@ -59,19 +59,24 @@ Exif.CanonCs.ZoomSourceWidth Short 1 2272 2272
Exif.CanonCs.ZoomTargetWidth Short 1 2272 2272
Exif.CanonCs.SpotMeteringMode Short 1 0 Center
Exif.Canon.FocalLength Short 4 2 682 286 215 21.3 mm
Exif.Canon.CanonFlashInfo Short 4 0 0 0 0 0 0 0 0
Exif.CanonSi.AutoISO Short 1 0 100
Exif.CanonSi.ISOSpeed Short 1 128 50
Exif.CanonSi.MeasuredEV Short 1 227 12.09
Exif.CanonSi.TargetAperture Short 1 149 F5
Exif.CanonSi.TargetShutterSpeed Short 1 202 1/79 s
Exif.CanonSi.ExposureCompensation Short 1 0 0
Exif.CanonSi.WhiteBalance Short 1 0 Auto
Exif.CanonSi.SlowShutter Short 1 0 Off
Exif.CanonSi.Sequence Short 1 0 0
Exif.CanonSi.OpticalZoomCode Short 1 6 6
Exif.CanonSi.CameraTemperature Short 1 0 --
Exif.CanonSi.FlashGuideNumber Short 1 0 0
Exif.CanonSi.AFPointUsed Short 1 12291 3 focus points; center, right used
Exif.CanonSi.FlashBias Short 1 0 0 EV
Exif.CanonSi.AutoExposureBracketing Short 1 0 Off
Exif.CanonSi.AEBBracketValue Short 1 0 0
Exif.CanonSi.ControlMode Short 1 1 1
Exif.CanonSi.SubjectDistance Short 1 7368 73.68 m
Exif.CanonSi.ApertureValue Short 1 149 F5
Exif.CanonSi.ShutterSpeedValue Short 1 205 1/85 s
test/data/test_reference_files/template.exv.out
+13 -6
View File
File diff suppressed because one or more lines are too long
test/data/test_reference_files/test_issue_981a.exv.out
+14 -6
View File
@@ -51,37 +51,45 @@ Exif.CanonCs.MinAperture Short 1 340 F40
Exif.CanonCs.FlashActivity Short 1 0 Did not fire
Exif.CanonCs.FlashDetails Short 1 0
Exif.CanonCs.FocusContinuous Short 1 65535 (65535)
Exif.CanonCs.AESetting Short 1 65535 (65535)
Exif.CanonCs.AESetting Short 1 65535 n/a
Exif.CanonCs.ImageStabilization Short 1 65535 (65535)
Exif.CanonCs.DisplayAperture Short 1 0 0
Exif.CanonCs.ZoomSourceWidth Short 1 0 0
Exif.CanonCs.ZoomTargetWidth Short 1 0 0
Exif.CanonCs.SpotMeteringMode Short 1 65535 (65535)
Exif.CanonCs.PhotoEffect Short 1 65535 (65535)
Exif.CanonCs.SpotMeteringMode Short 1 65535 n/a
Exif.CanonCs.PhotoEffect Short 1 65535 n/a
Exif.CanonCs.ManualFlashOutput Short 1 0 n/a
Exif.CanonCs.ColorTone Short 1 0 0
Exif.CanonCs.SRAWQuality Short 1 65535 (65535)
Exif.Canon.FocalLength Short 4 0 200 63601 17271 200.0 mm
Exif.Canon.CanonFlashInfo Short 4 0 0 0 0 0 0 0 0
Exif.CanonSi.AutoISO Short 1 0 100
Exif.CanonSi.ISOSpeed Short 1 288 1600
Exif.CanonSi.MeasuredEV Short 1 0 5.00
Exif.CanonSi.TargetAperture Short 1 172 F6.3
Exif.CanonSi.TargetShutterSpeed Short 1 108 1/10 s
Exif.CanonSi.ExposureCompensation Short 1 12 12
Exif.CanonSi.WhiteBalance Short 1 1 Daylight
Exif.CanonSi.SlowShutter Short 1 3 None
Exif.CanonSi.Sequence Short 1 0 0
Exif.CanonSi.OpticalZoomCode Short 1 8 8
Exif.CanonSi.CameraTemperature Short 1 153 25 °C
Exif.CanonSi.FlashGuideNumber Short 1 0 0
Exif.CanonSi.AFPointUsed Short 1 0 0 focus points; none used
Exif.CanonSi.FlashBias Short 1 0 0 EV
Exif.CanonSi.AutoExposureBracketing Short 1 0 Off
Exif.CanonSi.AEBBracketValue Short 1 0 0
Exif.CanonSi.ControlMode Short 1 1 1
Exif.CanonSi.SubjectDistance Short 1 0 0 m
Exif.CanonSi.ApertureValue Short 1 168 F6.3
Exif.CanonSi.ShutterSpeedValue Short 1 108 1/10 s
Exif.CanonSi.MeasuredEV2 Short 1 82 4.25
Exif.CanonSi.BulbDuration Short 1 0 0
Exif.CanonSi.CameraType Short 1 248 EOS High-end
Exif.CanonSi.AutoRotate Short 1 65535 65535
Exif.CanonSi.AutoRotate Short 1 65535 (65535)
Exif.CanonSi.NDFilter Short 1 65535 n/a
Exif.CanonSi.SelfTimer2 Short 1 65535 n/a
Exif.CanonSi.FlashOutput Short 1 0 0
Exif.Canon.ImageType Ascii 15 Canon EOS 500D Canon EOS 500D
Exif.Canon.FirmwareVersion Ascii 24 Firmware Version 1.1.1 Firmware Version 1.1.1
Exif.Canon.OwnerName Ascii 32
@@ -111,7 +119,7 @@ Exif.CanonFi.FileNumber Long 1 0 (0)
Exif.CanonFi.BracketMode SShort 1 0 Off
Exif.CanonFi.BracketValue SShort 1 0 0
Exif.CanonFi.BracketShotNumber SShort 1 0 0
Exif.CanonFi.RawJpgQuality SShort 1 0 (0)
Exif.CanonFi.RawJpgQuality SShort 1 0 unkown
Exif.CanonFi.RawJpgSize SShort 1 0 Large
Exif.CanonFi.NoiseReduction SShort 1 3 On
Exif.CanonFi.WBBracketMode SShort 1 0 Off
@@ -149,7 +157,7 @@ Exif.Canon.ColorData Short 1251 7 804 1024 1024 466
Exif.Canon.PictureStyleUserDef Short 3 129 129 129 Standard
Exif.Canon.CustomPictureStyleFileName Ascii 32
Exif.Canon.VignettingCorr Undefined 116 0 16 116 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 92 18 144 18 96 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 16 116 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 92 18 144 18 96 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Exif.Canon.VignettingCorr2 Long 6 24 0 1 0 1 0 24 0 1 0 1 0
Exif.CanonVigCor2.PeripheralLightingSetting SLong 1 0 Off
Exif.Photo.UserComment Undefined 264
Exif.Photo.SubSecTime Ascii 3 34 34
Exif.Photo.SubSecTimeOriginal Ascii 3 34 34
test/data/test_reference_files/test_issue_981b.exv.out
+48 -11
View File
File diff suppressed because one or more lines are too long
test/data/test_reference_files/test_issue_981c.exv.out
+48 -11
View File
File diff suppressed because one or more lines are too long
test/data/test_reference_files/test_issue_981d.exv.out
+48 -11
View File
File diff suppressed because one or more lines are too long