[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=d8b2360
The following commit has been merged in the master branch:
commit d8b236039b5c68a68fe1b793a8e7a602ddccfb74
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Thu Aug 12 15:50:24 2004 +0000
IPTC -> Iptc
---
src/doxygen.hpp | 10 +++++-----
src/image.cpp | 6 +++---
src/image.hpp | 18 +++++++++---------
src/iptc.awk | 6 +++---
src/iptc.hpp | 5 ++---
src/iptctest.sh | 2 +-
src/metacopy.hpp | 4 ++--
7 files changed, 25 insertions(+), 26 deletions(-)
diff --git a/src/doxygen.hpp b/src/doxygen.hpp
index afd3acb..d743a83 100644
--- a/src/doxygen.hpp
+++ b/src/doxygen.hpp
@@ -2,18 +2,18 @@
/*!
@file doxygen.hpp
@brief Additional documentation, this file contains no source code
- @version $Name: $ $Revision: 1.15 $
+ @version $Name: $ $Revision: 1.16 $
@author Andreas Huggel (ahu)
<a href="mailto:ahuggel at gmx.net">ahuggel at gmx.net</a>
@date 07-Feb-04, ahu: created
*/
/*!
- @mainpage Exif and IPTC metadata manipulation library and tools v0.5
+ @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 and IPTC IIM metadata of an image
+ - 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
@@ -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 and IPTC datasets
+ @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,7 +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>
+ - <A HREF="../iptc.xml">Iptc datasets</A>
@section makernote MakerNote Formats and Specifications
diff --git a/src/image.cpp b/src/image.cpp
index 56e6c36..b2c7940 100644
--- a/src/image.cpp
+++ b/src/image.cpp
@@ -20,16 +20,16 @@
*/
/*
File: image.cpp
- Version: $Name: $ $Revision: 1.22 $
+ Version: $Name: $ $Revision: 1.23 $
Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
Brad Schick (brad) <schick at robotbattle.com>
History: 26-Jan-04, ahu: created
11-Feb-04, ahu: isolated as a component
- 19-Jul-04, brad: revamped to be more flexible and support IPTC
+ 19-Jul-04, brad: revamped to be more flexible and support Iptc
*/
// *****************************************************************************
#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Name: $ $Revision: 1.22 $ $RCSfile: image.cpp,v $");
+EXIV2_RCSID("@(#) $Name: $ $Revision: 1.23 $ $RCSfile: image.cpp,v $");
// *****************************************************************************
// included header files
diff --git a/src/image.hpp b/src/image.hpp
index 178ac9d..f9ff8ec 100644
--- a/src/image.hpp
+++ b/src/image.hpp
@@ -21,14 +21,14 @@
/*!
@file image.hpp
@brief Class JpegImage to access JPEG images
- @version $Name: $ $Revision: 1.17 $
+ @version $Name: $ $Revision: 1.18 $
@author Andreas Huggel (ahu)
<a href="mailto:ahuggel at gmx.net">ahuggel at gmx.net</a>
@author Brad Schick (brad)
<a href="mailto:schick at robotbattle.com">schick at robotbattle.com</a>
@date 09-Jan-04, ahu: created<BR>
11-Feb-04, ahu: isolated as a component<BR>
- 19-Jul-04, brad: revamped to be more flexible and support IPTC
+ 19-Jul-04, brad: revamped to be more flexible and support Iptc
*/
#ifndef IMAGE_HPP_
#define IMAGE_HPP_
@@ -406,7 +406,7 @@ namespace Exiv2 {
static const char jfifId_[]; //!< JFIF identifier
static const char ps3Id_[]; //!< Photoshop marker
static const char bimId_[]; //!< Photoshop marker
- static const uint16 iptc_; //!< Photoshop IPTC marker
+ static const uint16 iptc_; //!< Photoshop Iptc marker
private:
// DATA
@@ -415,7 +415,7 @@ namespace Exiv2 {
long sizeExifData_; //!< Size of the Exif data buffer
byte* pExifData_; //!< Exif data buffer
long sizeIptcData_; //!< Size of the Iptc data buffer
- byte* pIptcData_; //!< IPTC data buffer
+ byte* pIptcData_; //!< Iptc data buffer
std::string comment_; //!< JPEG comment
// METHODS
@@ -428,21 +428,21 @@ namespace Exiv2 {
*/
int advanceToMarker() const;
/*!
- @brief Locates Photoshop formated IPTC data in a memory buffer.
+ @brief Locates Photoshop formated Iptc data in a memory buffer.
Operates on raw data (rather than file streams) to simplify reuse.
@param pPsData Pointer to buffer containing entire payload of
Photoshop formated APP13 Jpeg segment.
@param sizePsData Size in bytes of pPsData.
- @param record Output value that is set to the start of the IPTC
+ @param record Output value that is set to the start of the Iptc
data block within pPsData (may not be null).
@param sizeHdr Output value that is set to the size of the header
- within the IPTC data block pointed to by record (may not
+ within the Iptc data block pointed to by record (may not
be null).
@param sizeIptc Output value that is set to the size of the actual
- IPTC data within the IPTC data block pointed to by record
+ Iptc data within the Iptc data block pointed to by record
(may not be null).
@return 0 if successful;<BR>
- 3 if no IPTC data was found in pPsData;<BR>
+ 3 if no Iptc data was found in pPsData;<BR>
-2 if the pPsData buffer does not contain valid data;<BR>
*/
int locateIptcData(const byte *pPsData,
diff --git a/src/iptc.awk b/src/iptc.awk
index ed05c42..feb6b43 100644
--- a/src/iptc.awk
+++ b/src/iptc.awk
@@ -1,6 +1,6 @@
################################################################################
# File : iptc.awk
-# Version : $Name: $ $Revision: 1.1 $
+# Version : $Name: $ $Revision: 1.2 $
# Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
# History : 07-Feb-04, ahu: created
#
@@ -16,9 +16,9 @@ BEGIN {
print "<TAGLIST>"
print "<HEADER>"
- print "<title>IPTC datasets defined in Exiv2</title>"
+ print "<title>Iptc datasets defined in Exiv2</title>"
print "<text>"
- print "<p>Datasets are defined according to the specification of the IPTC "
+ 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>"
diff --git a/src/iptc.hpp b/src/iptc.hpp
index 011e50a..2bac617 100644
--- a/src/iptc.hpp
+++ b/src/iptc.hpp
@@ -20,8 +20,8 @@
*/
/*!
@file iptc.hpp
- @brief Encoding and decoding of IPTC data
- @version $Name: $ $Revision: 1.2 $
+ @brief Encoding and decoding of Iptc data
+ @version $Name: $ $Revision: 1.3 $
@author Brad Schick (brad)
<a href="mailto:schick at robotbattle.com">schick at robotbattle.com</a>
@date 31-Jul-04, brad: created
@@ -494,4 +494,3 @@ namespace Exiv2 {
} // namespace Exiv2
#endif // #ifndef IPTC_HPP_
-
diff --git a/src/iptctest.sh b/src/iptctest.sh
index de8ca78..d472b6a 100755
--- a/src/iptctest.sh
+++ b/src/iptctest.sh
@@ -1,5 +1,5 @@
#! /bin/bash
-# Test driver for IPTC metadata
+# Test driver for Iptc metadata
printTest()
{
diff --git a/src/metacopy.hpp b/src/metacopy.hpp
index de410a0..8926b7c 100644
--- a/src/metacopy.hpp
+++ b/src/metacopy.hpp
@@ -21,7 +21,7 @@
/*!
@file metacopy.hpp
@brief Defines class Params, used for the command line handling
- @version $Name: $ $Revision: 1.1 $
+ @version $Name: $ $Revision: 1.2 $
@author Brad Schick (brad) <schick at robotbattle.com>
@date 13-Jul-04, brad: created
*/
@@ -37,7 +37,7 @@ private:
public:
bool help_; //!< Help option flag.
- bool iptc_; //!< IPTC option flag.
+ bool iptc_; //!< Iptc option flag.
bool exif_; //!< Exif option flag.
bool comment_; //!< JPEG comment option flag.
bool preserve_; //!< Preserve existing metadata option flag.
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list