[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:41:13 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=4d26ac3
The following commit has been merged in the master branch:
commit 4d26ac38752c968dbe9b9c1b6833f3bd5d617483
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Mon Apr 5 15:12:44 2010 +0000
Added several missing TIFF tags.
---
src/tags.cpp | 38 ++++++++++++++++++++++++++++++++++++++
src/tiffimage.cpp | 14 +++++++-------
2 files changed, 45 insertions(+), 7 deletions(-)
diff --git a/src/tags.cpp b/src/tags.cpp
index 23546e1..f7e21b7 100644
--- a/src/tags.cpp
+++ b/src/tags.cpp
@@ -223,6 +223,13 @@ namespace Exiv2 {
{ 7, N_("Thumbnail/Preview image, Multi page file, Transparency mask") }
};
+ //! SubfileType, TIFF tag 0x00ff
+ extern const TagDetails exifSubfileType[] = {
+ { 1, N_("Full-resolution image data") },
+ { 2, N_("Reduced-resolution image data") },
+ { 3, N_("A single page of a multi-page image") }
+ };
+
//! Units for measuring X and Y resolution, tags 0x0128, 0xa210
extern const TagDetails exifUnit[] = {
{ 1, N_("none") },
@@ -294,6 +301,12 @@ namespace Exiv2 {
{ 8, N_("left, bottom") }
};
+ //! Predictor, tag 0x013d
+ extern const TagDetails exifPredictor[] = {
+ { 1, N_("No prediction scheme used") },
+ { 2, N_("Horizontal differencing") }
+ };
+
//! YCbCrPositioning, tag 0x0213
extern const TagDetails exifYCbCrPositioning[] = {
{ 1, N_("Centered") },
@@ -349,6 +362,10 @@ namespace Exiv2 {
TagInfo(0x00fe, "NewSubfileType", N_("New Subfile Type"),
N_("A general indication of the kind of data contained in this subfile."),
ifd0Id, imgStruct, unsignedLong, EXV_PRINT_TAG(exifNewSubfileType)), // TIFF tag
+ TagInfo(0x00ff, "SubfileType", N_("Subfile Type"),
+ N_("A general indication of the kind of data contained in this subfile. "
+ "This field is deprecated. The NewSubfileType field should be used instead."),
+ ifd0Id, imgStruct, unsignedShort, EXV_PRINT_TAG(exifSubfileType)), // TIFF tag
TagInfo(0x0100, "ImageWidth", N_("Image Width"),
N_("The number of columns of image data, equal to the number of "
"pixels per row. In JPEG compressed data a JPEG marker is "
@@ -438,6 +455,18 @@ 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, printValue),
+ TagInfo(0x0122, "GrayResponseUnit", N_("Gray Response Unit"),
+ N_("The precision of the information contained in the GrayResponseCurve."),
+ ifd0Id, imgStruct, unsignedShort, printValue), // TIFF tag
+ TagInfo(0x0123, "GrayResponseCurve", N_("Gray Response Curve"),
+ N_("For grayscale data, the optical density of each possible pixel value."),
+ ifd0Id, imgStruct, unsignedShort, printValue), // TIFF tag
+ TagInfo(0x0124, "T4Options", N_("T4 Options"),
+ N_("T.4-encoding options."),
+ ifd0Id, imgStruct, unsignedLong, printValue), // TIFF tag
+ TagInfo(0x0125, "T6Options", N_("T6 Options"),
+ N_("T.6-encoding options."),
+ ifd0Id, imgStruct, unsignedLong, printValue), // TIFF tag
TagInfo(0x0128, "ResolutionUnit", N_("Resolution Unit"),
N_("The unit for measuring <XResolution> and <YResolution>. The same "
"unit is used for both <XResolution> and <YResolution>. If "
@@ -471,6 +500,10 @@ namespace Exiv2 {
N_("This tag records information about the host computer used "
"to generate the image."),
ifd0Id, otherTags, asciiString, printValue),
+ TagInfo(0x013d, "Predictor", N_("Predictor"),
+ N_("A predictor is a mathematical operator that is applied to "
+ "the image data before an encoding scheme is applied."),
+ ifd0Id, imgStruct, unsignedShort, EXV_PRINT_TAG(exifPredictor)), // TIFF tag
TagInfo(0x013e, "WhitePoint", N_("White Point"),
N_("The chromaticity of the white point of the image. Normally "
"this tag is not necessary, since color space is specified "
@@ -487,6 +520,11 @@ namespace Exiv2 {
"for palette-color images. In a palette-color image, a "
"pixel value is used to index into an RGB lookup table."),
ifd0Id, imgCharacter, unsignedShort, printValue),
+ TagInfo(0x0141, "HalftoneHints", N_("Halftone Hints"),
+ N_("The purpose of the HalftoneHints field is to convey to the "
+ "halftone function the range of gray levels within a "
+ "colorimetrically-specified image that should retain tonal detail."),
+ ifd0Id, imgStruct, unsignedShort, printValue), // TIFF tag
TagInfo(0x0142, "TileWidth", N_("Tile Width"),
N_("The tile width in pixels. This is the number of columns in each tile."),
ifd0Id, recOffset, unsignedShort, printValue), // TIFF tag
diff --git a/src/tiffimage.cpp b/src/tiffimage.cpp
index b950d43..814e1f4 100644
--- a/src/tiffimage.cpp
+++ b/src/tiffimage.cpp
@@ -1647,7 +1647,7 @@ namespace Exiv2 {
//! List of TIFF image tags
static const TiffImgTagStruct tiffImageTags[] = {
{ 0x00fe, Group::ifd0 }, // Exif.Image.NewSubfileType
- { 0x00ff, Group::ifd0 }, // Exif.Image.SubfileType -
+ { 0x00ff, Group::ifd0 }, // Exif.Image.SubfileType
{ 0x0100, Group::ifd0 }, // Exif.Image.ImageWidth
{ 0x0101, Group::ifd0 }, // Exif.Image.ImageLength
{ 0x0102, Group::ifd0 }, // Exif.Image.BitsPerSample
@@ -1661,17 +1661,17 @@ namespace Exiv2 {
{ 0x011a, Group::ifd0 }, // Exif.Image.XResolution
{ 0x011b, Group::ifd0 }, // Exif.Image.YResolution
{ 0x011c, Group::ifd0 }, // Exif.Image.PlanarConfiguration
- { 0x0122, Group::ifd0 }, // Exif.Image.GrayResponseUnit -
- { 0x0123, Group::ifd0 }, // Exif.Image.GrayResponseCurve -
- { 0x0124, Group::ifd0 }, // Exif.Image.T4Options -
- { 0x0125, Group::ifd0 }, // Exif.Image.T6Options -
+ { 0x0122, Group::ifd0 }, // Exif.Image.GrayResponseUnit
+ { 0x0123, Group::ifd0 }, // Exif.Image.GrayResponseCurve
+ { 0x0124, Group::ifd0 }, // Exif.Image.T4Options
+ { 0x0125, Group::ifd0 }, // Exif.Image.T6Options
{ 0x0128, Group::ifd0 }, // Exif.Image.ResolutionUnit
{ 0x012d, Group::ifd0 }, // Exif.Image.TransferFunction
- { 0x013d, Group::ifd0 }, // Exif.Image.Predictor -
+ { 0x013d, Group::ifd0 }, // Exif.Image.Predictor
{ 0x013e, Group::ifd0 }, // Exif.Image.WhitePoint
{ 0x013f, Group::ifd0 }, // Exif.Image.PrimaryChromaticities
{ 0x0140, Group::ifd0 }, // Exif.Image.ColorMap
- { 0x0141, Group::ifd0 }, // Exif.Image.HalftoneHints -
+ { 0x0141, Group::ifd0 }, // Exif.Image.HalftoneHints
{ 0x0142, Group::ifd0 }, // Exif.Image.TileWidth
{ 0x0143, Group::ifd0 }, // Exif.Image.TileLength
{ 0x0144, Group::ifd0 }, // Exif.Image.TileOffsets
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list