[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:38:16 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=96e384e
The following commit has been merged in the master branch:
commit 96e384edfca56e6bfe87f926fd83d3db729e267a
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Fri Feb 2 10:11:43 2007 +0000
Removed trailing whitespace
---
src/actions.hpp | 6 +++---
src/exif.hpp | 4 ++--
src/image.hpp | 4 ++--
src/iptc.hpp | 6 +++---
src/tiffvisitor.cpp | 2 +-
src/tiffvisitor.hpp | 6 +++---
6 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/actions.hpp b/src/actions.hpp
index a9564dc..2316fac 100644
--- a/src/actions.hpp
+++ b/src/actions.hpp
@@ -317,13 +317,13 @@ namespace Action {
Modify(const Modify& /*src*/) : Task() {}
//! Add a metadatum to \em pImage according to \em modifyCmd
- static void addMetadatum(Exiv2::Image* pImage,
+ static void addMetadatum(Exiv2::Image* pImage,
const ModifyCmd& modifyCmd);
//! Set a metadatum in \em pImage according to \em modifyCmd
- static void setMetadatum(Exiv2::Image* pImage,
+ static void setMetadatum(Exiv2::Image* pImage,
const ModifyCmd& modifyCmd);
//! Delete a metadatum from \em pImage according to \em modifyCmd
- static void delMetadatum(Exiv2::Image* pImage,
+ static void delMetadatum(Exiv2::Image* pImage,
const ModifyCmd& modifyCmd);
}; // class Modify
diff --git a/src/exif.hpp b/src/exif.hpp
index 5f2c421..5f6cc76 100644
--- a/src/exif.hpp
+++ b/src/exif.hpp
@@ -586,8 +586,8 @@ namespace Exiv2 {
//! End of the metadata
iterator end() { return exifMetadata_.end(); }
/*!
- @brief Find the first Exifdatum with the given \em key, return an
- iterator to it.
+ @brief Find the first Exifdatum with the given \em key, return an
+ iterator to it.
*/
iterator findKey(const ExifKey& key);
/*!
diff --git a/src/image.hpp b/src/image.hpp
index b41eb4b..3b31f48 100644
--- a/src/image.hpp
+++ b/src/image.hpp
@@ -237,7 +237,7 @@ namespace Exiv2 {
*/
virtual BasicIo& io() const =0;
/*!
- @brief Returns the access mode, i.e., the metadata functions, which
+ @brief Returns the access mode, i.e., the metadata functions, which
this image supports for the metadata type \em metadataId.
@param metadataId The metadata identifier.
@return Access mode for the requested image type and metadata identifier.
@@ -382,7 +382,7 @@ namespace Exiv2 {
*/
static int getType(BasicIo& io);
/*!
- @brief Returns the access mode or supported metadata functions for an
+ @brief Returns the access mode or supported metadata functions for an
image type and a metadata type.
@param imageType The image type.
@param metadataId The metadata identifier.
diff --git a/src/iptc.hpp b/src/iptc.hpp
index b1667da..09874d8 100644
--- a/src/iptc.hpp
+++ b/src/iptc.hpp
@@ -340,7 +340,7 @@ namespace Exiv2 {
iterator begin() { return iptcMetadata_.begin(); }
//! End of the metadata
iterator end() { return iptcMetadata_.end(); }
- /*!
+ /*!
@brief Find the first Iptcdatum with the given key, return an iterator
to it.
*/
@@ -367,12 +367,12 @@ namespace Exiv2 {
*/
DataBuf copy() const;
/*!
- @brief Find the first Iptcdatum with the given key, return a const
+ @brief Find the first Iptcdatum with the given key, return a const
iterator to it.
*/
const_iterator findKey(const IptcKey& key) const;
/*!
- @brief Find the first Iptcdatum with the given record and dataset
+ @brief Find the first Iptcdatum with the given record and dataset
number, return a const iterator to it.
*/
const_iterator findId(uint16_t dataset,
diff --git a/src/tiffvisitor.cpp b/src/tiffvisitor.cpp
index 2820b69..10b5f6e 100644
--- a/src/tiffvisitor.cpp
+++ b/src/tiffvisitor.cpp
@@ -243,7 +243,7 @@ namespace Exiv2 {
byte const* record = 0;
uint32_t sizeHdr = 0;
uint32_t sizeData = 0;
- if (0 != Photoshop::locateIptcIrb(pData, size,
+ if (0 != Photoshop::locateIptcIrb(pData, size,
&record, &sizeHdr, &sizeData)) {
return;
}
diff --git a/src/tiffvisitor.hpp b/src/tiffvisitor.hpp
index a23ede3..3dc1014 100644
--- a/src/tiffvisitor.hpp
+++ b/src/tiffvisitor.hpp
@@ -252,11 +252,11 @@ namespace Exiv2 {
//! Set an Exif tag in the image. Overwrites existing tags
void setExifTag(const ExifKey& key, const Value* pValue);
/*!
- @brief Get the data for a \em tag and \em group, either from the
- \em object provided, if it matches or from the matching element
+ @brief Get the data for a \em tag and \em group, either from the
+ \em object provided, if it matches or from the matching element
in the hierarchy.
- Populates \em pData and \em size with the result. If no matching
+ Populates \em pData and \em size with the result. If no matching
element is found the function leaves both of these parameters unchanged.
*/
void getObjData(byte const*& pData,
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list