[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:37:53 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=3beb136
The following commit has been merged in the master branch:
commit 3beb136af076b3500cdb3b44f97e29ee5d902d0b
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Sat Sep 16 04:21:55 2006 +0000
Doc updates
---
README | 26 +++++++++++++++++---------
doc/ChangeLog | 3 ++-
doc/templates/getting-started.html.in | 13 ++++++-------
src/doxygen.hpp | 31 ++++++++++++++++++-------------
src/exiv2.1 | 3 ++-
5 files changed, 45 insertions(+), 31 deletions(-)
diff --git a/README b/README
index 6c3635b..51cf3f2 100644
--- a/README
+++ b/README
@@ -28,13 +28,17 @@ If you downloaded the source code directly from the subversion
repository, you won't have a configure script. Run make config to
generate it and see the section "Hacking" below.
+zlib (http://www.zlib.net/) is required for PNG support, so you'll need
+to have the zlib library and header files installed or run configure
+with the --without-zlib flag.
+
The default install locations are /usr/local/lib for the library,
/usr/local/bin for the exiv2 utility and /usr/local/include/exiv2 for
the header files. Use the --prefix=directory option of the configure
script to change this default. Run ./configure --help to see a list of
all options.
-To build Exiv2 with MSVC 7.1, use the solution file msvc/exiv2.sln.
+To build Exiv2 with MSVC 7.1 or 8.0, use the solution file msvc/exiv2.sln.
To uninstall Exiv2 from a UNIX-like system, run:
@@ -93,15 +97,19 @@ License
Copyright (C) 2004, 2005, 2006 Andreas Huggel <ahuggel at gmx.net>
-Exiv2 is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
+Exiv2 is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2 of the License, or (at your
+option) any later version.
+
+Alternatively, Exiv2 is also available with a commercial license,
+which allows it to be used in closed-source projects. Contact me for
+more information.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+Exiv2 is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 2ffc669..1aa6c5b 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -4,7 +4,8 @@ Changes from version 0.10 to 0.11
* Exiv2 utility
- 0000485: [tools] Weird behaviour when Exif comments contain quotes (Reported
by Scott Baker)
- - Changed exiv2 del command to delete all occurences of a tag. (Toff)
+ - Changed exiv2 del command to delete all occurences of a tag.
+ (Christophe Paris)
* Exiv2 library
- 0000483: [jpeg i/o] Assertion `sizeIptc' fails when reading metadata from
diff --git a/doc/templates/getting-started.html.in b/doc/templates/getting-started.html.in
index 015a9c6..f7c80ee 100644
--- a/doc/templates/getting-started.html.in
+++ b/doc/templates/getting-started.html.in
@@ -23,8 +23,7 @@ the members of the Exiv2 namespace.</p>
(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.
-However, the only image format currently supported is Jpeg. Most
+Exiv2::Image are the implementations of different image formats. 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
@@ -34,20 +33,20 @@ is transparent to them.</p>
<a class="el" href="classExiv2_1_1ExifData.html">Exiv2::ExifData</a>
and <a class="el" href="classExiv2_1_1IptcData.html">Exiv2::IptcData</a>
of the Exiv2 library. They hold 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 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
+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="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="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>
@@ -57,7 +56,7 @@ together with a key add it to an ExifData or IptcData container.</p>
functionality: <a href="exifprint_8cpp-example.html">Exifprint</a>
shows how the Exif data of an image can be read and written to the screen.
<a href="iptcprint_8cpp-example.html">Iptcprint</a> is a similar
-example to print Iptc data.
+example to print IPTC data.
<a href="addmoddel_8cpp-example.html">Addmoddel</a> shows how to
add, modify and delete Exif metadata.
<a href="exifcomment_8cpp-example.html">Exifcomment</a> shows how to
diff --git a/src/doxygen.hpp b/src/doxygen.hpp
index 94ecf21..193769c 100644
--- a/src/doxygen.hpp
+++ b/src/doxygen.hpp
@@ -8,7 +8,7 @@
@date 07-Feb-04, ahu: created
*/
/*!
- @mainpage Exif and Iptc metadata manipulation library and tools v0.11
+ @mainpage Exif and IPTC metadata manipulation library and tools v0.11
@section overview Exiv2 Overview
@@ -17,9 +17,9 @@
<A HREF="http://www.exiv2.org/">http://www.exiv2.org/</A>.
The %Exiv2 library provides
- - full read and write access to the Exif and Iptc metadata of an image through
+ - full read and write access to the Exif and IPTC metadata of an image through
%Exiv2 keys and standard C++ iterators
- - a smart Iptc implementation that does not affect data that programs like
+ - a smart IPTC implementation that does not affect data that programs like
Photoshop store in the same image segment
- Exif <A HREF="makernote.html">MakerNote</A> support:
- %MakerNote tags can be accessed just like any other Exif metadata
@@ -27,17 +27,17 @@
<br> 1) the %MakerNote is not re-located if possible at all, and
<br> 2) %MakerNote %Ifd offsets are re-calculated if the
%MakerNote needs to be moved (for known %Ifd %MakerNotes)
- - extract and delete methods for Exif thumbnails (both, Jpeg and Tiff thumbnails)
- - set methods for Exif thumbnails (Jpeg only, Tiff thumbnails can be set from
+ - extract and delete methods for Exif thumbnails (both, JPEG and TIFF thumbnails)
+ - set methods for Exif thumbnails (JPEG only, TIFF thumbnails can be set from
individual tags)
- - complete API documentation (by Doxygen)
+ - complete API documentation
@section getting-started Getting started
<A HREF="getting-started.html">A few pointers</A> to get you started with
the %Exiv2 library without delay.
- @section metadata Exif and MakerNote tags and Iptc datasets
+ @section metadata Exif and MakerNote tags and IPTC datasets
- <A HREF="tags-exif.html">Standard Exif tags</A>
- <A HREF="tags-canon.html">Canon MakerNote tags</A>
@@ -48,13 +48,14 @@
- <A HREF="tags-panasonic.html">Panasonic MakerNote tags</A>
- <A HREF="tags-sigma.html">Sigma/Foveon MakerNote tags</A>
- <A HREF="tags-sony.html">Sony MakerNote tags</A>
- - <A HREF="tags-iptc.html">Iptc datasets</A>
+ - <A HREF="tags-iptc.html">IPTC datasets</A>
@section formats File Formats
- - Jpeg
+ - JPEG
- <A HREF="crw-mapping.html">Canon CRW</A>
- - TIFF and related RAW formats (Canon CR2, Nikon NEF, Pentax PEF, Sony SR2, Adobe DNG, and Minolta MRW), read-only
+ - TIFF and related RAW formats (Canon CR2, Nikon NEF, Pentax PEF, Sony SR2, Sony ARW, Adobe DNG, and Minolta MRW), read-only
+ - PNG, read-only
@section supp Support
@@ -99,6 +100,10 @@ bug tracking system</a>.</p>
published by the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.</P>
+ <P>Alternatively, %Exiv2 is also available with a commercial license, which
+ allows it to be used in closed-source projects.
+ <A HREF="mailto:ahuggel at gmx.net">Contact me</A> for more information.</P>
+
<P>%Exiv2 is distributed in the hope that it will be useful, but WITHOUT ANY
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
A PARTICULAR PURPOSE. See the GNU General Public License for more
@@ -106,7 +111,7 @@ bug tracking system</a>.</p>
<P>You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA.
+ 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA.</P>
*/
/*!
@example addmoddel.cpp
@@ -122,9 +127,9 @@ bug tracking system</a>.</p>
*/
/*!
@example iptcprint.cpp
- Sample program to print the Iptc metadata of an image
+ Sample program to print the IPTC metadata of an image
*/
/*!
@example iptceasy.cpp
- The quickest way to access, set or modify Iptc metadata
+ The quickest way to access, set or modify IPTC metadata
*/
diff --git a/src/exiv2.1 b/src/exiv2.1
index f36e140..6ac1346 100644
--- a/src/exiv2.1
+++ b/src/exiv2.1
@@ -100,7 +100,8 @@ only used with the 'rename' action.
.B \-T
Only set the file timestamp according to the Exif create timestamp, do
not rename the file (overrides
B\-k
P). This option is only used
-with the 'rename' action.
+with the 'rename' action. Note: On Windows you may have to set the TZ
+environment variable for this option to work correctly.
.TP
.B \-f
Do not prompt before overwriting existing files (force overwrite).
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list