Skip to content
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.

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

Add new Exif 3.0 tags (backport #2661) #2662

Merged
merged 1 commit into from
Jun 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 22 additions & 0 deletions src/tags_int.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2014,6 +2014,28 @@ constexpr TagInfo exifTagInfo[] = {
N_("This tag records the serial number of the interchangeable lens "
"that was used in photography as an ASCII string."),
IfdId::exifId, SectionId::otherTags, asciiString, 0, printValue},
{0xa436, "ImageTitle", N_("Image Title"), N_("This tag records the title of the image."), IfdId::exifId,
SectionId::otherTags, asciiString, 0, printValue}, // Exif 3.0
{0xa437, "Photographer", N_("Photographer"), N_("This tag records the name of the photographer."), IfdId::exifId,
SectionId::otherTags, asciiString, 0, printValue}, // Exif 3.0
{0xa438, "ImageEditor", N_("Image Editor"),
N_("This tag records the name of the main person who edited the image. Preferably, a single name is written "
"(individual name, group/organization name, etc.), but multiple main editors may be entered."),
IfdId::exifId, SectionId::otherTags, asciiString, 0, printValue}, // Exif 3.0
{0xa439, "CameraFirmware", N_("Camera Firmware"),
N_("This tag records the name and version of the software or firmware of the camera used to generate the image."),
IfdId::exifId, SectionId::otherTags, asciiString, 0, printValue}, // Exif 3.0
{0xa43a, "RAWDevelopingSoftware", N_("RAW Developing Software"),
N_("This tag records the name and version of the software used to develop the RAW image."), IfdId::exifId,
SectionId::otherTags, asciiString, 0, printValue}, // Exif 3.0
{0xa43b, "ImageEditingSoftware", N_("Image Editing Software"),
N_("This tag records the name and version of the main software used for processing and editing the image. "
"Preferably, a single software is written, but multiple main software may be entered."),
IfdId::exifId, SectionId::otherTags, asciiString, 0, printValue}, // Exif 3.0
{0xa43c, "MetadataEditingSoftware", N_("Metadata Editing Software"),
N_("This tag records the name and version of one software used to edit the metadata of the image without "
"processing or editing of the image data itself."),
IfdId::exifId, SectionId::otherTags, asciiString, 0, printValue}, // Exif 3.0
{0xa460, "CompositeImage", N_("Composite Image"),
N_("Indicates whether the recorded image is a composite image or not."), IfdId::exifId, SectionId::captureCond,
unsignedShort, 1, EXV_PRINT_TAG(exifCompositeImage)}, // Exif 2.32
Expand Down
7 changes: 7 additions & 0 deletions test/data/test_reference_files/test_pr_1905_poc1_ref.out
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,13 @@ LensSpecification,42034,0xa432,Photo,Exif.Photo.LensSpecification,Rational,"This
LensMake,42035,0xa433,Photo,Exif.Photo.LensMake,Ascii,"This tag records the lens manufactor as an ASCII string."
LensModel,42036,0xa434,Photo,Exif.Photo.LensModel,Ascii,"This tag records the lens's model name and model number as an ASCII string."
LensSerialNumber,42037,0xa435,Photo,Exif.Photo.LensSerialNumber,Ascii,"This tag records the serial number of the interchangeable lens that was used in photography as an ASCII string."
ImageTitle,42038,0xa436,Photo,Exif.Photo.ImageTitle,Ascii,"This tag records the title of the image."
Photographer,42039,0xa437,Photo,Exif.Photo.Photographer,Ascii,"This tag records the name of the photographer."
ImageEditor,42040,0xa438,Photo,Exif.Photo.ImageEditor,Ascii,"This tag records the name of the main person who edited the image. Preferably, a single name is written (individual name, group/organization name, etc.), but multiple main editors may be entered."
CameraFirmware,42041,0xa439,Photo,Exif.Photo.CameraFirmware,Ascii,"This tag records the name and version of the software or firmware of the camera used to generate the image."
RAWDevelopingSoftware,42042,0xa43a,Photo,Exif.Photo.RAWDevelopingSoftware,Ascii,"This tag records the name and version of the software used to develop the RAW image."
ImageEditingSoftware,42043,0xa43b,Photo,Exif.Photo.ImageEditingSoftware,Ascii,"This tag records the name and version of the main software used for processing and editing the image. Preferably, a single software is written, but multiple main software may be entered."
MetadataEditingSoftware,42044,0xa43c,Photo,Exif.Photo.MetadataEditingSoftware,Ascii,"This tag records the name and version of one software used to edit the metadata of the image without processing or editing of the image data itself."
CompositeImage,42080,0xa460,Photo,Exif.Photo.CompositeImage,Short,"Indicates whether the recorded image is a composite image or not."
SourceImageNumberOfCompositeImage,42081,0xa461,Photo,Exif.Photo.SourceImageNumberOfCompositeImage,Short,"Indicates the number of the source images (tentatively recorded images) captured for a composite Image."
SourceExposureTimesOfCompositeImage,42082,0xa462,Photo,Exif.Photo.SourceExposureTimesOfCompositeImage,Undefined,"For a composite image, records the parameters relating exposure time of the exposures for generating the said composite image, such as respective exposure times of captured source images (tentatively recorded images)."
Expand Down