diff --git a/test/data/test_reference_files/FujiTagsDRangeAutoRating1.jpg.out b/test/data/test_reference_files/FujiTagsDRangeAutoRating1.jpg.out index 70691fe4..d2f76ee3 100644 --- a/test/data/test_reference_files/FujiTagsDRangeAutoRating1.jpg.out +++ b/test/data/test_reference_files/FujiTagsDRangeAutoRating1.jpg.out @@ -29,19 +29,38 @@ Exif.Photo.FocalLength Rational 1 5000/100 50.0 mm Exif.Photo.MakerNote Undefined 1004 70 85 74 73 70 73 76 77 12 0 0 0 64 0 32 0 2 0 6 0 0 0 18 3 0 0 10 16 9 0 2 0 0 0 24 3 0 0 11 16 3 0 1 0 0 0 0 1 0 0 14 16 3 0 1 0 0 0 0 0 0 0 34 16 3 0 1 0 0 0 0 0 0 0 35 16 3 0 2 0 0 0 17 4 17 4 37 16 4 0 1 0 0 0 8 0 0 0 38 16 3 0 1 0 0 0 64 0 0 0 43 16 3 0 1 0 0 0 17 0 0 0 44 16 4 0 1 0 0 0 0 0 0 0 45 16 4 0 1 0 0 0 0 0 0 0 46 16 4 0 1 0 0 0 2 1 0 0 50 16 3 0 1 0 0 0 1 0 0 0 64 16 9 0 1 0 0 0 0 0 0 0 65 16 9 0 1 0 0 0 0 0 0 0 69 16 4 0 1 0 0 0 1 0 0 0 70 16 4 0 1 0 0 0 1 0 0 0 71 16 9 0 1 0 0 0 0 0 0 0 72 16 9 0 1 0 0 0 0 0 0 0 77 16 3 0 1 0 0 0 0 0 0 0 80 16 3 0 1 0 0 0 0 0 0 0 3 17 4 0 1 0 0 0 0 0 0 0 0 18 3 0 1 0 0 0 0 0 0 0 3 19 3 0 1 0 0 0 0 0 0 0 4 19 3 0 1 0 0 0 0 0 0 0 5 19 3 0 1 0 0 0 0 0 0 0 8 20 7 0 4 0 0 0 48 51 48 48 9 20 7 0 4 0 0 0 48 49 48 48 10 20 3 0 1 0 0 0 0 0 0 0 34 20 3 0 3 0 0 0 32 3 0 0 36 20 3 0 1 0 0 0 0 16 0 0 48 20 7 0 129 0 0 0 38 3 0 0 49 20 4 0 1 0 0 0 1 0 0 0 54 20 3 0 1 0 0 0 0 0 0 0 56 20 3 0 1 0 0 0 0 128 0 0 66 20 4 0 1 0 0 0 0 0 0 0 67 20 3 0 1 0 0 0 0 0 0 0 69 20 3 0 1 0 0 0 1 0 0 0 70 20 4 0 1 0 0 0 35 0 0 0 71 20 2 0 10 0 0 0 168 3 0 0 72 20 2 0 10 0 0 0 178 3 0 0 0 65 3 0 1 0 0 0 0 0 0 0 0 66 3 0 1 0 0 0 0 0 0 0 0 19 3 0 1 0 0 0 0 0 0 0 3 16 3 0 1 0 0 0 0 0 0 0 0 17 3 0 1 0 0 0 0 0 0 0 0 20 3 0 1 0 0 0 1 0 0 0 2 19 3 0 1 0 0 0 0 0 0 0 1 20 3 0 1 0 0 0 0 0 0 0 16 16 3 0 1 0 0 0 0 128 0 0 17 16 10 0 1 0 0 0 188 3 0 0 33 16 3 0 1 0 0 0 1 0 0 0 1 19 3 0 1 0 0 0 0 0 0 0 7 20 5 0 1 0 0 0 196 3 0 0 6 20 5 0 1 0 0 0 204 3 0 0 5 20 5 0 1 0 0 0 212 3 0 0 4 20 5 0 1 0 0 0 220 3 0 0 49 16 3 0 1 0 0 0 0 3 0 0 0 16 2 0 8 0 0 0 228 3 0 0 1 17 3 0 1 0 0 0 0 0 0 0 1 16 3 0 1 0 0 0 3 0 0 0 48 16 3 0 1 0 0 0 0 0 0 0 0 0 7 0 4 0 0 0 48 49 51 48 2 16 3 0 1 0 0 0 0 0 0 0 0 0 0 0 49 55 48 56 53 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 88 45 84 51 95 48 49 48 48 0 88 45 84 51 95 48 49 48 48 0 0 0 0 0 100 0 0 0 200 0 0 0 100 0 0 0 200 0 0 0 100 0 0 0 136 19 0 0 100 0 0 0 136 19 0 0 100 0 0 0 78 79 82 77 65 76 32 0 70 85 74 73 70 73 76 77 12 0 0 0 64 0 32 0 2 0 6 0 0 0 18 3 0 0 10 16 9 0 2 0 0 0 24 3 0 0 11 16 3 0 1 0 0 0 0 1 0 0 14 16 3 0 1 0 0 0 0 0 0 0 34 16 3 0 1 0 0 0 0 0 0 0 35 16 3 0 2 0 0 0 17 4 17 4 37 16 4 0 1 0 0 0 8 0 0 0 38 16 3 0 1 0 0 0 64 0 0 0 43 16 3 0 1 0 0 0 17 0 0 0 44 16 4 0 1 0 0 0 0 0 0 0 45 16 4 0 1 0 0 0 0 0 0 0 46 16 4 0 1 0 0 0 2 1 0 0 50 16 3 0 1 0 0 0 1 0 0 0 64 16 9 0 1 0 0 0 0 0 0 0 65 16 9 0 1 0 0 0 0 0 0 0 69 16 4 0 1 0 0 0 1 0 0 0 70 16 4 0 1 0 0 0 1 0 0 0 71 16 9 0 1 0 0 0 0 0 0 0 72 16 9 0 1 0 0 0 0 0 0 0 77 16 3 0 1 0 0 0 0 0 0 0 80 16 3 0 1 0 0 0 0 0 0 0 3 17 4 0 1 0 0 0 0 0 0 0 0 18 3 0 1 0 0 0 0 0 0 0 3 19 3 0 1 0 0 0 0 0 0 0 4 19 3 0 1 0 0 0 0 0 0 0 5 19 3 0 1 0 0 0 0 0 0 0 8 20 7 0 4 0 0 0 48 51 48 48 9 20 7 0 4 0 0 0 48 49 48 48 10 20 3 0 1 0 0 0 0 0 0 0 34 20 3 0 3 0 0 0 32 3 0 0 36 20 3 0 1 0 0 0 0 16 0 0 48 20 7 0 129 0 0 0 38 3 0 0 49 20 4 0 1 0 0 0 1 0 0 0 54 20 3 0 1 0 0 0 0 0 0 0 56 20 3 0 1 0 0 0 0 128 0 0 66 20 4 0 1 0 0 0 0 0 0 0 67 20 3 0 1 0 0 0 0 0 0 0 69 20 3 0 1 0 0 0 1 0 0 0 70 20 4 0 1 0 0 0 35 0 0 0 71 20 2 0 10 0 0 0 168 3 0 0 72 20 2 0 10 0 0 0 178 3 0 0 0 65 3 0 1 0 0 0 0 0 0 0 0 66 3 0 1 0 0 0 0 0 0 0 0 19 3 0 1 0 0 0 0 0 0 0 3 16 3 0 1 0 0 0 0 0 0 0 0 17 3 0 1 0 0 0 0 0 0 0 0 20 3 0 1 0 0 0 1 0 0 0 2 19 3 0 1 0 0 0 0 0 0 0 1 20 3 0 1 0 0 0 0 0 0 0 16 16 3 0 1 0 0 0 0 128 0 0 17 16 10 0 1 0 0 0 188 3 0 0 33 16 3 0 1 0 0 0 1 0 0 0 1 19 3 0 1 0 0 0 0 0 0 0 7 20 5 0 1 0 0 0 196 3 0 0 6 20 5 0 1 0 0 0 204 3 0 0 5 20 5 0 1 0 0 0 212 3 0 0 4 20 5 0 1 0 0 0 220 3 0 0 49 16 3 0 1 0 0 0 0 3 0 0 0 16 2 0 8 0 0 0 228 3 0 0 1 17 3 0 1 0 0 0 0 0 0 0 1 16 3 0 1 0 0 0 3 0 0 0 48 16 3 0 1 0 0 0 0 0 0 0 0 0 7 0 4 0 0 0 48 49 51 48 2 16 3 0 1 0 0 0 0 0 0 0 0 0 0 0 49 55 48 56 53 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 88 45 84 51 95 48 49 48 48 0 88 45 84 51 95 48 49 48 48 0 0 0 0 0 100 0 0 0 200 0 0 0 100 0 0 0 200 0 0 0 100 0 0 0 136 19 0 0 100 0 0 0 136 19 0 0 100 0 0 0 78 79 82 77 65 76 32 0 Exif.MakerNote.Offset Long 1 870 870 Exif.MakerNote.ByteOrder Ascii 3 II II +Exif.Fujifilm.WhiteBalanceFineTune SLong 2 0 0 R: 0 B: 0 +Exif.Fujifilm.NoiseReduction Short 1 256 n/a +Exif.Fujifilm.HighIsoNoiseReduction Short 1 0 0 (normal) +Exif.Fujifilm.FocusArea Short 1 0 Wide +Exif.Fujifilm.FocusPoint Short 2 1041 1041 1041 1041 +Exif.Fujifilm.FocusPrioritySetting Short 1 17 17 +Exif.Fujifilm.FocusSetting Long 1 0 0 +Exif.Fujifilm.ContinuousFocusSetting Long 1 258 258 +Exif.Fujifilm.ExposureCount Short 1 1 1 Exif.Fujifilm.ShadowTone SLong 1 0 0 Exif.Fujifilm.HighlightTone SLong 1 0 0 +Exif.Fujifilm.LensModulationOptimizer Long 1 1 On +Exif.Fujifilm.GrainEffectRoughness SLong 1 0 Off +Exif.Fujifilm.ColorChromeEffect SLong 1 0 Off Exif.Fujifilm.CropMode Short 1 0 None +Exif.Fujifilm.ShutterType Short 1 0 Mechanical +Exif.Fujifilm.DriveSetting Long 1 0 Single +Exif.Fujifilm.ImageStabilization Short 3 0 0 0 0 0 0 Exif.Fujifilm.Rating Long 1 1 1 +Exif.Fujifilm.ImageGeneration Short 1 0 Original Image +Exif.Fujifilm.ImageNumber Short 1 32768 32768 Exif.Fujifilm.DRangePriority Short 1 0 Auto Exif.Fujifilm.DRangePriorityAuto Short 1 1 Weak +Exif.Fujifilm.FacesDetected Short 1 0 0 +Exif.Fujifilm.NumberFaceElements Short 1 0 0 Exif.Fujifilm.BlurWarning Short 1 0 Off -Exif.Fujifilm.Color Short 1 0 Normal +Exif.Fujifilm.Color Short 1 0 0 (normal) Exif.Fujifilm.Continuous Short 1 0 Off Exif.Fujifilm.DynamicRange Short 1 1 Standard Exif.Fujifilm.ExposureWarning Short 1 0 Off -Exif.Fujifilm.FilmMode Short 1 0 F0/Standard (Provia) -Exif.Fujifilm.FlashMode Short 1 32768 (32768) +Exif.Fujifilm.FilmMode Short 1 0 PROVIA (F0/Standard) +Exif.Fujifilm.FlashMode Short 1 32768 No flash Exif.Fujifilm.FlashStrength SRational 1 0/100 0/100 Exif.Fujifilm.FocusMode Short 1 1 Manual Exif.Fujifilm.FocusWarning Short 1 0 Off @@ -52,7 +71,7 @@ Exif.Fujifilm.MinFocalLength Rational 1 5000/100 5000/100 Exif.Fujifilm.PictureMode Short 1 768 Manual Exif.Fujifilm.Quality Ascii 8 NORMAL NORMAL Exif.Fujifilm.SequenceNumber Short 1 0 0 -Exif.Fujifilm.Sharpness Short 1 3 Normal +Exif.Fujifilm.Sharpness Short 1 3 0 (normal) Exif.Fujifilm.SlowSync Short 1 0 Off Exif.Fujifilm.Version Undefined 4 48 49 51 48 48 49 51 48 Exif.Fujifilm.WhiteBalance Short 1 0 Auto diff --git a/test/data/test_reference_files/FujiTagsDRangeStrongRating3.jpg.out b/test/data/test_reference_files/FujiTagsDRangeStrongRating3.jpg.out index 96a63691..7899cb57 100644 --- a/test/data/test_reference_files/FujiTagsDRangeStrongRating3.jpg.out +++ b/test/data/test_reference_files/FujiTagsDRangeStrongRating3.jpg.out @@ -29,19 +29,38 @@ Exif.Photo.FocalLength Rational 1 5000/100 50.0 mm Exif.Photo.MakerNote Undefined 1004 70 85 74 73 70 73 76 77 12 0 0 0 64 0 32 0 2 0 6 0 0 0 18 3 0 0 10 16 9 0 2 0 0 0 24 3 0 0 11 16 3 0 1 0 0 0 0 1 0 0 14 16 3 0 1 0 0 0 0 0 0 0 34 16 3 0 1 0 0 0 0 0 0 0 35 16 3 0 2 0 0 0 17 4 17 4 37 16 4 0 1 0 0 0 8 0 0 0 38 16 3 0 1 0 0 0 64 0 0 0 43 16 3 0 1 0 0 0 17 0 0 0 44 16 4 0 1 0 0 0 0 0 0 0 45 16 4 0 1 0 0 0 0 0 0 0 46 16 4 0 1 0 0 0 2 1 0 0 50 16 3 0 1 0 0 0 1 0 0 0 64 16 9 0 1 0 0 0 0 0 0 0 65 16 9 0 1 0 0 0 0 0 0 0 69 16 4 0 1 0 0 0 1 0 0 0 70 16 4 0 1 0 0 0 1 0 0 0 71 16 9 0 1 0 0 0 0 0 0 0 72 16 9 0 1 0 0 0 0 0 0 0 77 16 3 0 1 0 0 0 0 0 0 0 80 16 3 0 1 0 0 0 0 0 0 0 3 17 4 0 1 0 0 0 0 0 0 0 0 18 3 0 1 0 0 0 0 0 0 0 3 19 3 0 1 0 0 0 0 0 0 0 4 19 3 0 1 0 0 0 0 0 0 0 5 19 3 0 1 0 0 0 0 0 0 0 8 20 7 0 4 0 0 0 48 51 48 48 9 20 7 0 4 0 0 0 48 49 48 48 10 20 3 0 1 0 0 0 0 0 0 0 34 20 3 0 3 0 0 0 32 3 0 0 36 20 3 0 1 0 0 0 0 16 0 0 48 20 7 0 129 0 0 0 38 3 0 0 49 20 4 0 1 0 0 0 3 0 0 0 54 20 3 0 1 0 0 0 0 0 0 0 56 20 3 0 1 0 0 0 0 128 0 0 66 20 4 0 1 0 0 0 0 0 0 0 67 20 3 0 1 0 0 0 1 0 0 0 68 20 3 0 1 0 0 0 2 0 0 0 70 20 4 0 1 0 0 0 35 0 0 0 71 20 2 0 10 0 0 0 168 3 0 0 72 20 2 0 10 0 0 0 178 3 0 0 0 65 3 0 1 0 0 0 0 0 0 0 0 66 3 0 1 0 0 0 0 0 0 0 0 19 3 0 1 0 0 0 0 0 0 0 3 16 3 0 1 0 0 0 0 0 0 0 0 17 3 0 1 0 0 0 0 0 0 0 0 20 3 0 1 0 0 0 1 0 0 0 2 19 3 0 1 0 0 0 0 0 0 0 1 20 3 0 1 0 0 0 0 0 0 0 16 16 3 0 1 0 0 0 0 128 0 0 17 16 10 0 1 0 0 0 188 3 0 0 33 16 3 0 1 0 0 0 1 0 0 0 1 19 3 0 1 0 0 0 0 0 0 0 7 20 5 0 1 0 0 0 196 3 0 0 6 20 5 0 1 0 0 0 204 3 0 0 5 20 5 0 1 0 0 0 212 3 0 0 4 20 5 0 1 0 0 0 220 3 0 0 49 16 3 0 1 0 0 0 0 3 0 0 0 16 2 0 8 0 0 0 228 3 0 0 1 17 3 0 1 0 0 0 0 0 0 0 1 16 3 0 1 0 0 0 3 0 0 0 48 16 3 0 1 0 0 0 0 0 0 0 0 0 7 0 4 0 0 0 48 49 51 48 2 16 3 0 1 0 0 0 0 0 0 0 0 0 0 0 49 55 48 56 53 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 88 45 84 51 95 48 49 48 48 0 88 45 84 51 95 48 49 48 48 0 0 0 0 0 100 0 0 0 200 0 0 0 100 0 0 0 200 0 0 0 100 0 0 0 136 19 0 0 100 0 0 0 136 19 0 0 100 0 0 0 78 79 82 77 65 76 32 0 70 85 74 73 70 73 76 77 12 0 0 0 64 0 32 0 2 0 6 0 0 0 18 3 0 0 10 16 9 0 2 0 0 0 24 3 0 0 11 16 3 0 1 0 0 0 0 1 0 0 14 16 3 0 1 0 0 0 0 0 0 0 34 16 3 0 1 0 0 0 0 0 0 0 35 16 3 0 2 0 0 0 17 4 17 4 37 16 4 0 1 0 0 0 8 0 0 0 38 16 3 0 1 0 0 0 64 0 0 0 43 16 3 0 1 0 0 0 17 0 0 0 44 16 4 0 1 0 0 0 0 0 0 0 45 16 4 0 1 0 0 0 0 0 0 0 46 16 4 0 1 0 0 0 2 1 0 0 50 16 3 0 1 0 0 0 1 0 0 0 64 16 9 0 1 0 0 0 0 0 0 0 65 16 9 0 1 0 0 0 0 0 0 0 69 16 4 0 1 0 0 0 1 0 0 0 70 16 4 0 1 0 0 0 1 0 0 0 71 16 9 0 1 0 0 0 0 0 0 0 72 16 9 0 1 0 0 0 0 0 0 0 77 16 3 0 1 0 0 0 0 0 0 0 80 16 3 0 1 0 0 0 0 0 0 0 3 17 4 0 1 0 0 0 0 0 0 0 0 18 3 0 1 0 0 0 0 0 0 0 3 19 3 0 1 0 0 0 0 0 0 0 4 19 3 0 1 0 0 0 0 0 0 0 5 19 3 0 1 0 0 0 0 0 0 0 8 20 7 0 4 0 0 0 48 51 48 48 9 20 7 0 4 0 0 0 48 49 48 48 10 20 3 0 1 0 0 0 0 0 0 0 34 20 3 0 3 0 0 0 32 3 0 0 36 20 3 0 1 0 0 0 0 16 0 0 48 20 7 0 129 0 0 0 38 3 0 0 49 20 4 0 1 0 0 0 3 0 0 0 54 20 3 0 1 0 0 0 0 0 0 0 56 20 3 0 1 0 0 0 0 128 0 0 66 20 4 0 1 0 0 0 0 0 0 0 67 20 3 0 1 0 0 0 1 0 0 0 68 20 3 0 1 0 0 0 2 0 0 0 70 20 4 0 1 0 0 0 35 0 0 0 71 20 2 0 10 0 0 0 168 3 0 0 72 20 2 0 10 0 0 0 178 3 0 0 0 65 3 0 1 0 0 0 0 0 0 0 0 66 3 0 1 0 0 0 0 0 0 0 0 19 3 0 1 0 0 0 0 0 0 0 3 16 3 0 1 0 0 0 0 0 0 0 0 17 3 0 1 0 0 0 0 0 0 0 0 20 3 0 1 0 0 0 1 0 0 0 2 19 3 0 1 0 0 0 0 0 0 0 1 20 3 0 1 0 0 0 0 0 0 0 16 16 3 0 1 0 0 0 0 128 0 0 17 16 10 0 1 0 0 0 188 3 0 0 33 16 3 0 1 0 0 0 1 0 0 0 1 19 3 0 1 0 0 0 0 0 0 0 7 20 5 0 1 0 0 0 196 3 0 0 6 20 5 0 1 0 0 0 204 3 0 0 5 20 5 0 1 0 0 0 212 3 0 0 4 20 5 0 1 0 0 0 220 3 0 0 49 16 3 0 1 0 0 0 0 3 0 0 0 16 2 0 8 0 0 0 228 3 0 0 1 17 3 0 1 0 0 0 0 0 0 0 1 16 3 0 1 0 0 0 3 0 0 0 48 16 3 0 1 0 0 0 0 0 0 0 0 0 7 0 4 0 0 0 48 49 51 48 2 16 3 0 1 0 0 0 0 0 0 0 0 0 0 0 49 55 48 56 53 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 88 45 84 51 95 48 49 48 48 0 88 45 84 51 95 48 49 48 48 0 0 0 0 0 100 0 0 0 200 0 0 0 100 0 0 0 200 0 0 0 100 0 0 0 136 19 0 0 100 0 0 0 136 19 0 0 100 0 0 0 78 79 82 77 65 76 32 0 Exif.MakerNote.Offset Long 1 870 870 Exif.MakerNote.ByteOrder Ascii 3 II II +Exif.Fujifilm.WhiteBalanceFineTune SLong 2 0 0 R: 0 B: 0 +Exif.Fujifilm.NoiseReduction Short 1 256 n/a +Exif.Fujifilm.HighIsoNoiseReduction Short 1 0 0 (normal) +Exif.Fujifilm.FocusArea Short 1 0 Wide +Exif.Fujifilm.FocusPoint Short 2 1041 1041 1041 1041 +Exif.Fujifilm.FocusPrioritySetting Short 1 17 17 +Exif.Fujifilm.FocusSetting Long 1 0 0 +Exif.Fujifilm.ContinuousFocusSetting Long 1 258 258 +Exif.Fujifilm.ExposureCount Short 1 1 1 Exif.Fujifilm.ShadowTone SLong 1 0 0 Exif.Fujifilm.HighlightTone SLong 1 0 0 +Exif.Fujifilm.LensModulationOptimizer Long 1 1 On +Exif.Fujifilm.GrainEffectRoughness SLong 1 0 Off +Exif.Fujifilm.ColorChromeEffect SLong 1 0 Off Exif.Fujifilm.CropMode Short 1 0 None +Exif.Fujifilm.ShutterType Short 1 0 Mechanical +Exif.Fujifilm.DriveSetting Long 1 0 Single +Exif.Fujifilm.ImageStabilization Short 3 0 0 0 0 0 0 Exif.Fujifilm.Rating Long 1 3 3 +Exif.Fujifilm.ImageGeneration Short 1 0 Original Image +Exif.Fujifilm.ImageNumber Short 1 32768 32768 Exif.Fujifilm.DRangePriority Short 1 1 Fixed Exif.Fujifilm.DRangePriorityFixed Short 1 2 Strong +Exif.Fujifilm.FacesDetected Short 1 0 0 +Exif.Fujifilm.NumberFaceElements Short 1 0 0 Exif.Fujifilm.BlurWarning Short 1 0 Off -Exif.Fujifilm.Color Short 1 0 Normal +Exif.Fujifilm.Color Short 1 0 0 (normal) Exif.Fujifilm.Continuous Short 1 0 Off Exif.Fujifilm.DynamicRange Short 1 1 Standard Exif.Fujifilm.ExposureWarning Short 1 0 Off -Exif.Fujifilm.FilmMode Short 1 0 F0/Standard (Provia) -Exif.Fujifilm.FlashMode Short 1 32768 (32768) +Exif.Fujifilm.FilmMode Short 1 0 PROVIA (F0/Standard) +Exif.Fujifilm.FlashMode Short 1 32768 No flash Exif.Fujifilm.FlashStrength SRational 1 0/100 0/100 Exif.Fujifilm.FocusMode Short 1 1 Manual Exif.Fujifilm.FocusWarning Short 1 0 Off @@ -52,7 +71,7 @@ Exif.Fujifilm.MinFocalLength Rational 1 5000/100 5000/100 Exif.Fujifilm.PictureMode Short 1 768 Manual Exif.Fujifilm.Quality Ascii 8 NORMAL NORMAL Exif.Fujifilm.SequenceNumber Short 1 0 0 -Exif.Fujifilm.Sharpness Short 1 3 Normal +Exif.Fujifilm.Sharpness Short 1 3 0 (normal) Exif.Fujifilm.SlowSync Short 1 0 Off Exif.Fujifilm.Version Undefined 4 48 49 51 48 48 49 51 48 Exif.Fujifilm.WhiteBalance Short 1 0 Auto diff --git a/test/data/test_reference_files/FujiTagsDRangeWeakRating2.jpg.out b/test/data/test_reference_files/FujiTagsDRangeWeakRating2.jpg.out index 22c36b66..695bdce3 100644 --- a/test/data/test_reference_files/FujiTagsDRangeWeakRating2.jpg.out +++ b/test/data/test_reference_files/FujiTagsDRangeWeakRating2.jpg.out @@ -29,19 +29,38 @@ Exif.Photo.FocalLength Rational 1 5000/100 50.0 mm Exif.Photo.MakerNote Undefined 1004 70 85 74 73 70 73 76 77 12 0 0 0 64 0 32 0 2 0 6 0 0 0 18 3 0 0 10 16 9 0 2 0 0 0 24 3 0 0 11 16 3 0 1 0 0 0 0 1 0 0 14 16 3 0 1 0 0 0 0 0 0 0 34 16 3 0 1 0 0 0 0 0 0 0 35 16 3 0 2 0 0 0 17 4 17 4 37 16 4 0 1 0 0 0 8 0 0 0 38 16 3 0 1 0 0 0 64 0 0 0 43 16 3 0 1 0 0 0 17 0 0 0 44 16 4 0 1 0 0 0 0 0 0 0 45 16 4 0 1 0 0 0 0 0 0 0 46 16 4 0 1 0 0 0 2 1 0 0 50 16 3 0 1 0 0 0 1 0 0 0 64 16 9 0 1 0 0 0 0 0 0 0 65 16 9 0 1 0 0 0 0 0 0 0 69 16 4 0 1 0 0 0 1 0 0 0 70 16 4 0 1 0 0 0 1 0 0 0 71 16 9 0 1 0 0 0 0 0 0 0 72 16 9 0 1 0 0 0 0 0 0 0 77 16 3 0 1 0 0 0 0 0 0 0 80 16 3 0 1 0 0 0 0 0 0 0 3 17 4 0 1 0 0 0 0 0 0 0 0 18 3 0 1 0 0 0 0 0 0 0 3 19 3 0 1 0 0 0 0 0 0 0 4 19 3 0 1 0 0 0 0 0 0 0 5 19 3 0 1 0 0 0 0 0 0 0 8 20 7 0 4 0 0 0 48 51 48 48 9 20 7 0 4 0 0 0 48 49 48 48 10 20 3 0 1 0 0 0 0 0 0 0 34 20 3 0 3 0 0 0 32 3 0 0 36 20 3 0 1 0 0 0 0 16 0 0 48 20 7 0 129 0 0 0 38 3 0 0 49 20 4 0 1 0 0 0 2 0 0 0 54 20 3 0 1 0 0 0 0 0 0 0 56 20 3 0 1 0 0 0 0 128 0 0 66 20 4 0 1 0 0 0 0 0 0 0 67 20 3 0 1 0 0 0 1 0 0 0 68 20 3 0 1 0 0 0 1 0 0 0 70 20 4 0 1 0 0 0 35 0 0 0 71 20 2 0 10 0 0 0 168 3 0 0 72 20 2 0 10 0 0 0 178 3 0 0 0 65 3 0 1 0 0 0 0 0 0 0 0 66 3 0 1 0 0 0 0 0 0 0 0 19 3 0 1 0 0 0 0 0 0 0 3 16 3 0 1 0 0 0 0 0 0 0 0 17 3 0 1 0 0 0 0 0 0 0 0 20 3 0 1 0 0 0 1 0 0 0 2 19 3 0 1 0 0 0 0 0 0 0 1 20 3 0 1 0 0 0 0 0 0 0 16 16 3 0 1 0 0 0 0 128 0 0 17 16 10 0 1 0 0 0 188 3 0 0 33 16 3 0 1 0 0 0 1 0 0 0 1 19 3 0 1 0 0 0 0 0 0 0 7 20 5 0 1 0 0 0 196 3 0 0 6 20 5 0 1 0 0 0 204 3 0 0 5 20 5 0 1 0 0 0 212 3 0 0 4 20 5 0 1 0 0 0 220 3 0 0 49 16 3 0 1 0 0 0 0 3 0 0 0 16 2 0 8 0 0 0 228 3 0 0 1 17 3 0 1 0 0 0 0 0 0 0 1 16 3 0 1 0 0 0 3 0 0 0 48 16 3 0 1 0 0 0 0 0 0 0 0 0 7 0 4 0 0 0 48 49 51 48 2 16 3 0 1 0 0 0 0 0 0 0 0 0 0 0 49 55 48 56 53 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 88 45 84 51 95 48 49 48 48 0 88 45 84 51 95 48 49 48 48 0 0 0 0 0 100 0 0 0 200 0 0 0 100 0 0 0 200 0 0 0 100 0 0 0 136 19 0 0 100 0 0 0 136 19 0 0 100 0 0 0 78 79 82 77 65 76 32 0 70 85 74 73 70 73 76 77 12 0 0 0 64 0 32 0 2 0 6 0 0 0 18 3 0 0 10 16 9 0 2 0 0 0 24 3 0 0 11 16 3 0 1 0 0 0 0 1 0 0 14 16 3 0 1 0 0 0 0 0 0 0 34 16 3 0 1 0 0 0 0 0 0 0 35 16 3 0 2 0 0 0 17 4 17 4 37 16 4 0 1 0 0 0 8 0 0 0 38 16 3 0 1 0 0 0 64 0 0 0 43 16 3 0 1 0 0 0 17 0 0 0 44 16 4 0 1 0 0 0 0 0 0 0 45 16 4 0 1 0 0 0 0 0 0 0 46 16 4 0 1 0 0 0 2 1 0 0 50 16 3 0 1 0 0 0 1 0 0 0 64 16 9 0 1 0 0 0 0 0 0 0 65 16 9 0 1 0 0 0 0 0 0 0 69 16 4 0 1 0 0 0 1 0 0 0 70 16 4 0 1 0 0 0 1 0 0 0 71 16 9 0 1 0 0 0 0 0 0 0 72 16 9 0 1 0 0 0 0 0 0 0 77 16 3 0 1 0 0 0 0 0 0 0 80 16 3 0 1 0 0 0 0 0 0 0 3 17 4 0 1 0 0 0 0 0 0 0 0 18 3 0 1 0 0 0 0 0 0 0 3 19 3 0 1 0 0 0 0 0 0 0 4 19 3 0 1 0 0 0 0 0 0 0 5 19 3 0 1 0 0 0 0 0 0 0 8 20 7 0 4 0 0 0 48 51 48 48 9 20 7 0 4 0 0 0 48 49 48 48 10 20 3 0 1 0 0 0 0 0 0 0 34 20 3 0 3 0 0 0 32 3 0 0 36 20 3 0 1 0 0 0 0 16 0 0 48 20 7 0 129 0 0 0 38 3 0 0 49 20 4 0 1 0 0 0 2 0 0 0 54 20 3 0 1 0 0 0 0 0 0 0 56 20 3 0 1 0 0 0 0 128 0 0 66 20 4 0 1 0 0 0 0 0 0 0 67 20 3 0 1 0 0 0 1 0 0 0 68 20 3 0 1 0 0 0 1 0 0 0 70 20 4 0 1 0 0 0 35 0 0 0 71 20 2 0 10 0 0 0 168 3 0 0 72 20 2 0 10 0 0 0 178 3 0 0 0 65 3 0 1 0 0 0 0 0 0 0 0 66 3 0 1 0 0 0 0 0 0 0 0 19 3 0 1 0 0 0 0 0 0 0 3 16 3 0 1 0 0 0 0 0 0 0 0 17 3 0 1 0 0 0 0 0 0 0 0 20 3 0 1 0 0 0 1 0 0 0 2 19 3 0 1 0 0 0 0 0 0 0 1 20 3 0 1 0 0 0 0 0 0 0 16 16 3 0 1 0 0 0 0 128 0 0 17 16 10 0 1 0 0 0 188 3 0 0 33 16 3 0 1 0 0 0 1 0 0 0 1 19 3 0 1 0 0 0 0 0 0 0 7 20 5 0 1 0 0 0 196 3 0 0 6 20 5 0 1 0 0 0 204 3 0 0 5 20 5 0 1 0 0 0 212 3 0 0 4 20 5 0 1 0 0 0 220 3 0 0 49 16 3 0 1 0 0 0 0 3 0 0 0 16 2 0 8 0 0 0 228 3 0 0 1 17 3 0 1 0 0 0 0 0 0 0 1 16 3 0 1 0 0 0 3 0 0 0 48 16 3 0 1 0 0 0 0 0 0 0 0 0 7 0 4 0 0 0 48 49 51 48 2 16 3 0 1 0 0 0 0 0 0 0 0 0 0 0 49 55 48 56 53 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 88 45 84 51 95 48 49 48 48 0 88 45 84 51 95 48 49 48 48 0 0 0 0 0 100 0 0 0 200 0 0 0 100 0 0 0 200 0 0 0 100 0 0 0 136 19 0 0 100 0 0 0 136 19 0 0 100 0 0 0 78 79 82 77 65 76 32 0 Exif.MakerNote.Offset Long 1 870 870 Exif.MakerNote.ByteOrder Ascii 3 II II +Exif.Fujifilm.WhiteBalanceFineTune SLong 2 0 0 R: 0 B: 0 +Exif.Fujifilm.NoiseReduction Short 1 256 n/a +Exif.Fujifilm.HighIsoNoiseReduction Short 1 0 0 (normal) +Exif.Fujifilm.FocusArea Short 1 0 Wide +Exif.Fujifilm.FocusPoint Short 2 1041 1041 1041 1041 +Exif.Fujifilm.FocusPrioritySetting Short 1 17 17 +Exif.Fujifilm.FocusSetting Long 1 0 0 +Exif.Fujifilm.ContinuousFocusSetting Long 1 258 258 +Exif.Fujifilm.ExposureCount Short 1 1 1 Exif.Fujifilm.ShadowTone SLong 1 0 0 Exif.Fujifilm.HighlightTone SLong 1 0 0 +Exif.Fujifilm.LensModulationOptimizer Long 1 1 On +Exif.Fujifilm.GrainEffectRoughness SLong 1 0 Off +Exif.Fujifilm.ColorChromeEffect SLong 1 0 Off Exif.Fujifilm.CropMode Short 1 0 None +Exif.Fujifilm.ShutterType Short 1 0 Mechanical +Exif.Fujifilm.DriveSetting Long 1 0 Single +Exif.Fujifilm.ImageStabilization Short 3 0 0 0 0 0 0 Exif.Fujifilm.Rating Long 1 2 2 +Exif.Fujifilm.ImageGeneration Short 1 0 Original Image +Exif.Fujifilm.ImageNumber Short 1 32768 32768 Exif.Fujifilm.DRangePriority Short 1 1 Fixed Exif.Fujifilm.DRangePriorityFixed Short 1 1 Weak +Exif.Fujifilm.FacesDetected Short 1 0 0 +Exif.Fujifilm.NumberFaceElements Short 1 0 0 Exif.Fujifilm.BlurWarning Short 1 0 Off -Exif.Fujifilm.Color Short 1 0 Normal +Exif.Fujifilm.Color Short 1 0 0 (normal) Exif.Fujifilm.Continuous Short 1 0 Off Exif.Fujifilm.DynamicRange Short 1 1 Standard Exif.Fujifilm.ExposureWarning Short 1 0 Off -Exif.Fujifilm.FilmMode Short 1 0 F0/Standard (Provia) -Exif.Fujifilm.FlashMode Short 1 32768 (32768) +Exif.Fujifilm.FilmMode Short 1 0 PROVIA (F0/Standard) +Exif.Fujifilm.FlashMode Short 1 32768 No flash Exif.Fujifilm.FlashStrength SRational 1 0/100 0/100 Exif.Fujifilm.FocusMode Short 1 1 Manual Exif.Fujifilm.FocusWarning Short 1 0 Off @@ -52,7 +71,7 @@ Exif.Fujifilm.MinFocalLength Rational 1 5000/100 5000/100 Exif.Fujifilm.PictureMode Short 1 768 Manual Exif.Fujifilm.Quality Ascii 8 NORMAL NORMAL Exif.Fujifilm.SequenceNumber Short 1 0 0 -Exif.Fujifilm.Sharpness Short 1 3 Normal +Exif.Fujifilm.Sharpness Short 1 3 0 (normal) Exif.Fujifilm.SlowSync Short 1 0 Off Exif.Fujifilm.Version Undefined 4 48 49 51 48 48 49 51 48 Exif.Fujifilm.WhiteBalance Short 1 0 Auto diff --git a/test/data/test_reference_files/FujiTagsSTone-2HTone4.jpg.out b/test/data/test_reference_files/FujiTagsSTone-2HTone4.jpg.out index bbafd0d8..1607fc25 100644 --- a/test/data/test_reference_files/FujiTagsSTone-2HTone4.jpg.out +++ b/test/data/test_reference_files/FujiTagsSTone-2HTone4.jpg.out @@ -29,19 +29,38 @@ Exif.Photo.FocalLength Rational 1 5000/100 50.0 mm Exif.Photo.MakerNote Undefined 1004 70 85 74 73 70 73 76 77 12 0 0 0 64 0 32 0 2 0 6 0 0 0 18 3 0 0 10 16 9 0 2 0 0 0 24 3 0 0 11 16 3 0 1 0 0 0 0 1 0 0 14 16 3 0 1 0 0 0 0 0 0 0 34 16 3 0 1 0 0 0 0 0 0 0 35 16 3 0 2 0 0 0 17 4 17 4 37 16 4 0 1 0 0 0 8 0 0 0 38 16 3 0 1 0 0 0 64 0 0 0 43 16 3 0 1 0 0 0 17 0 0 0 44 16 4 0 1 0 0 0 0 0 0 0 45 16 4 0 1 0 0 0 0 0 0 0 46 16 4 0 1 0 0 0 2 1 0 0 50 16 3 0 1 0 0 0 1 0 0 0 64 16 9 0 1 0 0 0 32 0 0 0 65 16 9 0 1 0 0 0 192 255 255 255 69 16 4 0 1 0 0 0 1 0 0 0 70 16 4 0 1 0 0 0 1 0 0 0 71 16 9 0 1 0 0 0 0 0 0 0 72 16 9 0 1 0 0 0 0 0 0 0 77 16 3 0 1 0 0 0 0 0 0 0 80 16 3 0 1 0 0 0 0 0 0 0 3 17 4 0 1 0 0 0 0 0 0 0 0 18 3 0 1 0 0 0 0 0 0 0 3 19 3 0 1 0 0 0 0 0 0 0 4 19 3 0 1 0 0 0 0 0 0 0 5 19 3 0 1 0 0 0 0 0 0 0 8 20 7 0 4 0 0 0 48 51 48 48 9 20 7 0 4 0 0 0 48 49 48 48 10 20 3 0 1 0 0 0 0 0 0 0 34 20 3 0 3 0 0 0 32 3 0 0 36 20 3 0 1 0 0 0 0 16 0 0 48 20 7 0 129 0 0 0 38 3 0 0 49 20 4 0 1 0 0 0 0 0 0 0 54 20 3 0 1 0 0 0 0 0 0 0 56 20 3 0 1 0 0 0 0 128 0 0 66 20 4 0 1 0 0 0 0 0 0 0 70 20 4 0 1 0 0 0 35 0 0 0 71 20 2 0 10 0 0 0 168 3 0 0 72 20 2 0 10 0 0 0 178 3 0 0 0 65 3 0 1 0 0 0 0 0 0 0 0 66 3 0 1 0 0 0 0 0 0 0 0 19 3 0 1 0 0 0 0 0 0 0 3 16 3 0 1 0 0 0 0 0 0 0 0 17 3 0 1 0 0 0 0 0 0 0 3 20 3 0 1 0 0 0 100 0 0 0 0 20 3 0 1 0 0 0 1 0 0 0 2 20 3 0 1 0 0 0 1 0 0 0 2 19 3 0 1 0 0 0 0 0 0 0 1 20 3 0 1 0 0 0 0 0 0 0 16 16 3 0 1 0 0 0 0 128 0 0 17 16 10 0 1 0 0 0 188 3 0 0 33 16 3 0 1 0 0 0 1 0 0 0 1 19 3 0 1 0 0 0 0 0 0 0 7 20 5 0 1 0 0 0 196 3 0 0 6 20 5 0 1 0 0 0 204 3 0 0 5 20 5 0 1 0 0 0 212 3 0 0 4 20 5 0 1 0 0 0 220 3 0 0 49 16 3 0 1 0 0 0 0 3 0 0 0 16 2 0 8 0 0 0 228 3 0 0 1 17 3 0 1 0 0 0 0 0 0 0 1 16 3 0 1 0 0 0 3 0 0 0 48 16 3 0 1 0 0 0 0 0 0 0 0 0 7 0 4 0 0 0 48 49 51 48 2 16 3 0 1 0 0 0 0 0 0 0 0 0 0 0 49 55 48 56 53 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 88 45 84 51 95 48 49 48 48 0 88 45 84 51 95 48 49 48 48 0 0 0 0 0 100 0 0 0 200 0 0 0 100 0 0 0 200 0 0 0 100 0 0 0 136 19 0 0 100 0 0 0 136 19 0 0 100 0 0 0 78 79 82 77 65 76 32 0 70 85 74 73 70 73 76 77 12 0 0 0 64 0 32 0 2 0 6 0 0 0 18 3 0 0 10 16 9 0 2 0 0 0 24 3 0 0 11 16 3 0 1 0 0 0 0 1 0 0 14 16 3 0 1 0 0 0 0 0 0 0 34 16 3 0 1 0 0 0 0 0 0 0 35 16 3 0 2 0 0 0 17 4 17 4 37 16 4 0 1 0 0 0 8 0 0 0 38 16 3 0 1 0 0 0 64 0 0 0 43 16 3 0 1 0 0 0 17 0 0 0 44 16 4 0 1 0 0 0 0 0 0 0 45 16 4 0 1 0 0 0 0 0 0 0 46 16 4 0 1 0 0 0 2 1 0 0 50 16 3 0 1 0 0 0 1 0 0 0 64 16 9 0 1 0 0 0 32 0 0 0 65 16 9 0 1 0 0 0 192 255 255 255 69 16 4 0 1 0 0 0 1 0 0 0 70 16 4 0 1 0 0 0 1 0 0 0 71 16 9 0 1 0 0 0 0 0 0 0 72 16 9 0 1 0 0 0 0 0 0 0 77 16 3 0 1 0 0 0 0 0 0 0 80 16 3 0 1 0 0 0 0 0 0 0 3 17 4 0 1 0 0 0 0 0 0 0 0 18 3 0 1 0 0 0 0 0 0 0 3 19 3 0 1 0 0 0 0 0 0 0 4 19 3 0 1 0 0 0 0 0 0 0 5 19 3 0 1 0 0 0 0 0 0 0 8 20 7 0 4 0 0 0 48 51 48 48 9 20 7 0 4 0 0 0 48 49 48 48 10 20 3 0 1 0 0 0 0 0 0 0 34 20 3 0 3 0 0 0 32 3 0 0 36 20 3 0 1 0 0 0 0 16 0 0 48 20 7 0 129 0 0 0 38 3 0 0 49 20 4 0 1 0 0 0 0 0 0 0 54 20 3 0 1 0 0 0 0 0 0 0 56 20 3 0 1 0 0 0 0 128 0 0 66 20 4 0 1 0 0 0 0 0 0 0 70 20 4 0 1 0 0 0 35 0 0 0 71 20 2 0 10 0 0 0 168 3 0 0 72 20 2 0 10 0 0 0 178 3 0 0 0 65 3 0 1 0 0 0 0 0 0 0 0 66 3 0 1 0 0 0 0 0 0 0 0 19 3 0 1 0 0 0 0 0 0 0 3 16 3 0 1 0 0 0 0 0 0 0 0 17 3 0 1 0 0 0 0 0 0 0 3 20 3 0 1 0 0 0 100 0 0 0 0 20 3 0 1 0 0 0 1 0 0 0 2 20 3 0 1 0 0 0 1 0 0 0 2 19 3 0 1 0 0 0 0 0 0 0 1 20 3 0 1 0 0 0 0 0 0 0 16 16 3 0 1 0 0 0 0 128 0 0 17 16 10 0 1 0 0 0 188 3 0 0 33 16 3 0 1 0 0 0 1 0 0 0 1 19 3 0 1 0 0 0 0 0 0 0 7 20 5 0 1 0 0 0 196 3 0 0 6 20 5 0 1 0 0 0 204 3 0 0 5 20 5 0 1 0 0 0 212 3 0 0 4 20 5 0 1 0 0 0 220 3 0 0 49 16 3 0 1 0 0 0 0 3 0 0 0 16 2 0 8 0 0 0 228 3 0 0 1 17 3 0 1 0 0 0 0 0 0 0 1 16 3 0 1 0 0 0 3 0 0 0 48 16 3 0 1 0 0 0 0 0 0 0 0 0 7 0 4 0 0 0 48 49 51 48 2 16 3 0 1 0 0 0 0 0 0 0 0 0 0 0 49 55 48 56 53 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 88 45 84 51 95 48 49 48 48 0 88 45 84 51 95 48 49 48 48 0 0 0 0 0 100 0 0 0 200 0 0 0 100 0 0 0 200 0 0 0 100 0 0 0 136 19 0 0 100 0 0 0 136 19 0 0 100 0 0 0 78 79 82 77 65 76 32 0 Exif.MakerNote.Offset Long 1 870 870 Exif.MakerNote.ByteOrder Ascii 3 II II +Exif.Fujifilm.WhiteBalanceFineTune SLong 2 0 0 R: 0 B: 0 +Exif.Fujifilm.NoiseReduction Short 1 256 n/a +Exif.Fujifilm.HighIsoNoiseReduction Short 1 0 0 (normal) +Exif.Fujifilm.FocusArea Short 1 0 Wide +Exif.Fujifilm.FocusPoint Short 2 1041 1041 1041 1041 +Exif.Fujifilm.FocusPrioritySetting Short 1 17 17 +Exif.Fujifilm.FocusSetting Long 1 0 0 +Exif.Fujifilm.ContinuousFocusSetting Long 1 258 258 +Exif.Fujifilm.ExposureCount Short 1 1 1 Exif.Fujifilm.ShadowTone SLong 1 32 -2 Exif.Fujifilm.HighlightTone SLong 1 -64 +4 +Exif.Fujifilm.LensModulationOptimizer Long 1 1 On +Exif.Fujifilm.GrainEffectRoughness SLong 1 0 Off +Exif.Fujifilm.ColorChromeEffect SLong 1 0 Off Exif.Fujifilm.CropMode Short 1 0 None +Exif.Fujifilm.ShutterType Short 1 0 Mechanical +Exif.Fujifilm.DriveSetting Long 1 0 Single +Exif.Fujifilm.ImageStabilization Short 3 0 0 0 0 0 0 Exif.Fujifilm.Rating Long 1 0 0 +Exif.Fujifilm.ImageGeneration Short 1 0 Original Image +Exif.Fujifilm.ImageNumber Short 1 32768 32768 +Exif.Fujifilm.FacesDetected Short 1 0 0 +Exif.Fujifilm.NumberFaceElements Short 1 0 0 Exif.Fujifilm.BlurWarning Short 1 0 Off -Exif.Fujifilm.Color Short 1 0 Normal +Exif.Fujifilm.Color Short 1 0 0 (normal) Exif.Fujifilm.Continuous Short 1 0 Off Exif.Fujifilm.DevelopmentDynamicRange Short 1 100 100 Exif.Fujifilm.DynamicRange Short 1 1 Standard -Exif.Fujifilm.DynamicRangeSetting Short 1 1 Raw +Exif.Fujifilm.DynamicRangeSetting Short 1 1 Manual Exif.Fujifilm.ExposureWarning Short 1 0 Off -Exif.Fujifilm.FilmMode Short 1 0 F0/Standard (Provia) -Exif.Fujifilm.FlashMode Short 1 32768 (32768) +Exif.Fujifilm.FilmMode Short 1 0 PROVIA (F0/Standard) +Exif.Fujifilm.FlashMode Short 1 32768 No flash Exif.Fujifilm.FlashStrength SRational 1 0/100 0/100 Exif.Fujifilm.FocusMode Short 1 1 Manual Exif.Fujifilm.FocusWarning Short 1 0 Off @@ -52,7 +71,7 @@ Exif.Fujifilm.MinFocalLength Rational 1 5000/100 5000/100 Exif.Fujifilm.PictureMode Short 1 768 Manual Exif.Fujifilm.Quality Ascii 8 NORMAL NORMAL Exif.Fujifilm.SequenceNumber Short 1 0 0 -Exif.Fujifilm.Sharpness Short 1 3 Normal +Exif.Fujifilm.Sharpness Short 1 3 0 (normal) Exif.Fujifilm.SlowSync Short 1 0 Off Exif.Fujifilm.Version Undefined 4 48 49 51 48 48 49 51 48 Exif.Fujifilm.WhiteBalance Short 1 0 Auto diff --git a/test/data/test_reference_files/FujiTagsSTone0HTone0Rating4.jpg.out b/test/data/test_reference_files/FujiTagsSTone0HTone0Rating4.jpg.out index a676e2fe..cd834ca3 100644 --- a/test/data/test_reference_files/FujiTagsSTone0HTone0Rating4.jpg.out +++ b/test/data/test_reference_files/FujiTagsSTone0HTone0Rating4.jpg.out @@ -29,19 +29,38 @@ Exif.Photo.FocalLength Rational 1 5000/100 50.0 mm Exif.Photo.MakerNote Undefined 1004 70 85 74 73 70 73 76 77 12 0 0 0 64 0 32 0 2 0 6 0 0 0 18 3 0 0 10 16 9 0 2 0 0 0 24 3 0 0 11 16 3 0 1 0 0 0 0 1 0 0 14 16 3 0 1 0 0 0 0 0 0 0 34 16 3 0 1 0 0 0 0 0 0 0 35 16 3 0 2 0 0 0 17 4 17 4 37 16 4 0 1 0 0 0 8 0 0 0 38 16 3 0 1 0 0 0 64 0 0 0 43 16 3 0 1 0 0 0 17 0 0 0 44 16 4 0 1 0 0 0 0 0 0 0 45 16 4 0 1 0 0 0 0 0 0 0 46 16 4 0 1 0 0 0 2 1 0 0 50 16 3 0 1 0 0 0 1 0 0 0 64 16 9 0 1 0 0 0 0 0 0 0 65 16 9 0 1 0 0 0 0 0 0 0 69 16 4 0 1 0 0 0 1 0 0 0 70 16 4 0 1 0 0 0 1 0 0 0 71 16 9 0 1 0 0 0 0 0 0 0 72 16 9 0 1 0 0 0 0 0 0 0 77 16 3 0 1 0 0 0 0 0 0 0 80 16 3 0 1 0 0 0 0 0 0 0 3 17 4 0 1 0 0 0 0 0 0 0 0 18 3 0 1 0 0 0 0 0 0 0 3 19 3 0 1 0 0 0 0 0 0 0 4 19 3 0 1 0 0 0 0 0 0 0 5 19 3 0 1 0 0 0 0 0 0 0 8 20 7 0 4 0 0 0 48 51 48 48 9 20 7 0 4 0 0 0 48 49 48 48 10 20 3 0 1 0 0 0 0 0 0 0 34 20 3 0 3 0 0 0 32 3 0 0 36 20 3 0 1 0 0 0 0 16 0 0 48 20 7 0 129 0 0 0 38 3 0 0 49 20 4 0 1 0 0 0 4 0 0 0 54 20 3 0 1 0 0 0 0 0 0 0 56 20 3 0 1 0 0 0 0 128 0 0 66 20 4 0 1 0 0 0 0 0 0 0 70 20 4 0 1 0 0 0 35 0 0 0 71 20 2 0 10 0 0 0 168 3 0 0 72 20 2 0 10 0 0 0 178 3 0 0 0 65 3 0 1 0 0 0 0 0 0 0 0 66 3 0 1 0 0 0 0 0 0 0 0 19 3 0 1 0 0 0 0 0 0 0 3 16 3 0 1 0 0 0 0 0 0 0 0 17 3 0 1 0 0 0 0 0 0 0 3 20 3 0 1 0 0 0 100 0 0 0 0 20 3 0 1 0 0 0 1 0 0 0 2 20 3 0 1 0 0 0 1 0 0 0 2 19 3 0 1 0 0 0 0 0 0 0 1 20 3 0 1 0 0 0 0 0 0 0 16 16 3 0 1 0 0 0 0 128 0 0 17 16 10 0 1 0 0 0 188 3 0 0 33 16 3 0 1 0 0 0 1 0 0 0 1 19 3 0 1 0 0 0 0 0 0 0 7 20 5 0 1 0 0 0 196 3 0 0 6 20 5 0 1 0 0 0 204 3 0 0 5 20 5 0 1 0 0 0 212 3 0 0 4 20 5 0 1 0 0 0 220 3 0 0 49 16 3 0 1 0 0 0 0 3 0 0 0 16 2 0 8 0 0 0 228 3 0 0 1 17 3 0 1 0 0 0 0 0 0 0 1 16 3 0 1 0 0 0 3 0 0 0 48 16 3 0 1 0 0 0 0 0 0 0 0 0 7 0 4 0 0 0 48 49 51 48 2 16 3 0 1 0 0 0 0 0 0 0 0 0 0 0 49 55 48 56 53 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 88 45 84 51 95 48 49 48 48 0 88 45 84 51 95 48 49 48 48 0 0 0 0 0 100 0 0 0 200 0 0 0 100 0 0 0 200 0 0 0 100 0 0 0 136 19 0 0 100 0 0 0 136 19 0 0 100 0 0 0 78 79 82 77 65 76 32 0 70 85 74 73 70 73 76 77 12 0 0 0 64 0 32 0 2 0 6 0 0 0 18 3 0 0 10 16 9 0 2 0 0 0 24 3 0 0 11 16 3 0 1 0 0 0 0 1 0 0 14 16 3 0 1 0 0 0 0 0 0 0 34 16 3 0 1 0 0 0 0 0 0 0 35 16 3 0 2 0 0 0 17 4 17 4 37 16 4 0 1 0 0 0 8 0 0 0 38 16 3 0 1 0 0 0 64 0 0 0 43 16 3 0 1 0 0 0 17 0 0 0 44 16 4 0 1 0 0 0 0 0 0 0 45 16 4 0 1 0 0 0 0 0 0 0 46 16 4 0 1 0 0 0 2 1 0 0 50 16 3 0 1 0 0 0 1 0 0 0 64 16 9 0 1 0 0 0 0 0 0 0 65 16 9 0 1 0 0 0 0 0 0 0 69 16 4 0 1 0 0 0 1 0 0 0 70 16 4 0 1 0 0 0 1 0 0 0 71 16 9 0 1 0 0 0 0 0 0 0 72 16 9 0 1 0 0 0 0 0 0 0 77 16 3 0 1 0 0 0 0 0 0 0 80 16 3 0 1 0 0 0 0 0 0 0 3 17 4 0 1 0 0 0 0 0 0 0 0 18 3 0 1 0 0 0 0 0 0 0 3 19 3 0 1 0 0 0 0 0 0 0 4 19 3 0 1 0 0 0 0 0 0 0 5 19 3 0 1 0 0 0 0 0 0 0 8 20 7 0 4 0 0 0 48 51 48 48 9 20 7 0 4 0 0 0 48 49 48 48 10 20 3 0 1 0 0 0 0 0 0 0 34 20 3 0 3 0 0 0 32 3 0 0 36 20 3 0 1 0 0 0 0 16 0 0 48 20 7 0 129 0 0 0 38 3 0 0 49 20 4 0 1 0 0 0 4 0 0 0 54 20 3 0 1 0 0 0 0 0 0 0 56 20 3 0 1 0 0 0 0 128 0 0 66 20 4 0 1 0 0 0 0 0 0 0 70 20 4 0 1 0 0 0 35 0 0 0 71 20 2 0 10 0 0 0 168 3 0 0 72 20 2 0 10 0 0 0 178 3 0 0 0 65 3 0 1 0 0 0 0 0 0 0 0 66 3 0 1 0 0 0 0 0 0 0 0 19 3 0 1 0 0 0 0 0 0 0 3 16 3 0 1 0 0 0 0 0 0 0 0 17 3 0 1 0 0 0 0 0 0 0 3 20 3 0 1 0 0 0 100 0 0 0 0 20 3 0 1 0 0 0 1 0 0 0 2 20 3 0 1 0 0 0 1 0 0 0 2 19 3 0 1 0 0 0 0 0 0 0 1 20 3 0 1 0 0 0 0 0 0 0 16 16 3 0 1 0 0 0 0 128 0 0 17 16 10 0 1 0 0 0 188 3 0 0 33 16 3 0 1 0 0 0 1 0 0 0 1 19 3 0 1 0 0 0 0 0 0 0 7 20 5 0 1 0 0 0 196 3 0 0 6 20 5 0 1 0 0 0 204 3 0 0 5 20 5 0 1 0 0 0 212 3 0 0 4 20 5 0 1 0 0 0 220 3 0 0 49 16 3 0 1 0 0 0 0 3 0 0 0 16 2 0 8 0 0 0 228 3 0 0 1 17 3 0 1 0 0 0 0 0 0 0 1 16 3 0 1 0 0 0 3 0 0 0 48 16 3 0 1 0 0 0 0 0 0 0 0 0 7 0 4 0 0 0 48 49 51 48 2 16 3 0 1 0 0 0 0 0 0 0 0 0 0 0 49 55 48 56 53 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 88 45 84 51 95 48 49 48 48 0 88 45 84 51 95 48 49 48 48 0 0 0 0 0 100 0 0 0 200 0 0 0 100 0 0 0 200 0 0 0 100 0 0 0 136 19 0 0 100 0 0 0 136 19 0 0 100 0 0 0 78 79 82 77 65 76 32 0 Exif.MakerNote.Offset Long 1 870 870 Exif.MakerNote.ByteOrder Ascii 3 II II +Exif.Fujifilm.WhiteBalanceFineTune SLong 2 0 0 R: 0 B: 0 +Exif.Fujifilm.NoiseReduction Short 1 256 n/a +Exif.Fujifilm.HighIsoNoiseReduction Short 1 0 0 (normal) +Exif.Fujifilm.FocusArea Short 1 0 Wide +Exif.Fujifilm.FocusPoint Short 2 1041 1041 1041 1041 +Exif.Fujifilm.FocusPrioritySetting Short 1 17 17 +Exif.Fujifilm.FocusSetting Long 1 0 0 +Exif.Fujifilm.ContinuousFocusSetting Long 1 258 258 +Exif.Fujifilm.ExposureCount Short 1 1 1 Exif.Fujifilm.ShadowTone SLong 1 0 0 Exif.Fujifilm.HighlightTone SLong 1 0 0 +Exif.Fujifilm.LensModulationOptimizer Long 1 1 On +Exif.Fujifilm.GrainEffectRoughness SLong 1 0 Off +Exif.Fujifilm.ColorChromeEffect SLong 1 0 Off Exif.Fujifilm.CropMode Short 1 0 None +Exif.Fujifilm.ShutterType Short 1 0 Mechanical +Exif.Fujifilm.DriveSetting Long 1 0 Single +Exif.Fujifilm.ImageStabilization Short 3 0 0 0 0 0 0 Exif.Fujifilm.Rating Long 1 4 4 +Exif.Fujifilm.ImageGeneration Short 1 0 Original Image +Exif.Fujifilm.ImageNumber Short 1 32768 32768 +Exif.Fujifilm.FacesDetected Short 1 0 0 +Exif.Fujifilm.NumberFaceElements Short 1 0 0 Exif.Fujifilm.BlurWarning Short 1 0 Off -Exif.Fujifilm.Color Short 1 0 Normal +Exif.Fujifilm.Color Short 1 0 0 (normal) Exif.Fujifilm.Continuous Short 1 0 Off Exif.Fujifilm.DevelopmentDynamicRange Short 1 100 100 Exif.Fujifilm.DynamicRange Short 1 1 Standard -Exif.Fujifilm.DynamicRangeSetting Short 1 1 Raw +Exif.Fujifilm.DynamicRangeSetting Short 1 1 Manual Exif.Fujifilm.ExposureWarning Short 1 0 Off -Exif.Fujifilm.FilmMode Short 1 0 F0/Standard (Provia) -Exif.Fujifilm.FlashMode Short 1 32768 (32768) +Exif.Fujifilm.FilmMode Short 1 0 PROVIA (F0/Standard) +Exif.Fujifilm.FlashMode Short 1 32768 No flash Exif.Fujifilm.FlashStrength SRational 1 0/100 0/100 Exif.Fujifilm.FocusMode Short 1 1 Manual Exif.Fujifilm.FocusWarning Short 1 0 Off @@ -52,7 +71,7 @@ Exif.Fujifilm.MinFocalLength Rational 1 5000/100 5000/100 Exif.Fujifilm.PictureMode Short 1 768 Manual Exif.Fujifilm.Quality Ascii 8 NORMAL NORMAL Exif.Fujifilm.SequenceNumber Short 1 0 0 -Exif.Fujifilm.Sharpness Short 1 3 Normal +Exif.Fujifilm.Sharpness Short 1 3 0 (normal) Exif.Fujifilm.SlowSync Short 1 0 Off Exif.Fujifilm.Version Undefined 4 48 49 51 48 48 49 51 48 Exif.Fujifilm.WhiteBalance Short 1 0 Auto diff --git a/test/data/test_reference_files/FujiTagsSTone1HTone-1Rating5.jpg.out b/test/data/test_reference_files/FujiTagsSTone1HTone-1Rating5.jpg.out index fad22144..339971f9 100644 --- a/test/data/test_reference_files/FujiTagsSTone1HTone-1Rating5.jpg.out +++ b/test/data/test_reference_files/FujiTagsSTone1HTone-1Rating5.jpg.out @@ -29,19 +29,38 @@ Exif.Photo.FocalLength Rational 1 5000/100 50.0 mm Exif.Photo.MakerNote Undefined 1004 70 85 74 73 70 73 76 77 12 0 0 0 64 0 32 0 2 0 6 0 0 0 18 3 0 0 10 16 9 0 2 0 0 0 24 3 0 0 11 16 3 0 1 0 0 0 0 1 0 0 14 16 3 0 1 0 0 0 0 0 0 0 34 16 3 0 1 0 0 0 0 0 0 0 35 16 3 0 2 0 0 0 17 4 17 4 37 16 4 0 1 0 0 0 8 0 0 0 38 16 3 0 1 0 0 0 64 0 0 0 43 16 3 0 1 0 0 0 17 0 0 0 44 16 4 0 1 0 0 0 0 0 0 0 45 16 4 0 1 0 0 0 0 0 0 0 46 16 4 0 1 0 0 0 2 1 0 0 50 16 3 0 1 0 0 0 1 0 0 0 64 16 9 0 1 0 0 0 240 255 255 255 65 16 9 0 1 0 0 0 16 0 0 0 69 16 4 0 1 0 0 0 1 0 0 0 70 16 4 0 1 0 0 0 1 0 0 0 71 16 9 0 1 0 0 0 0 0 0 0 72 16 9 0 1 0 0 0 0 0 0 0 77 16 3 0 1 0 0 0 0 0 0 0 80 16 3 0 1 0 0 0 0 0 0 0 3 17 4 0 1 0 0 0 0 0 0 0 0 18 3 0 1 0 0 0 0 0 0 0 3 19 3 0 1 0 0 0 0 0 0 0 4 19 3 0 1 0 0 0 0 0 0 0 5 19 3 0 1 0 0 0 0 0 0 0 8 20 7 0 4 0 0 0 48 51 48 48 9 20 7 0 4 0 0 0 48 49 48 48 10 20 3 0 1 0 0 0 0 0 0 0 34 20 3 0 3 0 0 0 32 3 0 0 36 20 3 0 1 0 0 0 0 16 0 0 48 20 7 0 129 0 0 0 38 3 0 0 49 20 4 0 1 0 0 0 5 0 0 0 54 20 3 0 1 0 0 0 0 0 0 0 56 20 3 0 1 0 0 0 0 128 0 0 66 20 4 0 1 0 0 0 0 0 0 0 70 20 4 0 1 0 0 0 35 0 0 0 71 20 2 0 10 0 0 0 168 3 0 0 72 20 2 0 10 0 0 0 178 3 0 0 0 65 3 0 1 0 0 0 0 0 0 0 0 66 3 0 1 0 0 0 0 0 0 0 0 19 3 0 1 0 0 0 0 0 0 0 3 16 3 0 1 0 0 0 0 0 0 0 0 17 3 0 1 0 0 0 0 0 0 0 3 20 3 0 1 0 0 0 100 0 0 0 0 20 3 0 1 0 0 0 1 0 0 0 2 20 3 0 1 0 0 0 1 0 0 0 2 19 3 0 1 0 0 0 0 0 0 0 1 20 3 0 1 0 0 0 0 0 0 0 16 16 3 0 1 0 0 0 0 128 0 0 17 16 10 0 1 0 0 0 188 3 0 0 33 16 3 0 1 0 0 0 1 0 0 0 1 19 3 0 1 0 0 0 0 0 0 0 7 20 5 0 1 0 0 0 196 3 0 0 6 20 5 0 1 0 0 0 204 3 0 0 5 20 5 0 1 0 0 0 212 3 0 0 4 20 5 0 1 0 0 0 220 3 0 0 49 16 3 0 1 0 0 0 0 3 0 0 0 16 2 0 8 0 0 0 228 3 0 0 1 17 3 0 1 0 0 0 0 0 0 0 1 16 3 0 1 0 0 0 3 0 0 0 48 16 3 0 1 0 0 0 0 0 0 0 0 0 7 0 4 0 0 0 48 49 51 48 2 16 3 0 1 0 0 0 0 0 0 0 0 0 0 0 49 55 48 56 53 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 88 45 84 51 95 48 49 48 48 0 88 45 84 51 95 48 49 48 48 0 0 0 0 0 100 0 0 0 200 0 0 0 100 0 0 0 200 0 0 0 100 0 0 0 136 19 0 0 100 0 0 0 136 19 0 0 100 0 0 0 78 79 82 77 65 76 32 0 70 85 74 73 70 73 76 77 12 0 0 0 64 0 32 0 2 0 6 0 0 0 18 3 0 0 10 16 9 0 2 0 0 0 24 3 0 0 11 16 3 0 1 0 0 0 0 1 0 0 14 16 3 0 1 0 0 0 0 0 0 0 34 16 3 0 1 0 0 0 0 0 0 0 35 16 3 0 2 0 0 0 17 4 17 4 37 16 4 0 1 0 0 0 8 0 0 0 38 16 3 0 1 0 0 0 64 0 0 0 43 16 3 0 1 0 0 0 17 0 0 0 44 16 4 0 1 0 0 0 0 0 0 0 45 16 4 0 1 0 0 0 0 0 0 0 46 16 4 0 1 0 0 0 2 1 0 0 50 16 3 0 1 0 0 0 1 0 0 0 64 16 9 0 1 0 0 0 240 255 255 255 65 16 9 0 1 0 0 0 16 0 0 0 69 16 4 0 1 0 0 0 1 0 0 0 70 16 4 0 1 0 0 0 1 0 0 0 71 16 9 0 1 0 0 0 0 0 0 0 72 16 9 0 1 0 0 0 0 0 0 0 77 16 3 0 1 0 0 0 0 0 0 0 80 16 3 0 1 0 0 0 0 0 0 0 3 17 4 0 1 0 0 0 0 0 0 0 0 18 3 0 1 0 0 0 0 0 0 0 3 19 3 0 1 0 0 0 0 0 0 0 4 19 3 0 1 0 0 0 0 0 0 0 5 19 3 0 1 0 0 0 0 0 0 0 8 20 7 0 4 0 0 0 48 51 48 48 9 20 7 0 4 0 0 0 48 49 48 48 10 20 3 0 1 0 0 0 0 0 0 0 34 20 3 0 3 0 0 0 32 3 0 0 36 20 3 0 1 0 0 0 0 16 0 0 48 20 7 0 129 0 0 0 38 3 0 0 49 20 4 0 1 0 0 0 5 0 0 0 54 20 3 0 1 0 0 0 0 0 0 0 56 20 3 0 1 0 0 0 0 128 0 0 66 20 4 0 1 0 0 0 0 0 0 0 70 20 4 0 1 0 0 0 35 0 0 0 71 20 2 0 10 0 0 0 168 3 0 0 72 20 2 0 10 0 0 0 178 3 0 0 0 65 3 0 1 0 0 0 0 0 0 0 0 66 3 0 1 0 0 0 0 0 0 0 0 19 3 0 1 0 0 0 0 0 0 0 3 16 3 0 1 0 0 0 0 0 0 0 0 17 3 0 1 0 0 0 0 0 0 0 3 20 3 0 1 0 0 0 100 0 0 0 0 20 3 0 1 0 0 0 1 0 0 0 2 20 3 0 1 0 0 0 1 0 0 0 2 19 3 0 1 0 0 0 0 0 0 0 1 20 3 0 1 0 0 0 0 0 0 0 16 16 3 0 1 0 0 0 0 128 0 0 17 16 10 0 1 0 0 0 188 3 0 0 33 16 3 0 1 0 0 0 1 0 0 0 1 19 3 0 1 0 0 0 0 0 0 0 7 20 5 0 1 0 0 0 196 3 0 0 6 20 5 0 1 0 0 0 204 3 0 0 5 20 5 0 1 0 0 0 212 3 0 0 4 20 5 0 1 0 0 0 220 3 0 0 49 16 3 0 1 0 0 0 0 3 0 0 0 16 2 0 8 0 0 0 228 3 0 0 1 17 3 0 1 0 0 0 0 0 0 0 1 16 3 0 1 0 0 0 3 0 0 0 48 16 3 0 1 0 0 0 0 0 0 0 0 0 7 0 4 0 0 0 48 49 51 48 2 16 3 0 1 0 0 0 0 0 0 0 0 0 0 0 49 55 48 56 53 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 88 45 84 51 95 48 49 48 48 0 88 45 84 51 95 48 49 48 48 0 0 0 0 0 100 0 0 0 200 0 0 0 100 0 0 0 200 0 0 0 100 0 0 0 136 19 0 0 100 0 0 0 136 19 0 0 100 0 0 0 78 79 82 77 65 76 32 0 Exif.MakerNote.Offset Long 1 870 870 Exif.MakerNote.ByteOrder Ascii 3 II II +Exif.Fujifilm.WhiteBalanceFineTune SLong 2 0 0 R: 0 B: 0 +Exif.Fujifilm.NoiseReduction Short 1 256 n/a +Exif.Fujifilm.HighIsoNoiseReduction Short 1 0 0 (normal) +Exif.Fujifilm.FocusArea Short 1 0 Wide +Exif.Fujifilm.FocusPoint Short 2 1041 1041 1041 1041 +Exif.Fujifilm.FocusPrioritySetting Short 1 17 17 +Exif.Fujifilm.FocusSetting Long 1 0 0 +Exif.Fujifilm.ContinuousFocusSetting Long 1 258 258 +Exif.Fujifilm.ExposureCount Short 1 1 1 Exif.Fujifilm.ShadowTone SLong 1 -16 +1 Exif.Fujifilm.HighlightTone SLong 1 16 -1 +Exif.Fujifilm.LensModulationOptimizer Long 1 1 On +Exif.Fujifilm.GrainEffectRoughness SLong 1 0 Off +Exif.Fujifilm.ColorChromeEffect SLong 1 0 Off Exif.Fujifilm.CropMode Short 1 0 None +Exif.Fujifilm.ShutterType Short 1 0 Mechanical +Exif.Fujifilm.DriveSetting Long 1 0 Single +Exif.Fujifilm.ImageStabilization Short 3 0 0 0 0 0 0 Exif.Fujifilm.Rating Long 1 5 5 +Exif.Fujifilm.ImageGeneration Short 1 0 Original Image +Exif.Fujifilm.ImageNumber Short 1 32768 32768 +Exif.Fujifilm.FacesDetected Short 1 0 0 +Exif.Fujifilm.NumberFaceElements Short 1 0 0 Exif.Fujifilm.BlurWarning Short 1 0 Off -Exif.Fujifilm.Color Short 1 0 Normal +Exif.Fujifilm.Color Short 1 0 0 (normal) Exif.Fujifilm.Continuous Short 1 0 Off Exif.Fujifilm.DevelopmentDynamicRange Short 1 100 100 Exif.Fujifilm.DynamicRange Short 1 1 Standard -Exif.Fujifilm.DynamicRangeSetting Short 1 1 Raw +Exif.Fujifilm.DynamicRangeSetting Short 1 1 Manual Exif.Fujifilm.ExposureWarning Short 1 0 Off -Exif.Fujifilm.FilmMode Short 1 0 F0/Standard (Provia) -Exif.Fujifilm.FlashMode Short 1 32768 (32768) +Exif.Fujifilm.FilmMode Short 1 0 PROVIA (F0/Standard) +Exif.Fujifilm.FlashMode Short 1 32768 No flash Exif.Fujifilm.FlashStrength SRational 1 0/100 0/100 Exif.Fujifilm.FocusMode Short 1 1 Manual Exif.Fujifilm.FocusWarning Short 1 0 Off @@ -52,7 +71,7 @@ Exif.Fujifilm.MinFocalLength Rational 1 5000/100 5000/100 Exif.Fujifilm.PictureMode Short 1 768 Manual Exif.Fujifilm.Quality Ascii 8 NORMAL NORMAL Exif.Fujifilm.SequenceNumber Short 1 0 0 -Exif.Fujifilm.Sharpness Short 1 3 Normal +Exif.Fujifilm.Sharpness Short 1 3 0 (normal) Exif.Fujifilm.SlowSync Short 1 0 Off Exif.Fujifilm.Version Undefined 4 48 49 51 48 48 49 51 48 Exif.Fujifilm.WhiteBalance Short 1 0 Auto diff --git a/test/data/test_reference_files/FujiTagsSTone4HTone-2.jpg.out b/test/data/test_reference_files/FujiTagsSTone4HTone-2.jpg.out index 10424cda..0000c14c 100644 --- a/test/data/test_reference_files/FujiTagsSTone4HTone-2.jpg.out +++ b/test/data/test_reference_files/FujiTagsSTone4HTone-2.jpg.out @@ -29,19 +29,38 @@ Exif.Photo.FocalLength Rational 1 5000/100 50.0 mm Exif.Photo.MakerNote Undefined 1004 70 85 74 73 70 73 76 77 12 0 0 0 64 0 32 0 2 0 6 0 0 0 18 3 0 0 10 16 9 0 2 0 0 0 24 3 0 0 11 16 3 0 1 0 0 0 0 1 0 0 14 16 3 0 1 0 0 0 0 0 0 0 34 16 3 0 1 0 0 0 0 0 0 0 35 16 3 0 2 0 0 0 17 4 17 4 37 16 4 0 1 0 0 0 8 0 0 0 38 16 3 0 1 0 0 0 64 0 0 0 43 16 3 0 1 0 0 0 17 0 0 0 44 16 4 0 1 0 0 0 0 0 0 0 45 16 4 0 1 0 0 0 0 0 0 0 46 16 4 0 1 0 0 0 2 1 0 0 50 16 3 0 1 0 0 0 1 0 0 0 64 16 9 0 1 0 0 0 192 255 255 255 65 16 9 0 1 0 0 0 32 0 0 0 69 16 4 0 1 0 0 0 1 0 0 0 70 16 4 0 1 0 0 0 1 0 0 0 71 16 9 0 1 0 0 0 0 0 0 0 72 16 9 0 1 0 0 0 0 0 0 0 77 16 3 0 1 0 0 0 0 0 0 0 80 16 3 0 1 0 0 0 0 0 0 0 3 17 4 0 1 0 0 0 0 0 0 0 0 18 3 0 1 0 0 0 0 0 0 0 3 19 3 0 1 0 0 0 0 0 0 0 4 19 3 0 1 0 0 0 0 0 0 0 5 19 3 0 1 0 0 0 0 0 0 0 8 20 7 0 4 0 0 0 48 51 48 48 9 20 7 0 4 0 0 0 48 49 48 48 10 20 3 0 1 0 0 0 0 0 0 0 34 20 3 0 3 0 0 0 32 3 0 0 36 20 3 0 1 0 0 0 0 16 0 0 48 20 7 0 129 0 0 0 38 3 0 0 49 20 4 0 1 0 0 0 0 0 0 0 54 20 3 0 1 0 0 0 0 0 0 0 56 20 3 0 1 0 0 0 0 128 0 0 66 20 4 0 1 0 0 0 0 0 0 0 70 20 4 0 1 0 0 0 35 0 0 0 71 20 2 0 10 0 0 0 168 3 0 0 72 20 2 0 10 0 0 0 178 3 0 0 0 65 3 0 1 0 0 0 0 0 0 0 0 66 3 0 1 0 0 0 0 0 0 0 0 19 3 0 1 0 0 0 0 0 0 0 3 16 3 0 1 0 0 0 0 0 0 0 0 17 3 0 1 0 0 0 0 0 0 0 3 20 3 0 1 0 0 0 100 0 0 0 0 20 3 0 1 0 0 0 1 0 0 0 2 20 3 0 1 0 0 0 1 0 0 0 2 19 3 0 1 0 0 0 0 0 0 0 1 20 3 0 1 0 0 0 0 0 0 0 16 16 3 0 1 0 0 0 0 128 0 0 17 16 10 0 1 0 0 0 188 3 0 0 33 16 3 0 1 0 0 0 1 0 0 0 1 19 3 0 1 0 0 0 0 0 0 0 7 20 5 0 1 0 0 0 196 3 0 0 6 20 5 0 1 0 0 0 204 3 0 0 5 20 5 0 1 0 0 0 212 3 0 0 4 20 5 0 1 0 0 0 220 3 0 0 49 16 3 0 1 0 0 0 0 3 0 0 0 16 2 0 8 0 0 0 228 3 0 0 1 17 3 0 1 0 0 0 0 0 0 0 1 16 3 0 1 0 0 0 3 0 0 0 48 16 3 0 1 0 0 0 0 0 0 0 0 0 7 0 4 0 0 0 48 49 51 48 2 16 3 0 1 0 0 0 0 0 0 0 0 0 0 0 49 55 48 56 53 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 88 45 84 51 95 48 49 48 48 0 88 45 84 51 95 48 49 48 48 0 0 0 0 0 100 0 0 0 200 0 0 0 100 0 0 0 200 0 0 0 100 0 0 0 136 19 0 0 100 0 0 0 136 19 0 0 100 0 0 0 78 79 82 77 65 76 32 0 70 85 74 73 70 73 76 77 12 0 0 0 64 0 32 0 2 0 6 0 0 0 18 3 0 0 10 16 9 0 2 0 0 0 24 3 0 0 11 16 3 0 1 0 0 0 0 1 0 0 14 16 3 0 1 0 0 0 0 0 0 0 34 16 3 0 1 0 0 0 0 0 0 0 35 16 3 0 2 0 0 0 17 4 17 4 37 16 4 0 1 0 0 0 8 0 0 0 38 16 3 0 1 0 0 0 64 0 0 0 43 16 3 0 1 0 0 0 17 0 0 0 44 16 4 0 1 0 0 0 0 0 0 0 45 16 4 0 1 0 0 0 0 0 0 0 46 16 4 0 1 0 0 0 2 1 0 0 50 16 3 0 1 0 0 0 1 0 0 0 64 16 9 0 1 0 0 0 192 255 255 255 65 16 9 0 1 0 0 0 32 0 0 0 69 16 4 0 1 0 0 0 1 0 0 0 70 16 4 0 1 0 0 0 1 0 0 0 71 16 9 0 1 0 0 0 0 0 0 0 72 16 9 0 1 0 0 0 0 0 0 0 77 16 3 0 1 0 0 0 0 0 0 0 80 16 3 0 1 0 0 0 0 0 0 0 3 17 4 0 1 0 0 0 0 0 0 0 0 18 3 0 1 0 0 0 0 0 0 0 3 19 3 0 1 0 0 0 0 0 0 0 4 19 3 0 1 0 0 0 0 0 0 0 5 19 3 0 1 0 0 0 0 0 0 0 8 20 7 0 4 0 0 0 48 51 48 48 9 20 7 0 4 0 0 0 48 49 48 48 10 20 3 0 1 0 0 0 0 0 0 0 34 20 3 0 3 0 0 0 32 3 0 0 36 20 3 0 1 0 0 0 0 16 0 0 48 20 7 0 129 0 0 0 38 3 0 0 49 20 4 0 1 0 0 0 0 0 0 0 54 20 3 0 1 0 0 0 0 0 0 0 56 20 3 0 1 0 0 0 0 128 0 0 66 20 4 0 1 0 0 0 0 0 0 0 70 20 4 0 1 0 0 0 35 0 0 0 71 20 2 0 10 0 0 0 168 3 0 0 72 20 2 0 10 0 0 0 178 3 0 0 0 65 3 0 1 0 0 0 0 0 0 0 0 66 3 0 1 0 0 0 0 0 0 0 0 19 3 0 1 0 0 0 0 0 0 0 3 16 3 0 1 0 0 0 0 0 0 0 0 17 3 0 1 0 0 0 0 0 0 0 3 20 3 0 1 0 0 0 100 0 0 0 0 20 3 0 1 0 0 0 1 0 0 0 2 20 3 0 1 0 0 0 1 0 0 0 2 19 3 0 1 0 0 0 0 0 0 0 1 20 3 0 1 0 0 0 0 0 0 0 16 16 3 0 1 0 0 0 0 128 0 0 17 16 10 0 1 0 0 0 188 3 0 0 33 16 3 0 1 0 0 0 1 0 0 0 1 19 3 0 1 0 0 0 0 0 0 0 7 20 5 0 1 0 0 0 196 3 0 0 6 20 5 0 1 0 0 0 204 3 0 0 5 20 5 0 1 0 0 0 212 3 0 0 4 20 5 0 1 0 0 0 220 3 0 0 49 16 3 0 1 0 0 0 0 3 0 0 0 16 2 0 8 0 0 0 228 3 0 0 1 17 3 0 1 0 0 0 0 0 0 0 1 16 3 0 1 0 0 0 3 0 0 0 48 16 3 0 1 0 0 0 0 0 0 0 0 0 7 0 4 0 0 0 48 49 51 48 2 16 3 0 1 0 0 0 0 0 0 0 0 0 0 0 49 55 48 56 53 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 88 45 84 51 95 48 49 48 48 0 88 45 84 51 95 48 49 48 48 0 0 0 0 0 100 0 0 0 200 0 0 0 100 0 0 0 200 0 0 0 100 0 0 0 136 19 0 0 100 0 0 0 136 19 0 0 100 0 0 0 78 79 82 77 65 76 32 0 Exif.MakerNote.Offset Long 1 870 870 Exif.MakerNote.ByteOrder Ascii 3 II II +Exif.Fujifilm.WhiteBalanceFineTune SLong 2 0 0 R: 0 B: 0 +Exif.Fujifilm.NoiseReduction Short 1 256 n/a +Exif.Fujifilm.HighIsoNoiseReduction Short 1 0 0 (normal) +Exif.Fujifilm.FocusArea Short 1 0 Wide +Exif.Fujifilm.FocusPoint Short 2 1041 1041 1041 1041 +Exif.Fujifilm.FocusPrioritySetting Short 1 17 17 +Exif.Fujifilm.FocusSetting Long 1 0 0 +Exif.Fujifilm.ContinuousFocusSetting Long 1 258 258 +Exif.Fujifilm.ExposureCount Short 1 1 1 Exif.Fujifilm.ShadowTone SLong 1 -64 +4 Exif.Fujifilm.HighlightTone SLong 1 32 -2 +Exif.Fujifilm.LensModulationOptimizer Long 1 1 On +Exif.Fujifilm.GrainEffectRoughness SLong 1 0 Off +Exif.Fujifilm.ColorChromeEffect SLong 1 0 Off Exif.Fujifilm.CropMode Short 1 0 None +Exif.Fujifilm.ShutterType Short 1 0 Mechanical +Exif.Fujifilm.DriveSetting Long 1 0 Single +Exif.Fujifilm.ImageStabilization Short 3 0 0 0 0 0 0 Exif.Fujifilm.Rating Long 1 0 0 +Exif.Fujifilm.ImageGeneration Short 1 0 Original Image +Exif.Fujifilm.ImageNumber Short 1 32768 32768 +Exif.Fujifilm.FacesDetected Short 1 0 0 +Exif.Fujifilm.NumberFaceElements Short 1 0 0 Exif.Fujifilm.BlurWarning Short 1 0 Off -Exif.Fujifilm.Color Short 1 0 Normal +Exif.Fujifilm.Color Short 1 0 0 (normal) Exif.Fujifilm.Continuous Short 1 0 Off Exif.Fujifilm.DevelopmentDynamicRange Short 1 100 100 Exif.Fujifilm.DynamicRange Short 1 1 Standard -Exif.Fujifilm.DynamicRangeSetting Short 1 1 Raw +Exif.Fujifilm.DynamicRangeSetting Short 1 1 Manual Exif.Fujifilm.ExposureWarning Short 1 0 Off -Exif.Fujifilm.FilmMode Short 1 0 F0/Standard (Provia) -Exif.Fujifilm.FlashMode Short 1 32768 (32768) +Exif.Fujifilm.FilmMode Short 1 0 PROVIA (F0/Standard) +Exif.Fujifilm.FlashMode Short 1 32768 No flash Exif.Fujifilm.FlashStrength SRational 1 0/100 0/100 Exif.Fujifilm.FocusMode Short 1 1 Manual Exif.Fujifilm.FocusWarning Short 1 0 Off @@ -52,7 +71,7 @@ Exif.Fujifilm.MinFocalLength Rational 1 5000/100 5000/100 Exif.Fujifilm.PictureMode Short 1 768 Manual Exif.Fujifilm.Quality Ascii 8 NORMAL NORMAL Exif.Fujifilm.SequenceNumber Short 1 0 0 -Exif.Fujifilm.Sharpness Short 1 3 Normal +Exif.Fujifilm.Sharpness Short 1 3 0 (normal) Exif.Fujifilm.SlowSync Short 1 0 Off Exif.Fujifilm.Version Undefined 4 48 49 51 48 48 49 51 48 Exif.Fujifilm.WhiteBalance Short 1 0 Auto diff --git a/test/data/test_reference_files/exiv2-bug1179a.exv.out b/test/data/test_reference_files/exiv2-bug1179a.exv.out index 6ed581bd..a1aa77f7 100644 --- a/test/data/test_reference_files/exiv2-bug1179a.exv.out +++ b/test/data/test_reference_files/exiv2-bug1179a.exv.out @@ -34,26 +34,38 @@ Exif.MakerNote.ByteOrder Ascii 3 II II Exif.Fujifilm.Version Undefined 4 48 49 51 48 48 49 51 48 Exif.Fujifilm.SerialNumber Ascii 48 FFDT22794526 593332303134151113535030217060 FFDT22794526 593332303134151113535030217060 Exif.Fujifilm.Quality Ascii 8 NORMAL NORMAL -Exif.Fujifilm.Sharpness Short 1 3 Normal +Exif.Fujifilm.Sharpness Short 1 3 0 (normal) Exif.Fujifilm.WhiteBalance Short 1 0 Auto -Exif.Fujifilm.Color Short 1 0 Normal +Exif.Fujifilm.Color Short 1 0 0 (normal) +Exif.Fujifilm.WhiteBalanceFineTune SLong 2 0 0 R: 0 B: 0 +Exif.Fujifilm.NoiseReduction Short 1 256 n/a +Exif.Fujifilm.HighIsoNoiseReduction Short 1 0 0 (normal) Exif.Fujifilm.FlashMode Short 1 2 Off Exif.Fujifilm.FlashStrength SRational 1 0/100 0/100 Exif.Fujifilm.Macro Short 1 0 Off Exif.Fujifilm.FocusMode Short 1 0 Auto +Exif.Fujifilm.FocusArea Short 1 1 Single Point +Exif.Fujifilm.FocusPoint Short 2 961 641 961 641 Exif.Fujifilm.SlowSync Short 1 0 Off Exif.Fujifilm.PictureMode Short 1 6 Program AE +Exif.Fujifilm.ExposureCount Short 1 1 1 Exif.Fujifilm.ShadowTone SLong 1 0 0 Exif.Fujifilm.HighlightTone SLong 1 0 0 +Exif.Fujifilm.LensModulationOptimizer Long 1 1 On +Exif.Fujifilm.ShutterType Short 1 0 Mechanical Exif.Fujifilm.Continuous Short 1 0 Off Exif.Fujifilm.SequenceNumber Short 1 0 0 Exif.Fujifilm.BlurWarning Short 1 0 Off Exif.Fujifilm.FocusWarning Short 1 0 Off Exif.Fujifilm.ExposureWarning Short 1 0 Off Exif.Fujifilm.DynamicRange Short 1 1 Standard -Exif.Fujifilm.FilmMode Short 1 0 F0/Standard (Provia) -Exif.Fujifilm.DynamicRangeSetting Short 1 0 Auto (100-400%) +Exif.Fujifilm.FilmMode Short 1 0 PROVIA (F0/Standard) +Exif.Fujifilm.DynamicRangeSetting Short 1 0 Auto +Exif.Fujifilm.AutoDynamicRange Short 1 100 100 Exif.Fujifilm.Rating Long 1 0 0 +Exif.Fujifilm.ImageGeneration Short 1 0 Original Image +Exif.Fujifilm.FacesDetected Short 1 0 0 +Exif.Fujifilm.NumberFaceElements Short 1 0 0 Exif.Photo.FlashpixVersion Undefined 4 48 49 48 48 1.00 Exif.Photo.ColorSpace Short 1 1 sRGB Exif.Photo.PixelXDimension Long 1 1920 1920 diff --git a/test/data/test_reference_files/exiv2-bug1179b.exv.out b/test/data/test_reference_files/exiv2-bug1179b.exv.out index 96a849c5..08031215 100644 --- a/test/data/test_reference_files/exiv2-bug1179b.exv.out +++ b/test/data/test_reference_files/exiv2-bug1179b.exv.out @@ -34,26 +34,38 @@ Exif.MakerNote.ByteOrder Ascii 3 II II Exif.Fujifilm.Version Undefined 4 48 49 51 48 48 49 51 48 Exif.Fujifilm.SerialNumber Ascii 48 FFDT22794526 593332303134151113535030217060 FFDT22794526 593332303134151113535030217060 Exif.Fujifilm.Quality Ascii 8 NORMAL NORMAL -Exif.Fujifilm.Sharpness Short 1 3 Normal +Exif.Fujifilm.Sharpness Short 1 3 0 (normal) Exif.Fujifilm.WhiteBalance Short 1 0 Auto -Exif.Fujifilm.Color Short 1 0 Normal +Exif.Fujifilm.Color Short 1 0 0 (normal) +Exif.Fujifilm.WhiteBalanceFineTune SLong 2 0 0 R: 0 B: 0 +Exif.Fujifilm.NoiseReduction Short 1 256 n/a +Exif.Fujifilm.HighIsoNoiseReduction Short 1 0 0 (normal) Exif.Fujifilm.FlashMode Short 1 2 Off Exif.Fujifilm.FlashStrength SRational 1 0/100 0/100 Exif.Fujifilm.Macro Short 1 0 Off Exif.Fujifilm.FocusMode Short 1 0 Auto +Exif.Fujifilm.FocusArea Short 1 1 Single Point +Exif.Fujifilm.FocusPoint Short 2 961 939 961 939 Exif.Fujifilm.SlowSync Short 1 0 Off Exif.Fujifilm.PictureMode Short 1 6 Program AE +Exif.Fujifilm.ExposureCount Short 1 1 1 Exif.Fujifilm.ShadowTone SLong 1 0 0 Exif.Fujifilm.HighlightTone SLong 1 0 0 +Exif.Fujifilm.LensModulationOptimizer Long 1 1 On +Exif.Fujifilm.ShutterType Short 1 0 Mechanical Exif.Fujifilm.Continuous Short 1 0 Off Exif.Fujifilm.SequenceNumber Short 1 0 0 Exif.Fujifilm.BlurWarning Short 1 0 Off Exif.Fujifilm.FocusWarning Short 1 0 Off Exif.Fujifilm.ExposureWarning Short 1 0 Off Exif.Fujifilm.DynamicRange Short 1 1 Standard -Exif.Fujifilm.FilmMode Short 1 512 F2/Fujichrome (Velvia) -Exif.Fujifilm.DynamicRangeSetting Short 1 0 Auto (100-400%) +Exif.Fujifilm.FilmMode Short 1 512 Velvia (F2/Fujichrome) +Exif.Fujifilm.DynamicRangeSetting Short 1 0 Auto +Exif.Fujifilm.AutoDynamicRange Short 1 100 100 Exif.Fujifilm.Rating Long 1 0 0 +Exif.Fujifilm.ImageGeneration Short 1 0 Original Image +Exif.Fujifilm.FacesDetected Short 1 0 0 +Exif.Fujifilm.NumberFaceElements Short 1 0 0 Exif.Photo.FlashpixVersion Undefined 4 48 49 48 48 1.00 Exif.Photo.ColorSpace Short 1 1 sRGB Exif.Photo.PixelXDimension Long 1 1920 1920 diff --git a/test/data/test_reference_files/exiv2-bug1179c.exv.out b/test/data/test_reference_files/exiv2-bug1179c.exv.out index 327feffc..33756cee 100644 --- a/test/data/test_reference_files/exiv2-bug1179c.exv.out +++ b/test/data/test_reference_files/exiv2-bug1179c.exv.out @@ -34,26 +34,38 @@ Exif.MakerNote.ByteOrder Ascii 3 II II Exif.Fujifilm.Version Undefined 4 48 49 51 48 48 49 51 48 Exif.Fujifilm.SerialNumber Ascii 48 FFDT22794526 593332303134151113535030217060 FFDT22794526 593332303134151113535030217060 Exif.Fujifilm.Quality Ascii 8 NORMAL NORMAL -Exif.Fujifilm.Sharpness Short 1 3 Normal +Exif.Fujifilm.Sharpness Short 1 3 0 (normal) Exif.Fujifilm.WhiteBalance Short 1 0 Auto -Exif.Fujifilm.Color Short 1 0 Normal +Exif.Fujifilm.Color Short 1 0 0 (normal) +Exif.Fujifilm.WhiteBalanceFineTune SLong 2 0 0 R: 0 B: 0 +Exif.Fujifilm.NoiseReduction Short 1 256 n/a +Exif.Fujifilm.HighIsoNoiseReduction Short 1 0 0 (normal) Exif.Fujifilm.FlashMode Short 1 2 Off Exif.Fujifilm.FlashStrength SRational 1 0/100 0/100 Exif.Fujifilm.Macro Short 1 0 Off Exif.Fujifilm.FocusMode Short 1 0 Auto +Exif.Fujifilm.FocusArea Short 1 1 Single Point +Exif.Fujifilm.FocusPoint Short 2 961 939 961 939 Exif.Fujifilm.SlowSync Short 1 0 Off Exif.Fujifilm.PictureMode Short 1 6 Program AE +Exif.Fujifilm.ExposureCount Short 1 1 1 Exif.Fujifilm.ShadowTone SLong 1 0 0 Exif.Fujifilm.HighlightTone SLong 1 0 0 +Exif.Fujifilm.LensModulationOptimizer Long 1 1 On +Exif.Fujifilm.ShutterType Short 1 0 Mechanical Exif.Fujifilm.Continuous Short 1 0 Off Exif.Fujifilm.SequenceNumber Short 1 0 0 Exif.Fujifilm.BlurWarning Short 1 0 Off Exif.Fujifilm.FocusWarning Short 1 0 Off Exif.Fujifilm.ExposureWarning Short 1 0 Off Exif.Fujifilm.DynamicRange Short 1 1 Standard -Exif.Fujifilm.FilmMode Short 1 288 F1b/Studio Portrait Smooth Skin Tone (Astia) -Exif.Fujifilm.DynamicRangeSetting Short 1 0 Auto (100-400%) +Exif.Fujifilm.FilmMode Short 1 288 ASTIA (F1b/Studio Portrait Smooth Skin Tone) +Exif.Fujifilm.DynamicRangeSetting Short 1 0 Auto +Exif.Fujifilm.AutoDynamicRange Short 1 100 100 Exif.Fujifilm.Rating Long 1 0 0 +Exif.Fujifilm.ImageGeneration Short 1 0 Original Image +Exif.Fujifilm.FacesDetected Short 1 0 0 +Exif.Fujifilm.NumberFaceElements Short 1 0 0 Exif.Photo.FlashpixVersion Undefined 4 48 49 48 48 1.00 Exif.Photo.ColorSpace Short 1 1 sRGB Exif.Photo.PixelXDimension Long 1 1920 1920 diff --git a/test/data/test_reference_files/exiv2-bug1179d.exv.out b/test/data/test_reference_files/exiv2-bug1179d.exv.out index a2a8e2be..613b7e9f 100644 --- a/test/data/test_reference_files/exiv2-bug1179d.exv.out +++ b/test/data/test_reference_files/exiv2-bug1179d.exv.out @@ -34,26 +34,38 @@ Exif.MakerNote.ByteOrder Ascii 3 II II Exif.Fujifilm.Version Undefined 4 48 49 51 48 48 49 51 48 Exif.Fujifilm.SerialNumber Ascii 48 FFDT22794526 593332303134151113535030217060 FFDT22794526 593332303134151113535030217060 Exif.Fujifilm.Quality Ascii 8 NORMAL NORMAL -Exif.Fujifilm.Sharpness Short 1 3 Normal +Exif.Fujifilm.Sharpness Short 1 3 0 (normal) Exif.Fujifilm.WhiteBalance Short 1 0 Auto -Exif.Fujifilm.Color Short 1 0 Normal +Exif.Fujifilm.Color Short 1 0 0 (normal) +Exif.Fujifilm.WhiteBalanceFineTune SLong 2 0 0 R: 0 B: 0 +Exif.Fujifilm.NoiseReduction Short 1 256 n/a +Exif.Fujifilm.HighIsoNoiseReduction Short 1 0 0 (normal) Exif.Fujifilm.FlashMode Short 1 2 Off Exif.Fujifilm.FlashStrength SRational 1 0/100 0/100 Exif.Fujifilm.Macro Short 1 0 Off Exif.Fujifilm.FocusMode Short 1 0 Auto +Exif.Fujifilm.FocusArea Short 1 1 Single Point +Exif.Fujifilm.FocusPoint Short 2 961 939 961 939 Exif.Fujifilm.SlowSync Short 1 0 Off Exif.Fujifilm.PictureMode Short 1 6 Program AE +Exif.Fujifilm.ExposureCount Short 1 1 1 Exif.Fujifilm.ShadowTone SLong 1 0 0 Exif.Fujifilm.HighlightTone SLong 1 0 0 +Exif.Fujifilm.LensModulationOptimizer Long 1 1 On +Exif.Fujifilm.ShutterType Short 1 0 Mechanical Exif.Fujifilm.Continuous Short 1 0 Off Exif.Fujifilm.SequenceNumber Short 1 0 0 Exif.Fujifilm.BlurWarning Short 1 0 Off Exif.Fujifilm.FocusWarning Short 1 0 Off Exif.Fujifilm.ExposureWarning Short 1 0 Off Exif.Fujifilm.DynamicRange Short 1 1 Standard -Exif.Fujifilm.FilmMode Short 1 1536 Classic Chrome -Exif.Fujifilm.DynamicRangeSetting Short 1 0 Auto (100-400%) +Exif.Fujifilm.FilmMode Short 1 1536 CLASSIC CHROME +Exif.Fujifilm.DynamicRangeSetting Short 1 0 Auto +Exif.Fujifilm.AutoDynamicRange Short 1 100 100 Exif.Fujifilm.Rating Long 1 0 0 +Exif.Fujifilm.ImageGeneration Short 1 0 Original Image +Exif.Fujifilm.FacesDetected Short 1 0 0 +Exif.Fujifilm.NumberFaceElements Short 1 0 0 Exif.Photo.FlashpixVersion Undefined 4 48 49 48 48 1.00 Exif.Photo.ColorSpace Short 1 1 sRGB Exif.Photo.PixelXDimension Long 1 1920 1920 diff --git a/test/data/test_reference_files/exiv2-bug1179e.exv.out b/test/data/test_reference_files/exiv2-bug1179e.exv.out index b43a70d9..5d3770fd 100644 --- a/test/data/test_reference_files/exiv2-bug1179e.exv.out +++ b/test/data/test_reference_files/exiv2-bug1179e.exv.out @@ -34,26 +34,38 @@ Exif.MakerNote.ByteOrder Ascii 3 II II Exif.Fujifilm.Version Undefined 4 48 49 51 48 48 49 51 48 Exif.Fujifilm.SerialNumber Ascii 48 FFDT22794526 593332303134151113535030217060 FFDT22794526 593332303134151113535030217060 Exif.Fujifilm.Quality Ascii 8 NORMAL NORMAL -Exif.Fujifilm.Sharpness Short 1 3 Normal +Exif.Fujifilm.Sharpness Short 1 3 0 (normal) Exif.Fujifilm.WhiteBalance Short 1 0 Auto -Exif.Fujifilm.Color Short 1 0 Normal +Exif.Fujifilm.Color Short 1 0 0 (normal) +Exif.Fujifilm.WhiteBalanceFineTune SLong 2 0 0 R: 0 B: 0 +Exif.Fujifilm.NoiseReduction Short 1 256 n/a +Exif.Fujifilm.HighIsoNoiseReduction Short 1 0 0 (normal) Exif.Fujifilm.FlashMode Short 1 2 Off Exif.Fujifilm.FlashStrength SRational 1 0/100 0/100 Exif.Fujifilm.Macro Short 1 0 Off Exif.Fujifilm.FocusMode Short 1 0 Auto +Exif.Fujifilm.FocusArea Short 1 1 Single Point +Exif.Fujifilm.FocusPoint Short 2 961 939 961 939 Exif.Fujifilm.SlowSync Short 1 0 Off Exif.Fujifilm.PictureMode Short 1 6 Program AE +Exif.Fujifilm.ExposureCount Short 1 1 1 Exif.Fujifilm.ShadowTone SLong 1 0 0 Exif.Fujifilm.HighlightTone SLong 1 0 0 +Exif.Fujifilm.LensModulationOptimizer Long 1 1 On +Exif.Fujifilm.ShutterType Short 1 0 Mechanical Exif.Fujifilm.Continuous Short 1 0 Off Exif.Fujifilm.SequenceNumber Short 1 0 0 Exif.Fujifilm.BlurWarning Short 1 0 Off Exif.Fujifilm.FocusWarning Short 1 0 Off Exif.Fujifilm.ExposureWarning Short 1 0 Off Exif.Fujifilm.DynamicRange Short 1 1 Standard -Exif.Fujifilm.FilmMode Short 1 1281 Pro Neg. Hi -Exif.Fujifilm.DynamicRangeSetting Short 1 0 Auto (100-400%) +Exif.Fujifilm.FilmMode Short 1 1281 PRO Neg. Hi +Exif.Fujifilm.DynamicRangeSetting Short 1 0 Auto +Exif.Fujifilm.AutoDynamicRange Short 1 100 100 Exif.Fujifilm.Rating Long 1 0 0 +Exif.Fujifilm.ImageGeneration Short 1 0 Original Image +Exif.Fujifilm.FacesDetected Short 1 0 0 +Exif.Fujifilm.NumberFaceElements Short 1 0 0 Exif.Photo.FlashpixVersion Undefined 4 48 49 48 48 1.00 Exif.Photo.ColorSpace Short 1 1 sRGB Exif.Photo.PixelXDimension Long 1 1920 1920 diff --git a/test/data/test_reference_files/exiv2-bug1179f.exv.out b/test/data/test_reference_files/exiv2-bug1179f.exv.out index b9ddb9cf..d0fbe79b 100644 --- a/test/data/test_reference_files/exiv2-bug1179f.exv.out +++ b/test/data/test_reference_files/exiv2-bug1179f.exv.out @@ -34,25 +34,37 @@ Exif.MakerNote.ByteOrder Ascii 3 II II Exif.Fujifilm.Version Undefined 4 48 49 51 48 48 49 51 48 Exif.Fujifilm.SerialNumber Ascii 48 FFDT22794526 593332303134151113535030217060 FFDT22794526 593332303134151113535030217060 Exif.Fujifilm.Quality Ascii 8 NORMAL NORMAL -Exif.Fujifilm.Sharpness Short 1 3 Normal +Exif.Fujifilm.Sharpness Short 1 3 0 (normal) Exif.Fujifilm.WhiteBalance Short 1 0 Auto Exif.Fujifilm.Color Short 1 768 Monochrome +Exif.Fujifilm.WhiteBalanceFineTune SLong 2 0 0 R: 0 B: 0 +Exif.Fujifilm.NoiseReduction Short 1 256 n/a +Exif.Fujifilm.HighIsoNoiseReduction Short 1 0 0 (normal) Exif.Fujifilm.FlashMode Short 1 2 Off Exif.Fujifilm.FlashStrength SRational 1 0/100 0/100 Exif.Fujifilm.Macro Short 1 0 Off Exif.Fujifilm.FocusMode Short 1 1 Manual +Exif.Fujifilm.FocusArea Short 1 0 Wide +Exif.Fujifilm.FocusPoint Short 2 961 641 961 641 Exif.Fujifilm.SlowSync Short 1 0 Off Exif.Fujifilm.PictureMode Short 1 6 Program AE +Exif.Fujifilm.ExposureCount Short 1 1 1 Exif.Fujifilm.ShadowTone SLong 1 0 0 Exif.Fujifilm.HighlightTone SLong 1 0 0 +Exif.Fujifilm.LensModulationOptimizer Long 1 1 On +Exif.Fujifilm.ShutterType Short 1 0 Mechanical Exif.Fujifilm.Continuous Short 1 0 Off Exif.Fujifilm.SequenceNumber Short 1 0 0 Exif.Fujifilm.BlurWarning Short 1 1 On Exif.Fujifilm.FocusWarning Short 1 0 Off Exif.Fujifilm.ExposureWarning Short 1 1 On Exif.Fujifilm.DynamicRange Short 1 1 Standard -Exif.Fujifilm.DynamicRangeSetting Short 1 0 Auto (100-400%) +Exif.Fujifilm.DynamicRangeSetting Short 1 0 Auto +Exif.Fujifilm.AutoDynamicRange Short 1 100 100 Exif.Fujifilm.Rating Long 1 0 0 +Exif.Fujifilm.ImageGeneration Short 1 0 Original Image +Exif.Fujifilm.FacesDetected Short 1 0 0 +Exif.Fujifilm.NumberFaceElements Short 1 0 0 Exif.Photo.FlashpixVersion Undefined 4 48 49 48 48 1.00 Exif.Photo.ColorSpace Short 1 1 sRGB Exif.Photo.PixelXDimension Long 1 1920 1920 diff --git a/test/data/test_reference_files/exiv2-bug1179g.exv.out b/test/data/test_reference_files/exiv2-bug1179g.exv.out index a532d88d..53623a2d 100644 --- a/test/data/test_reference_files/exiv2-bug1179g.exv.out +++ b/test/data/test_reference_files/exiv2-bug1179g.exv.out @@ -34,25 +34,37 @@ Exif.MakerNote.ByteOrder Ascii 3 II II Exif.Fujifilm.Version Undefined 4 48 49 51 48 48 49 51 48 Exif.Fujifilm.SerialNumber Ascii 48 FFDT22794526 593332303134151113535030217060 FFDT22794526 593332303134151113535030217060 Exif.Fujifilm.Quality Ascii 8 NORMAL NORMAL -Exif.Fujifilm.Sharpness Short 1 3 Normal +Exif.Fujifilm.Sharpness Short 1 3 0 (normal) Exif.Fujifilm.WhiteBalance Short 1 0 Auto Exif.Fujifilm.Color Short 1 770 Monochrome + Ye Filter +Exif.Fujifilm.WhiteBalanceFineTune SLong 2 0 0 R: 0 B: 0 +Exif.Fujifilm.NoiseReduction Short 1 256 n/a +Exif.Fujifilm.HighIsoNoiseReduction Short 1 0 0 (normal) Exif.Fujifilm.FlashMode Short 1 2 Off Exif.Fujifilm.FlashStrength SRational 1 0/100 0/100 Exif.Fujifilm.Macro Short 1 0 Off Exif.Fujifilm.FocusMode Short 1 1 Manual +Exif.Fujifilm.FocusArea Short 1 0 Wide +Exif.Fujifilm.FocusPoint Short 2 961 641 961 641 Exif.Fujifilm.SlowSync Short 1 0 Off Exif.Fujifilm.PictureMode Short 1 6 Program AE +Exif.Fujifilm.ExposureCount Short 1 1 1 Exif.Fujifilm.ShadowTone SLong 1 0 0 Exif.Fujifilm.HighlightTone SLong 1 0 0 +Exif.Fujifilm.LensModulationOptimizer Long 1 1 On +Exif.Fujifilm.ShutterType Short 1 0 Mechanical Exif.Fujifilm.Continuous Short 1 0 Off Exif.Fujifilm.SequenceNumber Short 1 0 0 Exif.Fujifilm.BlurWarning Short 1 1 On Exif.Fujifilm.FocusWarning Short 1 0 Off Exif.Fujifilm.ExposureWarning Short 1 1 On Exif.Fujifilm.DynamicRange Short 1 1 Standard -Exif.Fujifilm.DynamicRangeSetting Short 1 0 Auto (100-400%) +Exif.Fujifilm.DynamicRangeSetting Short 1 0 Auto +Exif.Fujifilm.AutoDynamicRange Short 1 100 100 Exif.Fujifilm.Rating Long 1 0 0 +Exif.Fujifilm.ImageGeneration Short 1 0 Original Image +Exif.Fujifilm.FacesDetected Short 1 0 0 +Exif.Fujifilm.NumberFaceElements Short 1 0 0 Exif.Photo.FlashpixVersion Undefined 4 48 49 48 48 1.00 Exif.Photo.ColorSpace Short 1 1 sRGB Exif.Photo.PixelXDimension Long 1 1920 1920 diff --git a/test/data/test_reference_files/exiv2-bug1179h.exv.out b/test/data/test_reference_files/exiv2-bug1179h.exv.out index 40d7aa55..738f1661 100644 --- a/test/data/test_reference_files/exiv2-bug1179h.exv.out +++ b/test/data/test_reference_files/exiv2-bug1179h.exv.out @@ -34,25 +34,37 @@ Exif.MakerNote.ByteOrder Ascii 3 II II Exif.Fujifilm.Version Undefined 4 48 49 51 48 48 49 51 48 Exif.Fujifilm.SerialNumber Ascii 48 FFDT22794526 593332303134151113535030217060 FFDT22794526 593332303134151113535030217060 Exif.Fujifilm.Quality Ascii 8 NORMAL NORMAL -Exif.Fujifilm.Sharpness Short 1 3 Normal +Exif.Fujifilm.Sharpness Short 1 3 0 (normal) Exif.Fujifilm.WhiteBalance Short 1 0 Auto Exif.Fujifilm.Color Short 1 769 Monochrome + R Filter +Exif.Fujifilm.WhiteBalanceFineTune SLong 2 0 0 R: 0 B: 0 +Exif.Fujifilm.NoiseReduction Short 1 256 n/a +Exif.Fujifilm.HighIsoNoiseReduction Short 1 0 0 (normal) Exif.Fujifilm.FlashMode Short 1 2 Off Exif.Fujifilm.FlashStrength SRational 1 0/100 0/100 Exif.Fujifilm.Macro Short 1 0 Off Exif.Fujifilm.FocusMode Short 1 1 Manual +Exif.Fujifilm.FocusArea Short 1 0 Wide +Exif.Fujifilm.FocusPoint Short 2 961 641 961 641 Exif.Fujifilm.SlowSync Short 1 0 Off Exif.Fujifilm.PictureMode Short 1 512 Shutter speed priority AE +Exif.Fujifilm.ExposureCount Short 1 1 1 Exif.Fujifilm.ShadowTone SLong 1 0 0 Exif.Fujifilm.HighlightTone SLong 1 0 0 +Exif.Fujifilm.LensModulationOptimizer Long 1 1 On +Exif.Fujifilm.ShutterType Short 1 0 Mechanical Exif.Fujifilm.Continuous Short 1 0 Off Exif.Fujifilm.SequenceNumber Short 1 0 0 Exif.Fujifilm.BlurWarning Short 1 0 Off Exif.Fujifilm.FocusWarning Short 1 0 Off Exif.Fujifilm.ExposureWarning Short 1 1 On Exif.Fujifilm.DynamicRange Short 1 1 Standard -Exif.Fujifilm.DynamicRangeSetting Short 1 0 Auto (100-400%) +Exif.Fujifilm.DynamicRangeSetting Short 1 0 Auto +Exif.Fujifilm.AutoDynamicRange Short 1 100 100 Exif.Fujifilm.Rating Long 1 0 0 +Exif.Fujifilm.ImageGeneration Short 1 0 Original Image +Exif.Fujifilm.FacesDetected Short 1 0 0 +Exif.Fujifilm.NumberFaceElements Short 1 0 0 Exif.Photo.FlashpixVersion Undefined 4 48 49 48 48 1.00 Exif.Photo.ColorSpace Short 1 1 sRGB Exif.Photo.PixelXDimension Long 1 1920 1920 diff --git a/test/data/test_reference_files/exiv2-bug1179i.exv.out b/test/data/test_reference_files/exiv2-bug1179i.exv.out index 0ee3ff0c..048563b9 100644 --- a/test/data/test_reference_files/exiv2-bug1179i.exv.out +++ b/test/data/test_reference_files/exiv2-bug1179i.exv.out @@ -34,25 +34,37 @@ Exif.MakerNote.ByteOrder Ascii 3 II II Exif.Fujifilm.Version Undefined 4 48 49 51 48 48 49 51 48 Exif.Fujifilm.SerialNumber Ascii 48 FFDT22794526 593332303134151113535030217060 FFDT22794526 593332303134151113535030217060 Exif.Fujifilm.Quality Ascii 8 NORMAL NORMAL -Exif.Fujifilm.Sharpness Short 1 3 Normal +Exif.Fujifilm.Sharpness Short 1 3 0 (normal) Exif.Fujifilm.WhiteBalance Short 1 0 Auto Exif.Fujifilm.Color Short 1 771 Monochrome + G Filter +Exif.Fujifilm.WhiteBalanceFineTune SLong 2 0 0 R: 0 B: 0 +Exif.Fujifilm.NoiseReduction Short 1 256 n/a +Exif.Fujifilm.HighIsoNoiseReduction Short 1 0 0 (normal) Exif.Fujifilm.FlashMode Short 1 2 Off Exif.Fujifilm.FlashStrength SRational 1 0/100 0/100 Exif.Fujifilm.Macro Short 1 0 Off Exif.Fujifilm.FocusMode Short 1 1 Manual +Exif.Fujifilm.FocusArea Short 1 0 Wide +Exif.Fujifilm.FocusPoint Short 2 961 641 961 641 Exif.Fujifilm.SlowSync Short 1 0 Off Exif.Fujifilm.PictureMode Short 1 512 Shutter speed priority AE +Exif.Fujifilm.ExposureCount Short 1 1 1 Exif.Fujifilm.ShadowTone SLong 1 0 0 Exif.Fujifilm.HighlightTone SLong 1 0 0 +Exif.Fujifilm.LensModulationOptimizer Long 1 1 On +Exif.Fujifilm.ShutterType Short 1 0 Mechanical Exif.Fujifilm.Continuous Short 1 0 Off Exif.Fujifilm.SequenceNumber Short 1 0 0 Exif.Fujifilm.BlurWarning Short 1 0 Off Exif.Fujifilm.FocusWarning Short 1 0 Off Exif.Fujifilm.ExposureWarning Short 1 1 On Exif.Fujifilm.DynamicRange Short 1 1 Standard -Exif.Fujifilm.DynamicRangeSetting Short 1 0 Auto (100-400%) +Exif.Fujifilm.DynamicRangeSetting Short 1 0 Auto +Exif.Fujifilm.AutoDynamicRange Short 1 100 100 Exif.Fujifilm.Rating Long 1 0 0 +Exif.Fujifilm.ImageGeneration Short 1 0 Original Image +Exif.Fujifilm.FacesDetected Short 1 0 0 +Exif.Fujifilm.NumberFaceElements Short 1 0 0 Exif.Photo.FlashpixVersion Undefined 4 48 49 48 48 1.00 Exif.Photo.ColorSpace Short 1 1 sRGB Exif.Photo.PixelXDimension Long 1 1920 1920 diff --git a/test/data/test_reference_files/exiv2-bug1179j.exv.out b/test/data/test_reference_files/exiv2-bug1179j.exv.out index 1e779e28..f4bdca0d 100644 --- a/test/data/test_reference_files/exiv2-bug1179j.exv.out +++ b/test/data/test_reference_files/exiv2-bug1179j.exv.out @@ -34,25 +34,37 @@ Exif.MakerNote.ByteOrder Ascii 3 II II Exif.Fujifilm.Version Undefined 4 48 49 51 48 48 49 51 48 Exif.Fujifilm.SerialNumber Ascii 48 FFDT22794526 593332303134151113535030217060 FFDT22794526 593332303134151113535030217060 Exif.Fujifilm.Quality Ascii 8 NORMAL NORMAL -Exif.Fujifilm.Sharpness Short 1 3 Normal +Exif.Fujifilm.Sharpness Short 1 3 0 (normal) Exif.Fujifilm.WhiteBalance Short 1 0 Auto Exif.Fujifilm.Color Short 1 784 Sepia +Exif.Fujifilm.WhiteBalanceFineTune SLong 2 0 0 R: 0 B: 0 +Exif.Fujifilm.NoiseReduction Short 1 256 n/a +Exif.Fujifilm.HighIsoNoiseReduction Short 1 0 0 (normal) Exif.Fujifilm.FlashMode Short 1 2 Off Exif.Fujifilm.FlashStrength SRational 1 0/100 0/100 Exif.Fujifilm.Macro Short 1 0 Off Exif.Fujifilm.FocusMode Short 1 1 Manual +Exif.Fujifilm.FocusArea Short 1 0 Wide +Exif.Fujifilm.FocusPoint Short 2 961 641 961 641 Exif.Fujifilm.SlowSync Short 1 0 Off Exif.Fujifilm.PictureMode Short 1 512 Shutter speed priority AE +Exif.Fujifilm.ExposureCount Short 1 1 1 Exif.Fujifilm.ShadowTone SLong 1 0 0 Exif.Fujifilm.HighlightTone SLong 1 0 0 +Exif.Fujifilm.LensModulationOptimizer Long 1 1 On +Exif.Fujifilm.ShutterType Short 1 0 Mechanical Exif.Fujifilm.Continuous Short 1 0 Off Exif.Fujifilm.SequenceNumber Short 1 0 0 Exif.Fujifilm.BlurWarning Short 1 0 Off Exif.Fujifilm.FocusWarning Short 1 0 Off Exif.Fujifilm.ExposureWarning Short 1 1 On Exif.Fujifilm.DynamicRange Short 1 1 Standard -Exif.Fujifilm.DynamicRangeSetting Short 1 0 Auto (100-400%) +Exif.Fujifilm.DynamicRangeSetting Short 1 0 Auto +Exif.Fujifilm.AutoDynamicRange Short 1 100 100 Exif.Fujifilm.Rating Long 1 0 0 +Exif.Fujifilm.ImageGeneration Short 1 0 Original Image +Exif.Fujifilm.FacesDetected Short 1 0 0 +Exif.Fujifilm.NumberFaceElements Short 1 0 0 Exif.Photo.FlashpixVersion Undefined 4 48 49 48 48 1.00 Exif.Photo.ColorSpace Short 1 1 sRGB Exif.Photo.PixelXDimension Long 1 1920 1920 diff --git a/test/data/test_reference_files/exiv2-fujifilm-finepix-s2pro.jpg.out b/test/data/test_reference_files/exiv2-fujifilm-finepix-s2pro.jpg.out index 757f8d60..23049376 100644 --- a/test/data/test_reference_files/exiv2-fujifilm-finepix-s2pro.jpg.out +++ b/test/data/test_reference_files/exiv2-fujifilm-finepix-s2pro.jpg.out @@ -31,15 +31,17 @@ Exif.MakerNote.Offset Long 1 830 830 Exif.MakerNote.ByteOrder Ascii 3 II II Exif.Fujifilm.Version Undefined 4 48 49 51 48 48 49 51 48 Exif.Fujifilm.Quality Ascii 8 NORMAL NORMAL -Exif.Fujifilm.Sharpness Short 1 3 Normal +Exif.Fujifilm.Sharpness Short 1 3 0 (normal) Exif.Fujifilm.WhiteBalance Short 1 256 Daylight -Exif.Fujifilm.Color Short 1 0 Normal +Exif.Fujifilm.Color Short 1 0 0 (normal) Exif.Fujifilm.Tone Short 1 0 Normal Exif.Fujifilm.FlashMode Short 1 1 On Exif.Fujifilm.FlashStrength SRational 1 10/10 10/10 Exif.Fujifilm.FocusMode Short 1 0 Auto +Exif.Fujifilm.FocusArea Short 1 1 Single Point Exif.Fujifilm.SlowSync Short 1 0 Off Exif.Fujifilm.PictureMode Short 1 256 Aperture-priority AE +Exif.Fujifilm.ExposureCount Short 1 1 1 Exif.Fujifilm.Continuous Short 1 0 Off Exif.Fujifilm.SequenceNumber Short 1 0 0 Exif.Photo.FlashpixVersion Undefined 4 48 49 48 48 1.00 diff --git a/test/data/test_reference_files/exiv2-pr1409.exv.out b/test/data/test_reference_files/exiv2-pr1409.exv.out index 76e8f278..20b9e462 100644 --- a/test/data/test_reference_files/exiv2-pr1409.exv.out +++ b/test/data/test_reference_files/exiv2-pr1409.exv.out @@ -35,31 +35,50 @@ Exif.MakerNote.ByteOrder Ascii 3 II II Exif.Fujifilm.Version Undefined 4 48 49 51 48 48 49 51 48 Exif.Fujifilm.SerialNumber Ascii 48 FF02B4550110 593534373734180817925330110168 FF02B4550110 593534373734180817925330110168 Exif.Fujifilm.Quality Ascii 8 NORMAL NORMAL -Exif.Fujifilm.Sharpness Short 1 3 Normal +Exif.Fujifilm.Sharpness Short 1 3 0 (normal) Exif.Fujifilm.WhiteBalance Short 1 0 Auto -Exif.Fujifilm.Color Short 1 0 Normal -Exif.Fujifilm.FlashMode Short 1 38976 (38976) +Exif.Fujifilm.Color Short 1 0 0 (normal) +Exif.Fujifilm.WhiteBalanceFineTune SLong 2 0 0 R: 0 B: 0 +Exif.Fujifilm.NoiseReduction Short 1 256 n/a +Exif.Fujifilm.HighIsoNoiseReduction Short 1 0 0 (normal) +Exif.Fujifilm.FlashMode Short 1 38976 Manual Exif.Fujifilm.FlashStrength SRational 1 0/100 0/100 Exif.Fujifilm.FocusMode Short 1 0 Auto +Exif.Fujifilm.FocusArea Short 1 1 Single Point +Exif.Fujifilm.FocusPoint Short 2 3598 2090 3598 2090 +Exif.Fujifilm.FocusPrioritySetting Short 1 17 17 +Exif.Fujifilm.FocusSetting Long 1 16401 16401 +Exif.Fujifilm.ContinuousFocusSetting Long 1 258 258 Exif.Fujifilm.SlowSync Short 1 0 Off Exif.Fujifilm.PictureMode Short 1 256 Aperture-priority AE +Exif.Fujifilm.ExposureCount Short 1 1 1 Exif.Fujifilm.ShadowTone SLong 1 0 0 Exif.Fujifilm.HighlightTone SLong 1 0 0 +Exif.Fujifilm.LensModulationOptimizer Long 1 1 On +Exif.Fujifilm.GrainEffectRoughness SLong 1 0 Off +Exif.Fujifilm.ColorChromeEffect SLong 1 0 Off Exif.Fujifilm.CropMode Short 1 0 None +Exif.Fujifilm.ShutterType Short 1 0 Mechanical Exif.Fujifilm.Continuous Short 1 0 Off Exif.Fujifilm.SequenceNumber Short 1 0 0 +Exif.Fujifilm.DriveSetting Long 1 0 Single Exif.Fujifilm.BlurWarning Short 1 0 Off Exif.Fujifilm.FocusWarning Short 1 0 Off Exif.Fujifilm.ExposureWarning Short 1 0 Off Exif.Fujifilm.DynamicRange Short 1 1 Standard -Exif.Fujifilm.FilmMode Short 1 0 F0/Standard (Provia) -Exif.Fujifilm.DynamicRangeSetting Short 1 1 Raw +Exif.Fujifilm.FilmMode Short 1 0 PROVIA (F0/Standard) +Exif.Fujifilm.DynamicRangeSetting Short 1 1 Manual Exif.Fujifilm.DevelopmentDynamicRange Short 1 100 100 Exif.Fujifilm.MinFocalLength Rational 1 1800/100 1800/100 Exif.Fujifilm.MaxFocalLength Rational 1 5500/100 5500/100 Exif.Fujifilm.MaxApertureAtMinFocal Rational 1 280/100 280/100 Exif.Fujifilm.MaxApertureAtMaxFocal Rational 1 400/100 400/100 +Exif.Fujifilm.ImageStabilization Short 3 1 1 0 1 1 0 Exif.Fujifilm.Rating Long 1 0 0 +Exif.Fujifilm.ImageGeneration Short 1 0 Original Image +Exif.Fujifilm.ImageNumber Short 1 32775 32775 +Exif.Fujifilm.FacesDetected Short 1 0 0 +Exif.Fujifilm.NumberFaceElements Short 1 0 0 Exif.Fujifilm.RawImageFullWidth Long 1 6384 6384 Exif.Fujifilm.RawImageFullHeight Long 1 4182 4182 Exif.Fujifilm.BitsPerSample Long 1 14 14