michael/exif-rs
michael
/
exif-rs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Avoid repeating contexts in tag constants definition.

This commit is contained in:
KAMADA Ken'ichi 2016-12-06 22:05:43 +09:00
parent d180bfbae8
commit 66c92e0441
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/tag.rs
View File

@ -107,23 +107,23 @@ struct TagInfo {
macro_rules! generate_well_known_tag_constants { macro_rules! generate_well_known_tag_constants {
( (
$( $( |$ctx:path| $(
// Copy the doc attribute to the actual definition. // Copy the doc attribute to the actual definition.
$( #[$attr:meta] )* $( #[$attr:meta] )*
($name:ident, $ctx:ident, $num:expr, $desc:expr) ($name:ident, $num:expr, $desc:expr)
),+, ),+, )+
) => ( ) => (
$( $($(
$( #[$attr] )* $( #[$attr] )*
#[allow(non_upper_case_globals)] #[allow(non_upper_case_globals)]
pub const $name: Tag = Tag(Context::$ctx, $num); pub const $name: Tag = Tag($ctx, $num);
)+ )+)+
fn get_tag_info(tag: &Tag) -> Option<TagInfo> { fn get_tag_info(tag: &Tag) -> Option<TagInfo> {
match *tag { match *tag {
$( self::$name => Some(TagInfo { $($( self::$name => Some(TagInfo {
name: stringify!($name), desc: $desc }), name: stringify!($name), desc: $desc }),
)+ )+)+
_ => None, _ => None,
} }
} }
@ -134,16 +134,20 @@ macro_rules! generate_well_known_tag_constants {
// the Exif field names: camel cases and all-capital acronyms. // the Exif field names: camel cases and all-capital acronyms.
generate_well_known_tag_constants!( generate_well_known_tag_constants!(
// Exif-specific IFDs [EXIF23 4.6.3]. // Exif-specific IFDs [EXIF23 4.6.3].
|Context::Tiff|
/// A pointer to the Exif IFD. This is used for the internal structure /// A pointer to the Exif IFD. This is used for the internal structure
/// of Exif data and will not be returned to the user. /// of Exif data and will not be returned to the user.
(ExifIFDPointer, Tiff, 0x8769, "Exif IFD pointer"), (ExifIFDPointer, 0x8769, "Exif IFD pointer"),
/// A pointer to the GPS IFD. This is used for the internal structure /// A pointer to the GPS IFD. This is used for the internal structure
/// of Exif data and will not be returned to the user. /// of Exif data and will not be returned to the user.
(GPSInfoIFDPointer, Tiff, 0x8825, "GPS Info IFD pointer"), (GPSInfoIFDPointer, 0x8825, "GPS Info IFD pointer"),
|Context::Exif|
/// A pointer to the interoperability IFD. This is used for the internal /// A pointer to the interoperability IFD. This is used for the internal
/// structure of Exif data and will not be returned to the user. /// structure of Exif data and will not be returned to the user.
(InteropIFDPointer, Exif, 0xa005, "Interoperability IFD pointer"), (InteropIFDPointer, 0xa005, "Interoperability IFD pointer"),
// TIFF attributes [EXIF23 4.6.4]. // TIFF attributes [EXIF23 4.6.4].