[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=92ea124

The following commit has been merged in the master branch:
commit 92ea12434541f90d7424ca8ace9473f9237f2008
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Thu Apr 8 02:56:07 2010 +0000

    Added a few PageMaker 6.0 and Adobe OPI TIFF tags.
---
 src/tags.cpp | 36 +++++++++++++++++++++++++++++++++++-
 src/tags.hpp |  2 +-
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/src/tags.cpp b/src/tags.cpp
index 920ebff..0a124af 100644
--- a/src/tags.cpp
+++ b/src/tags.cpp
@@ -193,6 +193,8 @@ namespace Exiv2 {
         { dngTags,         "DngTags",              N_("Adobe DNG tags")               },
         { panaRaw,         "PanasonicRaw",         N_("Panasonic RAW tags")           },
         { tiffEp,          "TIFF/EP",              N_("TIFF/EP tags")                 },
+        { tiffPm6,         "TIFF&PM6",             N_("TIFF PageMaker 6.0 tags")      },
+        { adobeOpi,        "AdobeOPI",             N_("Adobe OPI tags")               },
         { lastSectionId,   "(LastSection)",        N_("Last section")                 }
     };
 
@@ -328,7 +330,13 @@ namespace Exiv2 {
         { 4, N_("Undefined data format")                }
     };
 
-    //! exifJpegLosslessPredictor
+    //! Indexed, tag 0x015a
+    extern const TagDetails exifIndexed[] = {
+        { 0, N_("Not indexed") },
+        { 1, N_("Indexed")     }
+    };
+
+    //! exifJpegLosslessPredictor, tag 0x0205
     extern const TagDetails exifJpegLosslessPredictor[] = {
         { 1, N_("A")           },
         { 2, N_("B")           },
@@ -619,10 +627,31 @@ namespace Exiv2 {
         TagInfo(0x0156, "TransferRange", N_("Transfer Range"),
                 N_("Expands the range of the TransferFunction"),
                 ifd0Id, imgCharacter, unsignedShort, printValue), // TIFF tag
+        TagInfo(0x0157, "ClipPath", N_("Clip Path"),
+                N_("A TIFF ClipPath is intended to mirror the essentials of PostScript's "
+                   "path creation functionality."),
+                ifd0Id, tiffPm6, unsignedByte, printValue), // TIFF&PM6 tag
+        TagInfo(0x0158, "XClipPathUnits", N_("X Clip Path Units"),
+                N_("The number of units that span the width of the image, in terms of "
+                   "integer ClipPath coordinates."),
+                ifd0Id, tiffPm6, signedShort, printValue), // TIFF&PM6 tag
+        TagInfo(0x0159, "YClipPathUnits", N_("Y Clip Path Units"),
+                N_("The number of units that span the height of the image, in terms of "
+                   "integer ClipPath coordinates."),
+                ifd0Id, tiffPm6, signedShort, printValue), // TIFF&PM6 tag
+        TagInfo(0x015a, "Indexed", N_("Indexed"),
+                N_("Indexed images are images where the 'pixels' do not represent color "
+                   "values, but rather an index (usually 8-bit) into a separate color "
+                   "table, the ColorMap."),
+                ifd0Id, tiffPm6, unsignedShort, EXV_PRINT_TAG(exifIndexed)), // TIFF&PM6 tag
         TagInfo(0x015b, "JPEGTables", N_("JPEG tables"),
                 N_("This optional tag may be used to encode the JPEG quantization and"
                    "Huffman tables for subsequent use by the JPEG decompression process."),
                 ifd0Id, imgStruct, undefined, printValue), // TIFF/EP tag
+        TagInfo(0x015F, "OPIProxy", N_("OPI Proxy"),
+                N_("OPIProxy gives information concerning whether this image is a "
+                   "low-resolution proxy of a high-resolution image (Adobe OPI)."),
+                ifd0Id, adobeOpi, unsignedShort, printValue), // Adobe OPI tag
         TagInfo(0x0200, "JPEGProc", N_("JPEG Process"),
                 N_("This field indicates the process used to produce the compressed data"),
                 ifd0Id, recOffset, unsignedLong, printValue), // TIFF tag
@@ -707,6 +736,11 @@ namespace Exiv2 {
         TagInfo(0x4749, "RatingPercent", N_("Windows Rating Percent"),
                 N_("Rating tag used by Windows, value in percent"),
                 ifd0Id, otherTags, unsignedShort, printValue), // Windows Tag
+        TagInfo(0x800d, "ImageID", N_("Image ID"),
+                N_("ImageID is the full pathname of the original, high-resolution image, "
+                   "or any other identifying string that uniquely identifies the original "
+                   "image (Adobe OPI)."),
+                ifd0Id, adobeOpi, asciiString, printValue), // Adobe OPI tag
         TagInfo(0x828d, "CFARepeatPatternDim", N_("CFA Repeat Pattern Dimension"),
                 N_("Contains two values representing the minimum rows and columns "
                 "to define the repeating patterns of the color filter array"),
diff --git a/src/tags.hpp b/src/tags.hpp
index 91fbbb1..ec9b3ae 100644
--- a/src/tags.hpp
+++ b/src/tags.hpp
@@ -67,7 +67,7 @@ namespace Exiv2 {
                      imgStruct, recOffset, imgCharacter, otherTags, exifFormat,
                      exifVersion, imgConfig, userInfo, relatedFile, dateTime,
                      captureCond, gpsTags, iopTags, makerTags, dngTags, panaRaw,
-                     tiffEp,
+                     tiffEp, tiffPm6, adobeOpi,
                      lastSectionId };
 
 // *****************************************************************************

-- 
exiv2 packaging