[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:04 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=058a44c
The following commit has been merged in the master branch:
commit 058a44c5d10e66bb65da4a0491f4b7c803d25f49
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Sun Feb 15 10:17:04 2004 +0000
Added functions to access thumbnail type and size
---
src/exif.hpp | 37 ++++++++++++++++++++++---------------
1 file changed, 22 insertions(+), 15 deletions(-)
diff --git a/src/exif.hpp b/src/exif.hpp
index fbbfb30..9d3b36c 100644
--- a/src/exif.hpp
+++ b/src/exif.hpp
@@ -21,7 +21,7 @@
/*!
@file exif.hpp
@brief Encoding and decoding of %Exif data
- @version $Name: $ $Revision: 1.20 $
+ @version $Name: $ $Revision: 1.21 $
@author Andreas Huggel (ahu)
<a href="mailto:ahuggel at gmx.net">ahuggel at gmx.net</a>
@date 09-Jan-04, ahu: created
@@ -264,11 +264,6 @@ namespace Exif {
*/
long copy(char* buf) const;
/*!
- @brief Return the size of the thumbnail data (data only, without the
- IFD, in case of a TIFF thumbnail.
- */
- long size() const;
- /*!
@brief Update the %Exif data according to the actual thumbnail image.
If the type of the thumbnail image is JPEG, JPEGInterchangeFormat is
@@ -289,6 +284,13 @@ namespace Exif {
offsets set by this method.
*/
void setOffsets(Ifd& ifd1, ByteOrder byteOrder) const;
+ /*!
+ @brief Return the size of the thumbnail data (data only, without the
+ IFD, in case of a TIFF thumbnail.
+ */
+ long size() const;
+ //! Return the type of the thumbnail
+ Type type() const { return type_; }
private:
@@ -395,15 +397,6 @@ namespace Exif {
*/
long copy(char* buf);
/*!
- @brief Return the approximate size of all %Exif data (TIFF header plus
- metadata). The number returned may be bigger than the actual
- size of the %Exif data, but it is never smaller. Only copy()
- returns the exact size.
- */
- long size() const;
- //! Returns the byte order as specified in the TIFF header
- ByteOrder byteOrder() const { return tiffHeader_.byteOrder(); }
- /*!
@brief Add all IFD entries in the range from iterator position begin
to iterator position end to the %Exif metadata. Checks for
duplicates: if a metadatum already exists, its value is
@@ -426,6 +419,16 @@ namespace Exif {
*/
void add(const Metadatum& metadatum);
+ /*!
+ @brief Return the approximate size of all %Exif data (TIFF header plus
+ metadata). The number returned may be bigger than the actual
+ size of the %Exif data, but it is never smaller. Only copy()
+ returns the exact size.
+ */
+ long size() const;
+ //! Returns the byte order as specified in the TIFF header
+ ByteOrder byteOrder() const { return tiffHeader_.byteOrder(); }
+
//! Metadata iterator type
typedef Metadata::iterator iterator;
//! Metadata const iterator type
@@ -458,6 +461,10 @@ namespace Exif {
*/
int writeThumbnail(const std::string& path) const
{ return thumbnail_.write(path); }
+ //! Return the type of the thumbnail
+ Thumbnail::Type thumbnailType() const { return thumbnail_.type(); }
+ //! Return the size of the thumbnail data
+ long thumbnailSize() const { return thumbnail_.size(); }
private:
// Return a pointer to the internal IFD identified by its IFD id
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list