Skip to content

Commit 74720d8

Browse files
norbertwgnorbertwg
authored
Remove duplicate tag info entries fujifilm (#2412)
* remove duplicate Fuijifilm TagInfo entries * test data added for some Fujifilm tags * remove unknown tag 0x1200 * fix typo: SzeneRecognition to SceneRecognition
1 parent 83d7915 commit 74720d8

File tree

7 files changed

+213
-77
lines changed

7 files changed

+213
-77
lines changed

‎src/fujimn_int.cpp‎

Lines changed: 1 addition & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,6 @@ constexpr TagInfo FujiMakerNote::tagInfo_[] = {
465465
unsignedShort, -1, printValue},
466466
{0x1154, "PanoramaDirection", N_("Panorama direction"), N_("Panorama direction"), IfdId::fujiId,
467467
SectionId::makerTags, unsignedShort, -1, EXV_PRINT_TAG(fujiPanoramaDirection)},
468-
{0x1200, "0x1200", "0x1200", N_("Unknown"), IfdId::fujiId, SectionId::makerTags, unsignedShort, -1, printValue},
469468
{0x1201, "AdvancedFilter", N_("Advanced filter"), N_("Advanced filter setting"), IfdId::fujiId,
470469
SectionId::makerTags, unsignedLong, -1, EXV_PRINT_TAG(fujiAdvancedFilter)},
471470
{0x1210, "FinePixColor", N_("FinePix Color"), N_("Fuji FinePix color setting"), IfdId::fujiId, SectionId::makerTags,
@@ -496,7 +495,7 @@ constexpr TagInfo FujiMakerNote::tagInfo_[] = {
496495
SectionId::makerTags, unsignedShort, -1, printValue},
497496
{0x1422, "ImageStabilization", N_("Image Stabilization"), N_("Image stabilization"), IfdId::fujiId,
498497
SectionId::makerTags, unsignedShort, -1, printValue},
499-
{0x1425, "SzeneRecognition", N_("Scene recognition"), N_("Scene recognition"), IfdId::fujiId, SectionId::makerTags,
498+
{0x1425, "SceneRecognition", N_("Scene recognition"), N_("Scene recognition"), IfdId::fujiId, SectionId::makerTags,
500499
unsignedShort, -1, EXV_PRINT_TAG(fujiSceneRecognition)},
501500
{0x1431, "Rating", N_("Rating"), N_("Rating"), IfdId::fujiId, SectionId::makerTags, unsignedLong, -1, printValue},
502501
{0x1436, "ImageGeneration", N_("Image Generation"), N_("Image generation"), IfdId::fujiId, SectionId::makerTags,
@@ -532,81 +531,6 @@ constexpr TagInfo FujiMakerNote::tagInfo_[] = {
532531
{0x8003, "FrameNumber", N_("Frame Number"), N_("Frame number"), IfdId::fujiId, SectionId::makerTags, unsignedShort,
533532
-1, printValue},
534533
// #1402
535-
{0xf000, "FujiIFD", N_("FujiIFD"), N_("Fujifilm IFD"), IfdId::fujiId, SectionId::makerTags, undefined, -1,
536-
printValue},
537-
{0xf001, "RawImageFullWidth", N_("Raw Image Full Width"), N_("Raw Image Full Width"), IfdId::fujiId,
538-
SectionId::makerTags, undefined, -1, printValue},
539-
{0x1001, N_("Sharpness"), N_("Sharpness"), N_("Sharpness setting"), IfdId::fujiId, SectionId::makerTags,
540-
unsignedShort, -1, EXV_PRINT_TAG(fujiSharpness)},
541-
{0x1002, "WhiteBalance", N_("White Balance"), N_("White balance setting"), IfdId::fujiId, SectionId::makerTags,
542-
unsignedShort, -1, EXV_PRINT_TAG(fujiWhiteBalance)},
543-
{0x1003, "Color", N_("Color"), N_("Chroma saturation setting"), IfdId::fujiId, SectionId::makerTags, unsignedShort,
544-
-1, EXV_PRINT_TAG(fujiColor)},
545-
{0x1004, "Tone", N_("Tone"), N_("Tone (contrast) setting"), IfdId::fujiId, SectionId::makerTags, unsignedShort, -1,
546-
EXV_PRINT_TAG(fujiTone)},
547-
{0x1010, "FlashMode", N_("Flash Mode"), N_("Flash firing mode setting"), IfdId::fujiId, SectionId::makerTags,
548-
unsignedShort, -1, EXV_PRINT_TAG(fujiFlashMode)},
549-
{0x1011, "FlashStrength", N_("Flash Strength"), N_("Flash firing strength compensation setting"), IfdId::fujiId,
550-
SectionId::makerTags, signedRational, -1, printValue},
551-
{0x1020, "Macro", N_("Macro"), N_("Macro mode setting"), IfdId::fujiId, SectionId::makerTags, unsignedShort, -1,
552-
EXV_PRINT_TAG(fujiOffOn)},
553-
{0x1021, "FocusMode", N_("Focus Mode"), N_("Focusing mode setting"), IfdId::fujiId, SectionId::makerTags,
554-
unsignedShort, -1, EXV_PRINT_TAG(fujiFocusMode)},
555-
{0x1022, "0x1022", "0x1022", N_("Unknown"), IfdId::fujiId, SectionId::makerTags, unsignedShort, -1, printValue},
556-
{0x1030, "SlowSync", N_("Slow Sync"), N_("Slow synchro mode setting"), IfdId::fujiId, SectionId::makerTags,
557-
unsignedShort, -1, EXV_PRINT_TAG(fujiOffOn)},
558-
{0x1031, "PictureMode", N_("Picture Mode"), N_("Picture mode setting"), IfdId::fujiId, SectionId::makerTags,
559-
unsignedShort, -1, EXV_PRINT_TAG(fujiPictureMode)},
560-
{0x1032, "0x1032", "0x1032", N_("Unknown"), IfdId::fujiId, SectionId::makerTags, unsignedShort, -1, printValue},
561-
{0x1040, "ShadowTone", N_("Shadow Tone"), N_("Shadow tone"), IfdId::fujiId, SectionId::makerTags, signedLong, -1,
562-
EXV_PRINT_TAG(fujiSHTone)},
563-
{0x1041, "HighlightTone", N_("Highlight Tone"), N_("Highlight tone"), IfdId::fujiId, SectionId::makerTags,
564-
signedLong, -1, EXV_PRINT_TAG(fujiSHTone)},
565-
{0x104d, "CropMode", N_("Crop Mode"), N_("Crop mode"), IfdId::fujiId, SectionId::makerTags, unsignedShort, -1,
566-
EXV_PRINT_TAG(fujiCropMode)},
567-
{0x1100, "Continuous", N_("Continuous"), N_("Continuous shooting or auto bracketing setting"), IfdId::fujiId,
568-
SectionId::makerTags, unsignedShort, -1, EXV_PRINT_TAG(fujiContinuous)},
569-
{0x1101, "SequenceNumber", N_("Sequence Number"), N_("Sequence number"), IfdId::fujiId, SectionId::makerTags,
570-
unsignedShort, -1, printValue},
571-
{0x1200, "0x1200", "0x1200", N_("Unknown"), IfdId::fujiId, SectionId::makerTags, unsignedShort, -1, printValue},
572-
{0x1210, "FinePixColor", N_("FinePix Color"), N_("Fuji FinePix color setting"), IfdId::fujiId, SectionId::makerTags,
573-
unsignedShort, -1, EXV_PRINT_TAG(fujiFinePixColor)},
574-
{0x1300, "BlurWarning", N_("Blur Warning"), N_("Blur warning status"), IfdId::fujiId, SectionId::makerTags,
575-
unsignedShort, -1, EXV_PRINT_TAG(fujiOffOn)},
576-
{0x1301, "FocusWarning", N_("Focus Warning"), N_("Auto Focus warning status"), IfdId::fujiId, SectionId::makerTags,
577-
unsignedShort, -1, EXV_PRINT_TAG(fujiOffOn)},
578-
{0x1302, "ExposureWarning", N_("Exposure Warning"), N_("Auto exposure warning status"), IfdId::fujiId,
579-
SectionId::makerTags, unsignedShort, -1, EXV_PRINT_TAG(fujiOffOn)},
580-
{0x1400, "DynamicRange", N_("Dynamic Range"), N_("Dynamic range"), IfdId::fujiId, SectionId::makerTags,
581-
unsignedShort, -1, EXV_PRINT_TAG(fujiDynamicRange)},
582-
{0x1401, "FilmMode", N_("Film Mode"), N_("Film mode"), IfdId::fujiId, SectionId::makerTags, unsignedShort, -1,
583-
EXV_PRINT_TAG(fujiFilmMode)},
584-
{0x1402, "DynamicRangeSetting", N_("Dynamic Range Setting"), N_("Dynamic range settings"), IfdId::fujiId,
585-
SectionId::makerTags, unsignedShort, -1, EXV_PRINT_TAG(fujiDynamicRangeSetting)},
586-
{0x1403, "DevelopmentDynamicRange", N_("Development Dynamic Range"), N_("Development dynamic range"), IfdId::fujiId,
587-
SectionId::makerTags, unsignedShort, -1, printValue},
588-
{0x1404, "MinFocalLength", N_("Minimum Focal Length"), N_("Minimum focal length"), IfdId::fujiId,
589-
SectionId::makerTags, unsignedRational, -1, printValue},
590-
{0x1405, "MaxFocalLength", N_("Maximum Focal Length"), N_("Maximum focal length"), IfdId::fujiId,
591-
SectionId::makerTags, unsignedRational, -1, printValue},
592-
{0x1406, "MaxApertureAtMinFocal", N_("Maximum Aperture at Minimum Focal"), N_("Maximum aperture at minimum focal"),
593-
IfdId::fujiId, SectionId::makerTags, unsignedRational, -1, printValue},
594-
{0x1407, "MaxApertureAtMaxFocal", N_("Maximum Aperture at Maximum Focal"), N_("Maximum aperture at maximum focal"),
595-
IfdId::fujiId, SectionId::makerTags, unsignedRational, -1, printValue},
596-
{0x1431, "Rating", N_("Rating"), N_("Rating"), IfdId::fujiId, SectionId::makerTags, unsignedLong, -1, printValue},
597-
{0x1443, "DRangePriority", N_("D Range Priority"), N_("Dynamic range priority"), IfdId::fujiId,
598-
SectionId::makerTags, unsignedShort, -1, EXV_PRINT_TAG(fujiDRangePriority)},
599-
{0x1444, "DRangePriorityFixed", N_("D Range Priority Fixed"), N_("Dynamic range priority fixed"), IfdId::fujiId,
600-
SectionId::makerTags, unsignedShort, -1, EXV_PRINT_TAG(fujiDRangePriorityFixed)},
601-
{0x1445, "DRangePriorityAuto", N_("D Range Priority Auto"), N_("Dynamic range priority auto"), IfdId::fujiId,
602-
SectionId::makerTags, unsignedShort, -1, EXV_PRINT_TAG(fujiDRangePriorityAuto)},
603-
{0x8000, "FileSource", N_("File Source"), N_("File source"), IfdId::fujiId, SectionId::makerTags, asciiString, -1,
604-
printValue},
605-
{0x8002, "OrderNumber", N_("Order Number"), N_("Order number"), IfdId::fujiId, SectionId::makerTags, unsignedLong,
606-
-1, printValue},
607-
{0x8003, "FrameNumber", N_("Frame Number"), N_("Frame number"), IfdId::fujiId, SectionId::makerTags, unsignedShort,
608-
-1, printValue},
609-
// #1402
610534
{0xf000, "FujiIFD", N_("FujiIFD"), N_("Fujifilm IFD"), IfdId::fujiId, SectionId::makerTags, undefined, -1,
611535
printValue},
612536
{0xf001, "RawImageFullWidth", N_("Raw Image Full Width"), N_("Raw Image Full Width"), IfdId::fujiId,

‎test/data/FujiFilmA850.exv‎

9.05 KB
Binary file not shown.

‎test/data/FujiFilmFinePixF550EXR.exv‎

14.6 KB
Binary file not shown.

‎test/data/FujiSLP800.exv‎

10.8 KB
Binary file not shown.

‎test/data/test_reference_files/FujiFilmA850.exv.out‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
Exif.Image.Make Ascii 9 FUJIFILM FUJIFILM
2+
Exif.Image.Model Ascii 19 A850 A850
3+
Exif.Image.Orientation Short 1 1 top, left
4+
Exif.Image.XResolution Rational 1 72/1 72
5+
Exif.Image.YResolution Rational 1 72/1 72
6+
Exif.Image.ResolutionUnit Short 1 2 inch
7+
Exif.Image.Software Ascii 42 Digital Camera FUJIFILM A850 Ver1.01 Digital Camera FUJIFILM A850 Ver1.01
8+
Exif.Image.DateTime Ascii 20 2008:06:25 13:55:33 2008:06:25 13:55:33
9+
Exif.Image.YCbCrPositioning Short 1 2 Co-sited
10+
Exif.Image.Copyright Ascii 5
11+
Exif.Image.ExifTag Long 1 300 300
12+
Exif.Photo.ExposureTime Rational 1 10/8500 1/850 s
13+
Exif.Photo.FNumber Rational 1 450/100 F4.5
14+
Exif.Photo.ExposureProgram Short 1 2 Auto
15+
Exif.Photo.ISOSpeedRatings Short 1 100 100
16+
Exif.Photo.ExifVersion Undefined 4 48 50 50 48 2.20
17+
Exif.Photo.DateTimeOriginal Ascii 20 2008:06:25 13:55:33 2008:06:25 13:55:33
18+
Exif.Photo.DateTimeDigitized Ascii 20 2008:06:25 13:55:33 2008:06:25 13:55:33
19+
Exif.Photo.ComponentsConfiguration Undefined 4 1 2 3 0 YCbCr
20+
Exif.Photo.CompressedBitsPerPixel Rational 1 40/10 4
21+
Exif.Photo.ShutterSpeedValue SRational 1 970/100 1/832 s
22+
Exif.Photo.ApertureValue Rational 1 448/100 F4.7
23+
Exif.Photo.BrightnessValue SRational 1 500/100 5
24+
Exif.Photo.ExposureBiasValue SRational 1 0/100 0 EV
25+
Exif.Photo.MaxApertureValue Rational 1 300/100 F2.8
26+
Exif.Photo.MeteringMode Short 1 5 Multi-segment
27+
Exif.Photo.LightSource Short 1 0 Unknown
28+
Exif.Photo.Flash Short 1 24 No, auto
29+
Exif.Photo.FocalLength Rational 1 610/100 6.1 mm
30+
Exif.Photo.MakerNote Undefined 330 70 85 74 73 70 73 76 77 12 0 0 0 22 0 0 0 7 0 4 0 0 0 48 49 51 48 16 0 2 0 32 0 0 0 26 1 0 0 0 16 2 0 8 0 0 0 58 1 0 0 1 16 3 0 1 0 0 0 3 0 0 0 2 16 3 0 1 0 0 0 0 0 0 0 3 16 3 0 1 0 0 0 0 0 0 0 16 16 3 0 1 0 0 0 0 0 0 0 17 16 10 0 1 0 0 0 66 1 0 0 32 16 3 0 1 0 0 0 0 0 0 0 33 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 96 6 200 4 48 16 3 0 1 0 0 0 0 0 0 0 49 16 3 0 1 0 0 0 6 0 0 0 50 16 3 0 1 0 0 0 1 0 0 0 0 17 3 0 1 0 0 0 0 0 0 0 1 17 3 0 1 0 0 0 0 0 0 0 0 18 3 0 1 0 0 0 0 0 0 0 16 18 3 0 1 0 0 0 0 0 0 0 0 19 3 0 1 0 0 0 0 0 0 0 1 19 3 0 1 0 0 0 0 0 0 0 2 19 3 0 1 0 0 0 0 0 0 0 0 0 0 0 52 49 52 49 50 68 51 56 52 68 50 48 48 56 48 54 48 52 65 57 55 53 56 84 76 48 48 52 48 51 32 0 70 73 78 69 32 32 32 0 0 0 0 0 3 0 0 0 70 85 74 73 70 73 76 77 12 0 0 0 22 0 0 0 7 0 4 0 0 0 48 49 51 48 16 0 2 0 32 0 0 0 26 1 0 0 0 16 2 0 8 0 0 0 58 1 0 0 1 16 3 0 1 0 0 0 3 0 0 0 2 16 3 0 1 0 0 0 0 0 0 0 3 16 3 0 1 0 0 0 0 0 0 0 16 16 3 0 1 0 0 0 0 0 0 0 17 16 10 0 1 0 0 0 66 1 0 0 32 16 3 0 1 0 0 0 0 0 0 0 33 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 96 6 200 4 48 16 3 0 1 0 0 0 0 0 0 0 49 16 3 0 1 0 0 0 6 0 0 0 50 16 3 0 1 0 0 0 1 0 0 0 0 17 3 0 1 0 0 0 0 0 0 0 1 17 3 0 1 0 0 0 0 0 0 0 0 18 3 0 1 0 0 0 0 0 0 0 16 18 3 0 1 0 0 0 0 0 0 0 0 19 3 0 1 0 0 0 0 0 0 0 1 19 3 0 1 0 0 0 0 0 0 0 2 19 3 0 1 0 0 0 0 0 0 0 0 0 0 0 52 49 52 49 50 68 51 56 52 68 50 48 48 56 48 54 48 52 65 57 55 53 56 84 76 48 48 52 48 51 32 0 70 73 78 69 32 32 32 0 0 0 0 0 3 0 0 0
31+
Exif.MakerNote.Offset Long 1 850 850
32+
Exif.MakerNote.ByteOrder Ascii 3 II II
33+
Exif.Fujifilm.Version Undefined 4 48 49 51 48 48 49 51 48
34+
Exif.Fujifilm.SerialNumber Ascii 32 41412D384D20080604A9758TL00403 41412D384D20080604A9758TL00403
35+
Exif.Fujifilm.Quality Ascii 8 FINE FINE
36+
Exif.Fujifilm.Sharpness Short 1 3 0 (normal)
37+
Exif.Fujifilm.WhiteBalance Short 1 0 Auto
38+
Exif.Fujifilm.Color Short 1 0 0 (normal)
39+
Exif.Fujifilm.FlashMode Short 1 0 Auto
40+
Exif.Fujifilm.FlashStrength SRational 1 0/3 0/3
41+
Exif.Fujifilm.Macro Short 1 0 Off
42+
Exif.Fujifilm.FocusMode Short 1 0 Auto
43+
Exif.Fujifilm.FocusArea Short 1 0 Wide
44+
Exif.Fujifilm.FocusPoint Short 2 1632 1224 1632 1224
45+
Exif.Fujifilm.SlowSync Short 1 0 Off
46+
Exif.Fujifilm.PictureMode Short 1 6 Program AE
47+
Exif.Fujifilm.ExposureCount Short 1 1 1
48+
Exif.Fujifilm.Continuous Short 1 0 Off
49+
Exif.Fujifilm.SequenceNumber Short 1 0 0
50+
Exif.Fujifilm.FinePixColor Short 1 0 Standard
51+
Exif.Fujifilm.BlurWarning Short 1 0 Off
52+
Exif.Fujifilm.FocusWarning Short 1 0 Off
53+
Exif.Fujifilm.ExposureWarning Short 1 0 Off
54+
Exif.Photo.FlashpixVersion Undefined 4 48 49 48 48 1.00
55+
Exif.Photo.ColorSpace Short 1 1 sRGB
56+
Exif.Photo.PixelXDimension Long 1 3264 3264
57+
Exif.Photo.PixelYDimension Long 1 2448 2448
58+
Exif.Photo.InteroperabilityTag Long 1 1196 1196
59+
Exif.Iop.InteroperabilityIndex Ascii 4 R98 R98
60+
Exif.Iop.InteroperabilityVersion Undefined 4 48 49 48 48 1.00
61+
Exif.Photo.FocalPlaneXResolution Rational 1 6129/1 6129
62+
Exif.Photo.FocalPlaneYResolution Rational 1 6129/1 6129
63+
Exif.Photo.FocalPlaneResolutionUnit Short 1 3 cm
64+
Exif.Photo.SensingMethod Short 1 2 One-chip color area
65+
Exif.Photo.FileSource Undefined 1 3 Digital still camera
66+
Exif.Photo.SceneType Undefined 1 1 Directly photographed
67+
Exif.Photo.CustomRendered Short 1 0 Normal process
68+
Exif.Photo.ExposureMode Short 1 0 Auto
69+
Exif.Photo.WhiteBalance Short 1 0 Auto
70+
Exif.Photo.SceneCaptureType Short 1 0 Standard
71+
Exif.Photo.Sharpness Short 1 0 Normal
72+
Exif.Photo.SubjectDistanceRange Short 1 0 Unknown
73+
Exif.Image.PrintImageMatching Undefined 28 80 114 105 110 116 73 77 0 48 50 53 48 0 0 2 0 2 0 1 0 0 0 1 1 0 0 0 0 80 114 105 110 116 73 77 0 48 50 53 48 0 0 2 0 2 0 1 0 0 0 1 1 0 0 0 0
74+
Exif.Thumbnail.Compression Short 1 6 JPEG (old-style)
75+
Exif.Thumbnail.Orientation Short 1 1 top, left
76+
Exif.Thumbnail.XResolution Rational 1 72/1 72
77+
Exif.Thumbnail.YResolution Rational 1 72/1 72
78+
Exif.Thumbnail.ResolutionUnit Short 1 2 inch
79+
Exif.Thumbnail.JPEGInterchangeFormat Long 1 1344 1344
80+
Exif.Thumbnail.JPEGInterchangeFormatLength Long 1 7906 7906
81+
Exif.Thumbnail.YCbCrPositioning Short 1 2 Co-sited

0 commit comments

Comments
 (0)