Skip to content

fix(makernotes): honour ExifTool's Priority, so a sub-directory copy stops overwriting the Main tag #414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
swackhamer merged 1 commit into from
Aug 2, 2026
Merged

fix(makernotes): honour ExifTool's Priority, so a sub-directory copy stops overwriting the Main tag #414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions src/parsers/tiff/makernotes/fujifilm/settings_tables.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ pub(crate) static FUJIFILM_PRIORITYSETTINGS: BinaryTable = BinaryTable {
mask: Some(15),
value_conv: ValueConv::None,
print_conv: PrintConv::Map(FUJIFILM_CONV1),
low_priority: false,
},
Field {
key: "0.2",
Expand All @@ -61,6 +62,7 @@ pub(crate) static FUJIFILM_PRIORITYSETTINGS: BinaryTable = BinaryTable {
mask: Some(240),
value_conv: ValueConv::None,
print_conv: PrintConv::Map(FUJIFILM_CONV1),
low_priority: false,
},
],
};
Expand All @@ -86,6 +88,7 @@ pub(crate) static FUJIFILM_FOCUSSETTINGS: BinaryTable = BinaryTable {
mask: Some(15),
value_conv: ValueConv::None,
print_conv: PrintConv::Map(FUJIFILM_CONV2),
low_priority: false,
},
Field {
key: "0.2",
Expand All @@ -99,6 +102,7 @@ pub(crate) static FUJIFILM_FOCUSSETTINGS: BinaryTable = BinaryTable {
mask: Some(240),
value_conv: ValueConv::None,
print_conv: PrintConv::Map(FUJIFILM_CONV3),
low_priority: false,
},
Field {
key: "0.3",
Expand All @@ -112,6 +116,7 @@ pub(crate) static FUJIFILM_FOCUSSETTINGS: BinaryTable = BinaryTable {
mask: Some(3840),
value_conv: ValueConv::None,
print_conv: PrintConv::Map(FUJIFILM_CONV4),
low_priority: false,
},
Field {
key: "0.4",
Expand All @@ -125,6 +130,7 @@ pub(crate) static FUJIFILM_FOCUSSETTINGS: BinaryTable = BinaryTable {
mask: Some(61440),
value_conv: ValueConv::None,
print_conv: PrintConv::MapOr(FUJIFILM_CONV5, super::print_conv::identity),
low_priority: false,
},
Field {
key: "0.5",
Expand All @@ -138,6 +144,7 @@ pub(crate) static FUJIFILM_FOCUSSETTINGS: BinaryTable = BinaryTable {
mask: Some(16711680),
value_conv: ValueConv::None,
print_conv: PrintConv::MapOr(FUJIFILM_CONV5, super::print_conv::zone_size),
low_priority: false,
},
],
};
Expand All @@ -163,6 +170,7 @@ pub(crate) static FUJIFILM_AFCSETTINGS: BinaryTable = BinaryTable {
mask: None,
value_conv: ValueConv::None,
print_conv: PrintConv::MapOr(FUJIFILM_CONV6, super::print_conv::custom_afc_set),
low_priority: false,
},
Field {
key: "0.1",
Expand All @@ -176,6 +184,7 @@ pub(crate) static FUJIFILM_AFCSETTINGS: BinaryTable = BinaryTable {
mask: Some(15),
value_conv: ValueConv::None,
print_conv: PrintConv::None,
low_priority: false,
},
Field {
key: "0.2",
Expand All @@ -189,6 +198,7 @@ pub(crate) static FUJIFILM_AFCSETTINGS: BinaryTable = BinaryTable {
mask: Some(240),
value_conv: ValueConv::None,
print_conv: PrintConv::None,
low_priority: false,
},
Field {
key: "0.3",
Expand All @@ -202,6 +212,7 @@ pub(crate) static FUJIFILM_AFCSETTINGS: BinaryTable = BinaryTable {
mask: Some(3840),
value_conv: ValueConv::None,
print_conv: PrintConv::Map(FUJIFILM_CONV7),
low_priority: false,
},
],
};
Expand All @@ -227,6 +238,7 @@ pub(crate) static FUJIFILM_DRIVESETTINGS: BinaryTable = BinaryTable {
mask: Some(255),
value_conv: ValueConv::None,
print_conv: PrintConv::Map(FUJIFILM_CONV8),
low_priority: false,
},
Field {
key: "0.2",
Expand All @@ -240,6 +252,7 @@ pub(crate) static FUJIFILM_DRIVESETTINGS: BinaryTable = BinaryTable {
mask: Some(4278190080),
value_conv: ValueConv::None,
print_conv: PrintConv::MapOr(FUJIFILM_CONV5, super::print_conv::fps),
low_priority: false,
},
],
};
16 changes: 16 additions & 0 deletions src/parsers/tiff/makernotes/panasonic/face_tables.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ pub(crate) static PANASONIC_FACEDETINFO: BinaryTable = BinaryTable {
mask: None,
value_conv: ValueConv::None,
print_conv: PrintConv::None,
low_priority: false,
},
Field {
key: "1",
Expand All @@ -45,6 +46,7 @@ pub(crate) static PANASONIC_FACEDETINFO: BinaryTable = BinaryTable {
mask: None,
value_conv: ValueConv::None,
print_conv: PrintConv::None,
low_priority: false,
},
Field {
key: "5",
Expand All @@ -58,6 +60,7 @@ pub(crate) static PANASONIC_FACEDETINFO: BinaryTable = BinaryTable {
mask: None,
value_conv: ValueConv::None,
print_conv: PrintConv::None,
low_priority: false,
},
Field {
key: "9",
Expand All @@ -71,6 +74,7 @@ pub(crate) static PANASONIC_FACEDETINFO: BinaryTable = BinaryTable {
mask: None,
value_conv: ValueConv::None,
print_conv: PrintConv::None,
low_priority: false,
},
Field {
key: "13",
Expand All @@ -84,6 +88,7 @@ pub(crate) static PANASONIC_FACEDETINFO: BinaryTable = BinaryTable {
mask: None,
value_conv: ValueConv::None,
print_conv: PrintConv::None,
low_priority: false,
},
Field {
key: "17",
Expand All @@ -97,6 +102,7 @@ pub(crate) static PANASONIC_FACEDETINFO: BinaryTable = BinaryTable {
mask: None,
value_conv: ValueConv::None,
print_conv: PrintConv::None,
low_priority: false,
},
],
};
Expand All @@ -122,6 +128,7 @@ pub(crate) static PANASONIC_FACERECINFO: BinaryTable = BinaryTable {
mask: None,
value_conv: ValueConv::None,
print_conv: PrintConv::None,
low_priority: false,
},
Field {
key: "4",
Expand All @@ -135,6 +142,7 @@ pub(crate) static PANASONIC_FACERECINFO: BinaryTable = BinaryTable {
mask: None,
value_conv: ValueConv::None,
print_conv: PrintConv::None,
low_priority: false,
},
Field {
key: "24",
Expand All @@ -148,6 +156,7 @@ pub(crate) static PANASONIC_FACERECINFO: BinaryTable = BinaryTable {
mask: None,
value_conv: ValueConv::None,
print_conv: PrintConv::None,
low_priority: false,
},
Field {
key: "32",
Expand All @@ -161,6 +170,7 @@ pub(crate) static PANASONIC_FACERECINFO: BinaryTable = BinaryTable {
mask: None,
value_conv: ValueConv::None,
print_conv: PrintConv::None,
low_priority: false,
},
Field {
key: "52",
Expand All @@ -174,6 +184,7 @@ pub(crate) static PANASONIC_FACERECINFO: BinaryTable = BinaryTable {
mask: None,
value_conv: ValueConv::None,
print_conv: PrintConv::None,
low_priority: false,
},
Field {
key: "72",
Expand All @@ -187,6 +198,7 @@ pub(crate) static PANASONIC_FACERECINFO: BinaryTable = BinaryTable {
mask: None,
value_conv: ValueConv::None,
print_conv: PrintConv::None,
low_priority: false,
},
Field {
key: "80",
Expand All @@ -200,6 +212,7 @@ pub(crate) static PANASONIC_FACERECINFO: BinaryTable = BinaryTable {
mask: None,
value_conv: ValueConv::None,
print_conv: PrintConv::None,
low_priority: false,
},
Field {
key: "100",
Expand All @@ -213,6 +226,7 @@ pub(crate) static PANASONIC_FACERECINFO: BinaryTable = BinaryTable {
mask: None,
value_conv: ValueConv::None,
print_conv: PrintConv::None,
low_priority: false,
},
Field {
key: "120",
Expand All @@ -226,6 +240,7 @@ pub(crate) static PANASONIC_FACERECINFO: BinaryTable = BinaryTable {
mask: None,
value_conv: ValueConv::None,
print_conv: PrintConv::None,
low_priority: false,
},
Field {
key: "128",
Expand All @@ -239,6 +254,7 @@ pub(crate) static PANASONIC_FACERECINFO: BinaryTable = BinaryTable {
mask: None,
value_conv: ValueConv::None,
print_conv: PrintConv::None,
low_priority: false,
},
],
};
Loading
Loading