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.

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

Jump to bottom

fix_2044_add_tiff_tags #2045

Merged
merged 2 commits into from
Jan 2, 2022
Merged

fix_2044_add_tiff_tags #2045

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
363e92f
fix_2044_add_tiff_tags
clanmills Jan 1, 2022
1f3ad27
Update conan for Windows CI
kmilos Jan 2, 2022
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
2 changes: 1 addition & 1 deletion .github/workflows/on_PR_windows_matrix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:

- name: Install Conan & Common config
run: |
pip.exe install "conan==1.39.0"
pip.exe install "conan==1.43.0"
conan config install https://github.com/conan-io/conanclientcert.git
conan profile new --detect default
conan profile update settings.build_type=${{matrix.build_type}} default
Expand Down
15 changes: 14 additions & 1 deletion src/tags_int.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,7 @@ namespace Exiv2 {
N_("The logical order of bits within a byte"),
ifd0Id, imgStruct, unsignedShort, 1, printValue), // TIFF tag
TagInfo(0x010d, "DocumentName", N_("Document Name"),
N_("The name of the document from which this image was scanned"),
N_("The name of the document from which this image was scanned."),
ifd0Id, imgStruct, asciiString, 0, printValue), // TIFF tag
TagInfo(0x010e, "ImageDescription", N_("Image Description"),
N_("A character string giving the title of the image. It may be "
Expand Down Expand Up @@ -596,6 +596,19 @@ namespace Exiv2 {
"is used instead of this tag. If this field does not exist, "
"the TIFF default of 1 (chunky) is assumed."),
ifd0Id, imgStruct, unsignedShort, 1, EXV_PRINT_TAG(exifPlanarConfiguration)),
TagInfo(0x011d, "PageName", N_("Page Name"),
N_("The name of the page from which this image was scanned."),
ifd0Id, imgStruct, asciiString, 0, printValue), // TIFF tag
TagInfo(0x011e, "XPosition", N_("X Position"),
N_("X position of the image. The X offset in ResolutionUnits of the "
"left side of the image, with respect to the left side of the page."),
ifd0Id, imgStruct, unsignedRational, 1, printValue), // TIFF tag
TagInfo(0x011f, "YPosition", N_("Y Position"),
N_("Y position of the image. The Y offset in ResolutionUnits of the "
"top of the image, with respect to the top of the page. In the TIFF "
"coordinate scheme, the positive Y direction is down, so that "
"YPosition is always positive."),
ifd0Id, imgStruct, unsignedRational, 1, printValue), // TIFF tag
TagInfo(0x0122, "GrayResponseUnit", N_("Gray Response Unit"),
N_("The precision of the information contained in the GrayResponseCurve."),
ifd0Id, imgStruct, unsignedShort, 1, printValue), // TIFF tag
Expand Down