[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:43:00 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=cc4ab82
The following commit has been merged in the master branch:
commit cc4ab82acef6c741f17229983b8b4823956b63f8
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Fri Apr 13 14:08:56 2012 +0000
Added comments to silence doxygen warnings.
---
src/image.hpp | 12 ++++++------
src/makernote_int.hpp | 10 ++++++++++
src/minoltamn_int.hpp | 3 +++
src/properties.hpp | 2 +-
src/samsungmn.cpp | 3 +++
src/tiffimage.cpp | 7 +++++--
6 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/src/image.hpp b/src/image.hpp
index 7fcf641..e62f83a 100644
--- a/src/image.hpp
+++ b/src/image.hpp
@@ -60,12 +60,12 @@ namespace Exiv2 {
//! Native preview information. This is meant to be used only by the PreviewManager.
struct NativePreview {
- long position_;
- uint32_t size_;
- uint32_t width_;
- uint32_t height_;
- std::string filter_;
- std::string mimeType_;
+ long position_; //!< Position
+ uint32_t size_; //!< Size
+ uint32_t width_; //!< Width
+ uint32_t height_; //!< Height
+ std::string filter_; //!< Filter
+ std::string mimeType_; //!< MIME type
};
//! List of native previews. This is meant to be used only by the PreviewManager.
diff --git a/src/makernote_int.hpp b/src/makernote_int.hpp
index cc69f30..74420e3 100644
--- a/src/makernote_int.hpp
+++ b/src/makernote_int.hpp
@@ -190,6 +190,7 @@ namespace Exiv2 {
virtual uint32_t write(IoWrapper& ioWrapper, ByteOrder byteOrder) const;
virtual uint32_t ifdOffset() const;
//@}
+ //! Return the size of the makernote header signature
static uint32_t sizeOfSignature();
private:
@@ -221,6 +222,7 @@ namespace Exiv2 {
virtual uint32_t ifdOffset() const;
virtual uint32_t baseOffset(uint32_t mnOffset) const;
//@}
+ //! Return the size of the makernote header signature
static uint32_t sizeOfSignature();
private:
@@ -254,6 +256,7 @@ namespace Exiv2 {
virtual ByteOrder byteOrder() const;
virtual uint32_t baseOffset(uint32_t mnOffset) const;
//@}
+ //! Return the size of the makernote header signature
static uint32_t sizeOfSignature();
private:
@@ -286,6 +289,7 @@ namespace Exiv2 {
virtual uint32_t write(IoWrapper& ioWrapper, ByteOrder byteOrder) const;
virtual uint32_t ifdOffset() const;
//@}
+ //! Return the size of the makernote header signature
static uint32_t sizeOfSignature();
private:
@@ -320,6 +324,7 @@ namespace Exiv2 {
virtual ByteOrder byteOrder() const;
virtual uint32_t baseOffset(uint32_t mnOffset) const;
//@}
+ //! Return the size of the makernote header signature
static uint32_t sizeOfSignature();
private:
@@ -352,6 +357,7 @@ namespace Exiv2 {
virtual uint32_t write(IoWrapper& ioWrapper, ByteOrder byteOrder) const;
virtual uint32_t ifdOffset() const;
//@}
+ //! Return the size of the makernote header signature
static uint32_t sizeOfSignature();
private:
@@ -384,6 +390,7 @@ namespace Exiv2 {
virtual uint32_t ifdOffset() const;
virtual uint32_t baseOffset(uint32_t mnOffset) const;
//@}
+ //! Return the size of the makernote header signature
static uint32_t sizeOfSignature();
private:
@@ -414,6 +421,7 @@ namespace Exiv2 {
virtual uint32_t write(IoWrapper& ioWrapper, ByteOrder byteOrder) const;
virtual uint32_t ifdOffset() const;
//@}
+ //! Return the size of the makernote header signature
static uint32_t sizeOfSignature();
private:
@@ -467,6 +475,7 @@ namespace Exiv2 {
virtual uint32_t write(IoWrapper& ioWrapper, ByteOrder byteOrder) const;
virtual uint32_t ifdOffset() const;
//@}
+ //! Return the size of the makernote header signature
static uint32_t sizeOfSignature();
private:
@@ -499,6 +508,7 @@ namespace Exiv2 {
virtual uint32_t write(IoWrapper& ioWrapper, ByteOrder byteOrder) const;
virtual uint32_t ifdOffset() const;
//@}
+ //! Return the size of the makernote header signature
static uint32_t sizeOfSignature();
private:
diff --git a/src/minoltamn_int.hpp b/src/minoltamn_int.hpp
index 793b3ee..4aba375 100644
--- a/src/minoltamn_int.hpp
+++ b/src/minoltamn_int.hpp
@@ -152,6 +152,9 @@ namespace Exiv2 {
//! Print Minolta/Sony ZoneMatching values to readable labels.
std::ostream& printMinoltaSonyZoneMatching(std::ostream&, const Value&, const ExifData*);
+ //! Print Minolta/Sony FlashExposureComp values to readable labels.
+ std::ostream& printMinoltaSonyFlashExposureComp(std::ostream&, const Value&, const ExifData*);
+
// TODO: Added shared methods here.
}} // namespace Internal, Exiv2
diff --git a/src/properties.hpp b/src/properties.hpp
index 7a29db7..5aeb267 100644
--- a/src/properties.hpp
+++ b/src/properties.hpp
@@ -222,7 +222,7 @@ namespace Exiv2 {
static const XmpNsInfo* lookupNsRegistry(const XmpNsInfo::Prefix& prefix);
// DATA
- static NsRegistry nsRegistry_; //! Namespace registry
+ static NsRegistry nsRegistry_; //!< Namespace registry
}; // class XmpProperties
diff --git a/src/samsungmn.cpp b/src/samsungmn.cpp
index 2e6143b..1a555d3 100644
--- a/src/samsungmn.cpp
+++ b/src/samsungmn.cpp
@@ -72,6 +72,7 @@ namespace Exiv2 {
{ 1, N_("On") }
};
+ //! Print the camera temperature
std::ostream& printCameraTemperature(std::ostream& os, const Value& value, const ExifData*)
{
if (value.count() != 1 || value.typeId() != signedRational) {
@@ -80,6 +81,7 @@ namespace Exiv2 {
return os << value.toFloat() << " C";
}
+ //! Print the 35mm focal length
std::ostream& printFocalLength35(std::ostream& os, const Value& value, const ExifData*)
{
if (value.count() != 1 || value.typeId() != unsignedLong) {
@@ -155,6 +157,7 @@ namespace Exiv2 {
{ 11, N_("Custom3") }
};
+ //! Print the tag value minus 4
std::ostream& printValueMinus4(std::ostream& os, const Value& value, const ExifData*)
{
if (value.count() != 1 || value.typeId() != unsignedShort) {
diff --git a/src/tiffimage.cpp b/src/tiffimage.cpp
index e057125..f2d1cc0 100644
--- a/src/tiffimage.cpp
+++ b/src/tiffimage.cpp
@@ -85,12 +85,15 @@ namespace Exiv2 {
{
} // TiffImage::TiffImage
+ //! Structure for TIFF compression to MIME type mappings
struct MimeTypeList {
+ //! Comparison operator for compression
bool operator==(int compression) const { return compression_ == compression; }
- int compression_;
- const char* mimeType_;
+ int compression_; //!< TIFF compression
+ const char* mimeType_; //!< MIME type
};
+ //! List of TIFF compression to MIME type mappings
MimeTypeList mimeTypeList[] = {
{ 32770, "image/x-samsung-srw" },
{ 34713, "image/x-nikon-nef" },
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list