[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:36:34 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=a87f072
The following commit has been merged in the master branch:
commit a87f0724b653c100013e6a18bf5a3f14a8dd5755
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Thu Aug 12 15:46:26 2004 +0000
Minor changes
---
doc/getting-started.html | 12 ++++++------
doc/index.html | 2 +-
doc/iptc.xml | 4 ++--
doc/iptc.xsl | 37 +++++++++++++++++++++++++++++--------
doc/makernote.html | 4 ++--
doc/tags.xsl | 4 ++--
6 files changed, 42 insertions(+), 21 deletions(-)
diff --git a/doc/getting-started.html b/doc/getting-started.html
index b9f83cd..72815d4 100644
--- a/doc/getting-started.html
+++ b/doc/getting-started.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
- <title>Exiv2 - Exif and IPTC metadata manipulation library and tools</title>
+ <title>Exiv2 - Exif and Iptc metadata manipulation library and tools</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<link href="html/doxygen.css" rel="stylesheet" type="text/css">
</head>
@@ -22,20 +22,20 @@ the members of the Exiv2 namespace.</p>
<p><a class="el" href="html/classExiv2_1_1ExifData.html">Exiv2::ExifData</a>
and <a class="el" href="html/classExiv2_1_1IptcData.html">Exiv2::IptcData</a>
are the top-level classes of the Exiv2 library. Both have a container
-of Exif and IPTC metadata, respectively, and define related methods to
+of Exif and Iptc metadata, respectively, and define related methods to
access and manipulate the metadata. The containers hold
<a class="el" href="html/classExiv2_1_1Metadatum.html">Exiv2::Metadatum</a>
objects. Class Exiv2::Metadatum defines methods to access the
-information of one Exif tag or IPTC dataset. It models the tag data as
+information of one Exif tag or Iptc dataset. It models the tag data as
a key and value pair.
The abstract base class
<a class="el" href="html/classExiv2_1_1Key.html">Exiv2::Key</a> defines the
-interface for a key. Concrete keys implement Exif and IPTC keys.
+interface for a key. Concrete keys implement Exif and Iptc keys.
The abstract base class
<a class="el" href="html/classExiv2_1_1Value.html">Exiv2::Value</a> defines
the interface to access tag information, from which concrete values are
derived. The actual value used in a metadatum depends on the type of
-the Exif tag or IPTC dataset. It is usually determined when the Exif metadata
+the Exif tag or Iptc dataset. It is usually determined when the Exif metadata
is read from an image. It is also possible to manually create a Value and
together with a key add it to an ExifData or IptcData container.</p>
@@ -45,7 +45,7 @@ together with a key add it to an ExifData or IptcData container.</p>
functionality: <a href="html/exifprint_8cpp-example.html">Exifprint</a>
shows how the Exif data of an image can be read and written to the screen.
<a href="html/iptcprint_8cpp-example.html">Iptcprint</a> is a similar
-example to print IPTC data.
+example to print Iptc data.
<a href="html/addmoddel_8cpp-example.html">Addmoddel</a> shows how to
add, modify and delete Exif metadata.
<a href="html/exifcomment_8cpp-example.html">Exifcomment</a> shows how to
diff --git a/doc/index.html b/doc/index.html
index 96403dc..7ecbadd 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
- <title>Exiv2 - Exif and IPTC metadata manipulation library and tools</title>
+ <title>Exiv2 - Exif and Iptc metadata manipulation library and tools</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<meta http-equiv="refresh" content="0; URL=html/index.html">
</head>
diff --git a/doc/iptc.xml b/doc/iptc.xml
index ad2a66d..7cfec25 100644
--- a/doc/iptc.xml
+++ b/doc/iptc.xml
@@ -2,9 +2,9 @@
<?xml-stylesheet type="text/xsl" href="iptc.xsl"?>
<TAGLIST>
<HEADER>
-<title>IPTC datasets defined in Exiv2</title>
+<title>Iptc datasets defined in Exiv2</title>
<text>
-<p>Datasets are defined according to the specification of the IPTC
+<p>Datasets are defined according to the specification of the Iptc
<a href="http://www.iptc.org/IIM/">Information Interchange Model (IIM)</a>.</p>
<p>Click on a column header to sort the table.</p>
</text>
diff --git a/doc/iptc.xsl b/doc/iptc.xsl
index e07896e..488c526 100644
--- a/doc/iptc.xsl
+++ b/doc/iptc.xsl
@@ -7,13 +7,13 @@ doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN" />
<xsl:template match="TAGLIST">
<html>
<head>
- <title>Exiv2 - Exif and IPTC metadata manipulation library and tools</title>
+ <title>Exiv2 - Exif and Iptc metadata manipulation library and tools</title>
<link type="text/css" rel="stylesheet" href="include/sortabletable.css" />
<script type="text/javascript" src="include/sortabletable.js"></script>
</head>
<body>
-<h1>Exif and IPTC metadata manipulation library and tools</h1>
+<h1>Exif and Iptc metadata manipulation library and tools</h1>
<!-- content generated from XML -->
<xsl:call-template name="header" />
@@ -57,7 +57,6 @@ doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN" />
<col />
<col align="right" />
<col align="center" />
- <col />
<col align="center" />
<col align="center" />
<col align="right" />
@@ -73,7 +72,6 @@ doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN" />
<th>Tag description</th>
<th>Tag (dec)</th>
<th>Tag (hex)</th>
- <th>Record name</th>
<th>Mandatory</th>
<th>Repeatable</th>
<th>Min. bytes</th>
@@ -104,9 +102,32 @@ doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN" />
<td><xsl:value-of select="tagdesc" /></td>
<td><xsl:value-of select="tagdec" /></td>
<td><xsl:value-of select="taghex" /></td>
- <td><xsl:value-of select="recname" /></td>
- <td><xsl:value-of select="mandatory" /></td>
- <td><xsl:value-of select="repeatable" /></td>
+ <td>
+ <xsl:choose>
+ <xsl:when test="mandatory = 'true'">
+ <xsl:text>Yes</xsl:text>
+ </xsl:when>
+ <xsl:when test="mandatory = 'false'">
+ <xsl:text>No</xsl:text>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="mandatory" />
+ </xsl:otherwise>
+ </xsl:choose>
+ </td>
+ <td>
+ <xsl:choose>
+ <xsl:when test="repeatable = 'true'">
+ <xsl:text>Yes</xsl:text>
+ </xsl:when>
+ <xsl:when test="repeatable = 'false'">
+ <xsl:text>No</xsl:text>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="repeatable" />
+ </xsl:otherwise>
+ </xsl:choose>
+ </td>
<td><xsl:value-of select="minbytes" /></td>
<td><xsl:value-of select="maxbytes" /></td>
<td><xsl:value-of select="key" /></td>
@@ -119,7 +140,7 @@ doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN" />
//<![CDATA[
var t1 = new SortableTable(
document.getElementById("report-1"),
- ["String", "String", "Number", "String", "String", "String", "String", "Number", "Number", "String"]
+ ["String", "String", "Number", "String", "String", "String", "Number", "Number", "String"]
);
t1.onsort = function () {
var rows = t1.tBody.rows;
diff --git a/doc/makernote.html b/doc/makernote.html
index 15360ed..107fe02 100644
--- a/doc/makernote.html
+++ b/doc/makernote.html
@@ -1,14 +1,14 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
- <title>Exiv2 - Exif and IPTC metadata manipulation library and tools</title>
+ <title>Exiv2 - Exif and Iptc metadata manipulation library and tools</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<link type="text/css" rel="stylesheet" href="include/sortabletable.css">
<script type="text/javascript" src="include/sortabletable.js"></script>
</head>
<body>
-<h1>Exif and IPTC metadata manipulation library and tools</h1>
+<h1>Exif and Iptc metadata manipulation library and tools</h1>
<h2>MakerNote Formats and Specifications</h2>
<p>According to the <a title="The Exif 2.2 standard (PDF)" href="http://tsc.jeita.or.jp/avs/data/cp3451.pdf">Exif 2.2 standard</a>, the makernote is <i>"a tag for manufacturers of Exif writers to record any desired information. The contents are up to the manufacturer, but this tag should not be used for any other than its intended purpose."</i> Many (but not all) vendors write the makernote in IFD (Image File Directory) format, i.e., in the same format as the rest of the Exif information is encoded. Many manufacturers apparently store a lot of information in the makernote field but unfortunately, most vendors do not publish their specifications.</p>
diff --git a/doc/tags.xsl b/doc/tags.xsl
index 818da26..294324a 100644
--- a/doc/tags.xsl
+++ b/doc/tags.xsl
@@ -7,13 +7,13 @@ doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN" />
<xsl:template match="TAGLIST">
<html>
<head>
- <title>Exiv2 - Exif and IPTC metadata manipulation library and tools</title>
+ <title>Exiv2 - Exif and Iptc metadata manipulation library and tools</title>
<link type="text/css" rel="stylesheet" href="include/sortabletable.css" />
<script type="text/javascript" src="include/sortabletable.js"></script>
</head>
<body>
-<h1>Exif and IPTC metadata manipulation library and tools</h1>
+<h1>Exif and Iptc metadata manipulation library and tools</h1>
<!-- content generated from XML -->
<xsl:call-template name="header" />
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list