[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=2c1dcd5
The following commit has been merged in the master branch:
commit 2c1dcd5094579b6f4c51c8278c4ada70702a6fc9
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Thu Aug 12 08:34:08 2004 +0000
Minor changes
---
src/datasets.cpp | 9 +++++----
src/doxygen.hpp | 19 ++++++++++++-------
src/{tags.awk => iptc.awk} | 24 ++++++++++++++----------
src/iptc.hpp | 6 +++---
4 files changed, 34 insertions(+), 24 deletions(-)
diff --git a/src/datasets.cpp b/src/datasets.cpp
index 9cb08ef..babc25f 100644
--- a/src/datasets.cpp
+++ b/src/datasets.cpp
@@ -20,13 +20,13 @@
*/
/*
File: datasets.cpp
- Version: $Name: $ $Revision: 1.2 $
+ Version: $Name: $ $Revision: 1.3 $
Author(s): Brad Schick (brad) <schick at robotbattle.com>
History: 24-Jul-04, brad: created
*/
// *****************************************************************************
#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Name: $ $Revision: 1.2 $ $RCSfile: datasets.cpp,v $");
+EXIV2_RCSID("@(#) $Name: $ $Revision: 1.3 $ $RCSfile: datasets.cpp,v $");
// *****************************************************************************
// included header files
@@ -307,9 +307,10 @@ namespace Exiv2 {
<< IptcDataSets::recordName(dataSet.recordId_) << ", "
<< std::boolalpha << dataSet.mandatory_ << ", "
<< dataSet.repeatable_ << ", "
- << dataSet.minbytes_ << ", "
+ << std::dec << dataSet.minbytes_ << ", "
<< dataSet.maxbytes_ << ", "
- << IptcDataSets::makeKey(dataSet) ;
+ << IptcDataSets::makeKey(dataSet) << ", "
+ << dataSet.desc_;
}
} // namespace Exiv2
diff --git a/src/doxygen.hpp b/src/doxygen.hpp
index 202ab70..afd3acb 100644
--- a/src/doxygen.hpp
+++ b/src/doxygen.hpp
@@ -2,21 +2,21 @@
/*!
@file doxygen.hpp
@brief Additional documentation, this file contains no source code
- @version $Name: $ $Revision: 1.14 $
+ @version $Name: $ $Revision: 1.15 $
@author Andreas Huggel (ahu)
<a href="mailto:ahuggel at gmx.net">ahuggel at gmx.net</a>
@date 07-Feb-04, ahu: created
*/
/*!
- @mainpage Exif metadata manipulation library and tools v0.4
+ @mainpage Exif and IPTC metadata manipulation library and tools v0.5
@section overview Exiv2 Overview
Exiv2 is a C++ library that provides
- - full read and write access to the Exif metadata of an image through %Exiv2
- keys and standard C++ iterators
- - extensive MakerNote support:
- - MakerNote tags can be accessed just like any other Exif metadata
+ - full read and write access to the Exif and IPTC IIM metadata of an image
+ through %Exiv2 keys and standard C++ iterators
+ - extensive Exif MakerNote support:
+ - MakerNote tags can be accessed just like any other metadata
- a sophisticated write algorithm avoids corrupting the MakerNote:
<BR> 1) the MakerNote is not re-located if possible at all, and
<BR> 2) MakerNote IFD offsets are re-calculated if the MakerNote
@@ -41,7 +41,7 @@
<A HREF="../getting-started.html">A few pointers</A> to get you started with
the %Exiv2 library without delay.
- @section metadata Supported Exif and MakerNote tags
+ @section metadata Supported Exif and MakerNote tags and IPTC datasets
- <A HREF="../tags.xml">Standard Exif tags</A>
- <A HREF="../tags-canon.xml">Canon MakerNote tags</A>
@@ -50,6 +50,7 @@
- <A HREF="../tags-nikon2.xml">Nikon (format 2) MakerNote tags</A>
- <A HREF="../tags-nikon3.xml">Nikon (format 3) MakerNote tags</A>
- <A HREF="../tags-sigma.xml">Sigma/Foveon MakerNote tags</A>
+ - <A HREF="../iptc.xml">IPTC datasets</A>
@section makernote MakerNote Formats and Specifications
@@ -87,3 +88,7 @@
@example exifcomment.cpp
Sample program showing how to set the Exif comment of an image.
*/
+/*!
+ @example iptcprint.cpp
+ Sample program to print the Iptc metadata of an image
+ */
diff --git a/src/tags.awk b/src/iptc.awk
similarity index 53%
copy from src/tags.awk
copy to src/iptc.awk
index 4f10c8b..ed05c42 100644
--- a/src/tags.awk
+++ b/src/iptc.awk
@@ -1,25 +1,25 @@
################################################################################
-# File : tags.awk
-# Version : $Name: $ $Revision: 1.3 $
+# File : iptc.awk
+# Version : $Name: $ $Revision: 1.1 $
# Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
# History : 07-Feb-04, ahu: created
#
# Description:
# Awk script to convert a taglist to XML format used in the documentation.
-# $ taglist [SectionName] | awk -f tags.awk > tags.xml
+# $ taglist [SectionName] | awk -f iptc.awk > iptc.xml
################################################################################
BEGIN {
FS = ", "
print "<?xml version = '1.0'?>";
- print "<?xml-stylesheet type=\"text/xsl\" href=\"tags.xsl\"?>";
+ print "<?xml-stylesheet type=\"text/xsl\" href=\"iptc.xsl\"?>";
print "<TAGLIST>"
print "<HEADER>"
- print "<title>XYZ MakerNote Tags defined in Exiv2</title>"
+ print "<title>IPTC datasets defined in Exiv2</title>"
print "<text>"
- print "<p>Tags found in the MakerNote of images taken with XYZ cameras. These tags "
- print "are defined by Exiv2 in accordance with <a href=\"makernote.html#RX\">[X]</a>.</p>"
+ print "<p>Datasets are defined according to the specification of the IPTC "
+ print "<a href=\"http://www.iptc.org/IIM/\">Information Interchange Model (IIM)</a>.</p>"
print "<p>Click on a column header to sort the table.</p>"
print "</text>"
print "</HEADER>"
@@ -31,9 +31,13 @@ BEGIN {
print " <tagname>" $1 "</tagname>"
print " <tagdec>" $2 "</tagdec>"
print " <taghex>" $3 "</taghex>"
- print " <ifd>" $4 "</ifd>"
- print " <key>" $5 "</key>"
- print " <tagdesc>" $6 "</tagdesc>"
+ print " <recname>" $4 "</recname>"
+ print " <mandatory>" $5 "</mandatory>"
+ print " <repeatable>" $6 "</repeatable>"
+ print " <minbytes>" $7 "</minbytes>"
+ print " <maxbytes>" $8 "</maxbytes>"
+ print " <key>" $9 "</key>"
+ print " <tagdesc>" $10 "</tagdesc>"
print " </ROW>";
}
diff --git a/src/iptc.hpp b/src/iptc.hpp
index ac81eab..011e50a 100644
--- a/src/iptc.hpp
+++ b/src/iptc.hpp
@@ -21,7 +21,7 @@
/*!
@file iptc.hpp
@brief Encoding and decoding of IPTC data
- @version $Name: $ $Revision: 1.1 $
+ @version $Name: $ $Revision: 1.2 $
@author Brad Schick (brad)
<a href="mailto:schick at robotbattle.com">schick at robotbattle.com</a>
@date 31-Jul-04, brad: created
@@ -300,8 +300,8 @@ namespace Exiv2 {
*/
int read(const std::string& path);
/*!
- @brief Read the Iptc data from a byte buffer. The must follow
- the IPTC IIM4 standard.
+ @brief Read the Iptc data from a byte buffer. The format must follow
+ the IPTC IIM4 standard.
@param buf Pointer to the data buffer to read from
@param len Number of bytes in the data buffer
@return 0 if successful;<BR>
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list