[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:39:46 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=f822075
The following commit has been merged in the master branch:
commit f8220756c517776842032e9f80a6ce4a51e6683e
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Wed Sep 10 12:43:54 2008 +0000
Doc updates and fixes.
---
doc/templates/Makefile | 45 +++++++++++------------
doc/templates/__intro__ | 98 ++++++++++++++++++++-----------------------------
src/exiv2.1 | 12 +++---
3 files changed, 68 insertions(+), 87 deletions(-)
diff --git a/doc/templates/Makefile b/doc/templates/Makefile
index 90b1de6..4e748d1 100644
--- a/doc/templates/Makefile
+++ b/doc/templates/Makefile
@@ -56,20 +56,20 @@ TABLES = Exif \
Sigma \
Sony
-SCHEMA = dc \
- xmp \
- xmpRights \
- xmpMM \
- xmpBJ \
- xmpTPg \
- xmpDM \
- pdf \
- photoshop \
- crs \
- tiff \
- exif \
- aux \
- iptc
+SCHEMA = xmp_dc \
+ xmp_xmp \
+ xmp_xmpRights \
+ xmp_xmpMM \
+ xmp_xmpBJ \
+ xmp_xmpTPg \
+ xmp_xmpDM \
+ xmp_pdf \
+ xmp_photoshop \
+ xmp_crs \
+ xmp_tiff \
+ xmp_exif \
+ xmp_aux \
+ xmp_iptc
TAGLIST = ../../src/taglist
@@ -108,12 +108,12 @@ Iptc: $(TAGLIST)
@rm -f $@.tmp
$(SCHEMA): $(TAGLIST)
- @echo Generating xmp_$@ table...
- @$(TAGLIST) $@ | sed -e"s/</\</g" -e"s/>/\>/g" | awk -f xmp.awk > xmp_$@.xml
- @xsltproc xmp.xsl xmp_$@.xml > xmp_$@.tmp
- @sed "s/report1/xmp_$@/" xmp_$@.tmp > __xmp_$@__
- @touch xmp_$@
- @rm -f xmp_$@.tmp
+ @echo Generating $@ table...
+ @echo $@ | sed "s/xmp_//" | xargs $(TAGLIST) | sed -e"s/</\</g" -e"s/>/\>/g" | awk -f xmp.awk > $@.xml
+ @xsltproc xmp.xsl $@.xml > $@.tmp
+ @sed "s/report1/$@/" $@.tmp > __$@__
+ @touch $@
+ @rm -f $@.tmp
$(TAGLIST):
$(error File $(TAGLIST) does not exist. Did you build the library and programs in the src/ directory?)
@@ -124,9 +124,8 @@ mostlyclean:
clean: mostlyclean
rm -f $(TABLES:%=__%__) __Iptc__
- rm -f $(TABLES) Iptc
- rm -f $(SCHEMA:%=__xmp_%__)
- rm -f $(SCHEMA:%=xmp_%)
+ rm -f $(SCHEMA:%=__%__)
+ rm -f $(TABLES) $(SCHEMA) Iptc
rm -f *.html
distclean: clean
diff --git a/doc/templates/__intro__ b/doc/templates/__intro__
index 85f5656..e268c9b 100644
--- a/doc/templates/__intro__
+++ b/doc/templates/__intro__
@@ -2,32 +2,39 @@
<p>The <a href="index.html">Exiv2 library</a> is made up of all
elements defined in the <a href="namespaceExiv2.html">Exiv2
-namespace</a>. The Action and Util namespaces are only used by the
-Exiv2 command line utility.</p>
+namespace</a>.</p>
<h2><a href="classes.html">Classes</a></h2>
-<p>The top-level class of the Exiv2 library is
-<a class="el" href="classExiv2_1_1Image.html">Exiv2::Image</a>
-
-(don't let the components diagram below mislead you). Exiv2::Image
-defines the interface to access various image metadata. Derived from
-Exiv2::Image are the implementations of different image formats. Most
-applications will use
+<p>The top-level class of the Exiv2 library is <a class="el"
+href="classExiv2_1_1Image.html">Exiv2::Image</a>. Exiv2::Image
+defines the interface to access image metadata. Derived from
+Exiv2::Image are implementations for different image formats. Most
+importantly, they contain the logic to read metadata from the image
+into Exiv2 metadata containers and write it back to the image.
+Most applications will use
<a class="el" href="classExiv2_1_1ImageFactory.html">Exiv2::ImageFactory</a>
to access images in files or memory, in which case the image format
-is transparent to them.</p>
+is transparent to them. The factory determines the image format from the
+data (not the file extension) and creates an object of the corresponding
+Image subclass.</p>
<p>Exif and IPTC metadata is manipulated through the classes
<a class="el" href="classExiv2_1_1ExifData.html">Exiv2::ExifData</a>
and <a class="el" href="classExiv2_1_1IptcData.html">Exiv2::IptcData</a>.
They hold a container of Exif and IPTC metadata, respectively, and define
-related methods to access and manipulate the metadata. The containers hold
-objects derived from
-<a class="el" href="classExiv2_1_1Metadatum.html">Exiv2::Metadatum</a>.
+related methods to access and manipulate the metadata.
+<br>
+Exif tag and IPTC dataset reference information for the standard tags
+and datasets is available in the two static classes
+<a class="el" href="classExiv2_1_1ExifTags.html">Exiv2::ExifTags</a> and
+<a class="el" href="classExiv2_1_1IptcDataSets.html">Exiv2::IptcDataSets</a>.
+<br>
+The metadata containers hold objects derived from
+<a class="el" href="classExiv2_1_1Metadatum.html">Exiv2::Metadatum</a>.
Interface class Exiv2::Metadatum defines methods to access the
-information of one Exif tag or IPTC dataset. It models the tag data as
-a key and value pair.
+information of one metadatum. It models the tag data as a key and
+value pair.
The abstract base class
<a class="el" href="classExiv2_1_1Key.html">Exiv2::Key</a> defines the
interface for a key. Concrete keys implement Exif and IPTC keys.
@@ -35,23 +42,25 @@ The abstract base class
<a class="el" href="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
-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>
+the Exif tag or IPTC dataset. It is usually determined when the Exif or
+IPTC 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>
-Top-level Exiv2 classes to access XMP metadata are
+The classes to access XMP metadata are
<a class="el" href="classExiv2_1_1XmpData.html">Exiv2::XmpData</a>,
<a class="el" href="classExiv2_1_1Xmpdatum.html">Exiv2::Xmpdatum</a>
and <a class="el" href="classExiv2_1_1XmpKey.html">Exiv2::XmpKey</a>.
They work similar to the corresponding Exif and IPTC classes.
-The property-repository is <a class="el" href="classExiv2_1_1XmpProperties.html">Exiv2::XmpProperties</a>.
+The property reference information is in
+<a class="el" href="classExiv2_1_1XmpProperties.html">Exiv2::XmpProperties</a>.
In addition to the expected new members, class
<a class="el" href="classExiv2_1_1Image.html">Exiv2::Image</a>
-also has an interface to access the raw XMP packet.
-
+now also has an interface to access the raw XMP packet.
+<br>
All XMP value types are supported: Simple types, structures,
arrays, property qualifiers and language alternatives.
-
+<br>
XMP properties are accessed through keys of the form
"Xmp.<Prefix>.<PropertyPath>", where <Prefix> is the preferred
(or rather, registered) prefix for a schema namespace and
@@ -60,16 +69,16 @@ form, to address simple properties, <PropertyPath> is the name
of the property. In general, <PropertyPath> can be used to
address any XMP node, including array items, structure fields
qualifiers and deeply nested properties.
-
+<br>
Any properties in known namespaces are supported and additional
namespaces can be registered.
-
+<br>
The specialized Exiv2 values
<a class="el" href="classExiv2_1_1XmpTextValue.html">Exiv2::XmpTextValue</a>,
<a class="el" href="classExiv2_1_1XmpArrayValue.html">Exiv2::XmpArrayValue</a>
and <a class="el" href="classExiv2_1_1LangAltValue.html">Exiv2::LangAltValue</a> are
provided to simplify the use of XMP properties.
-
+<br>
Note: Unlike Exif and IPTC tags, XMP properties do not have
a tag number.
@@ -85,7 +94,8 @@ add, modify and delete Exif metadata.
<a href="exifcomment_8cpp-example.html">Exifcomment</a> shows how to
set the exif comment of an image.
<a href="xmpsample_8cpp-example.html">Xmpsample.cpp</a> contains examples
-of how to set various types of XMP properties.<br>
+of how to set various types of XMP properties.
+<br>
For more real-world code have a look at the implementation of the
different actions of the Exiv2 utility (actions.cpp).</p>
@@ -94,34 +104,6 @@ different actions of the Exiv2 utility (actions.cpp).</p>
<p>Exif Makernote data can be accessed through ExifData in the same
way as the standard Exif tags. In other words, for each entry of a
known Makernote, there is a corresponding Metadatum in the ExifData
-container. The abstract base class
-<a class="el" href="classExiv2_1_1MakerNote.html">Exiv2::MakerNote</a> defines
-the Makernote interface. Subclass
-<a class="el" href="classExiv2_1_1IfdMakerNote.html">Exiv2::IfdMakerNote</a>
-models makernotes encoded in IFD format.
-<a href="classExiv2_1_1MakerNote.html#_details">Implementing a new
-IFD makernote</a> is straightforward. Implementing a new makernote that is not
-encoded in IFD format however, is more difficult. Please
-<a href="mailto:ahuggel at gmx.net"> contact me</a> if you have such a
-makernote specification and would like assistance adding it to Exiv2.</p>
-
-<h2><a class="anchor">IFD (Image File Directory)</a></h2>
-
-<p><a class="el" href="classExiv2_1_1Ifd.html">Exiv2::Ifd</a> is a generic
-low-level class that models an image file directory as defined by TIFF
-and used in the Exif standard. Exiv2::Ifd could be used to implement
-read only as well as read/write access to Exif (or TIFF) data without
-the overhead (and convenience) of Exiv2::ExifData.</p>
-
-<h2><a class="anchor">Components</a></h2>
-
-<p>The picture below shows the components that make up the Exiv2
-library and how they depend on each other. Component names are the
-same as the basenames of their source files. Each component has its
-own header and source files.</p>
-
-<center>
-<h3><a class="anchor">Exiv2 Components Diagram</a></h3>
-<p><img src="../include/exiv2-components.png" width="660" height="543" alt="Exiv2 components diagram"></p>
-</center>
-<p> </p>
+container. Makernote taglists are available in classes
+Exiv2::<Make>MakerNote (e.g.,
+<a class="el" href="classExiv2_1_1CanonMakerNote.html">Exiv2::CanonMakerNote</a>.)
diff --git a/src/exiv2.1 b/src/exiv2.1
index f402b5e..3781701 100644
--- a/src/exiv2.1
+++ b/src/exiv2.1
@@ -3,7 +3,7 @@
.\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1)
-.TH EXIV2 1 "June 4th, 2008"
+.TH EXIV2 1 "Sept 10th, 2008"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
@@ -29,11 +29,11 @@ exiv2 \- Image metadata manipulation tool
.\" respectively.
.B exiv2
is a program to read and write Exif, IPTC and XMP image metadata and
-image comments. Supported formats are JPEG, Canon CRW, Canon THM and
-XMP sidecar files. Read-only support is currently available for JP2,
-PNG, PSD and TIFF format and includes TIFF-based RAW formats: Adobe
-DNG, Canon CR2, Fujifilm RAF, Minolta MRW, Nikon NEF, Olympus ORF,
-Pentax PEF, Sony ARW and Sony SR2.
+image comments. Supported formats are JPEG, TIFF, PNG, JP2, Adobe DNG,
+Canon CRW, Canon THM, Nikon NEF, Pentax PEF and XMP sidecar files.
+Read-only support is currently available for PSD and several TIFF-based
+RAW formats: Canon CR2, Fujifilm RAF, Minolta MRW, Olympus ORF, Sony
+ARW and Sony SR2.
.SH ACTIONS
The
Iaction
P argument is only required if it is not clear from the
Ioptions
P which action is implied.
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list