[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:41:02 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=efa3152
The following commit has been merged in the master branch:
commit efa3152710c90e7230cdfd195ca0b4e22907826d
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Tue Dec 29 15:24:40 2009 +0000
Doc updates: added new Nikon and Canon makernote tags, silenced doxygen warnings.
---
doc/templates/Makefile | 50 ++++++++++++++++++---
doc/templates/tags-canon.html.in | 5 +++
doc/templates/tags-nikon.html.in | 97 ++++++++++++++++++++++++++++++++++++++++
src/basicio.cpp | 46 ++++++++++---------
src/types.hpp | 2 +
5 files changed, 172 insertions(+), 28 deletions(-)
diff --git a/doc/templates/Makefile b/doc/templates/Makefile
index d9380f3..84813d3 100644
--- a/doc/templates/Makefile
+++ b/doc/templates/Makefile
@@ -46,13 +46,51 @@
#
TABLES = Exif \
- Canon CanonCs CanonSi CanonCf CanonPi CanonPa \
+ Canon \
+ CanonCs \
+ CanonSi \
+ CanonCf \
+ CanonPi \
+ CanonFi \
+ CanonPa \
Fujifilm \
- Minolta MinoltaCsNew MinoltaCs5D MinoltaCs7D \
- Nikon1 Nikon2 Nikon3 \
- Olympus OlympusCs OlympusEq OlympusRd OlympusRd2 \
- OlympusIp OlympusFi OlympusFe1 OlympusRi \
- Panasonic PanasonicRaw \
+ Minolta \
+ MinoltaCsNew \
+ MinoltaCs5D \
+ MinoltaCs7D \
+ Nikon1 \
+ Nikon2 \
+ Nikon3 \
+ NikonVr \
+ NikonPc \
+ NikonWt \
+ NikonIi \
+ NikonAf \
+ NikonSiD80 \
+ NikonSiD40 \
+ NikonSiD300a \
+ NikonSiD300b \
+ NikonSi01xx \
+ NikonCb1 \
+ NikonCb2 \
+ NikonCb2a \
+ NikonCb2b \
+ NikonCb3 \
+ NikonCb4 \
+ NikonLd1 \
+ NikonLd2 \
+ NikonLd3 \
+ Olympus \
+ OlympusCs \
+ OlympusEq \
+ OlympusRd \
+ OlympusRd2 \
+ OlympusIp \
+ OlympusFi \
+ OlympusFe1 \
+ OlympusRi \
+ Panasonic \
+ PanasonicRaw \
Pentax \
Sigma \
Sony
diff --git a/doc/templates/tags-canon.html.in b/doc/templates/tags-canon.html.in
index bba8a0c..3ba184a 100644
--- a/doc/templates/tags-canon.html.in
+++ b/doc/templates/tags-canon.html.in
@@ -39,6 +39,11 @@ __CanonCf__
__CanonPi__
<br>
+<h3>Canon File Info Tags</h3>
+<p>Click on a column header to sort the table.</p>
+__CanonFi__
+<br>
+
</div>
<!-- closes content -->
diff --git a/doc/templates/tags-nikon.html.in b/doc/templates/tags-nikon.html.in
index b4bb8bd..7a2b1c6 100644
--- a/doc/templates/tags-nikon.html.in
+++ b/doc/templates/tags-nikon.html.in
@@ -29,6 +29,103 @@ __Nikon2__
<p>Click on a column header to sort the table.</p>
</div>
__Nikon3__
+<br>
+
+<h3>Nikon Vibration Reduction Tags</h3>
+<p>Click on a column header to sort the table.</p>
+__NikonVr__
+<br>
+
+<h3>Nikon Picture Control Tags</h3>
+<p>Click on a column header to sort the table.</p>
+__NikonPc__
+<br>
+
+<h3>Nikon World Time Tags</h3>
+<p>Click on a column header to sort the table.</p>
+__NikonWt__
+<br>
+
+<h3>Nikon ISO Info Tags</h3>
+<p>Click on a column header to sort the table.</p>
+__NikonIi__
+<br>
+
+<h3>Nikon Auto Focus Tags</h3>
+<p>Click on a column header to sort the table.</p>
+__NikonAf__
+<br>
+
+<h3>Nikon Shot Info D80 Tags</h3>
+<p>Click on a column header to sort the table.</p>
+__NikonSiD80__
+<br>
+
+<h3>Nikon Shot Info D40 Tags</h3>
+<p>Click on a column header to sort the table.</p>
+__NikonSiD40__
+<br>
+
+<h3>Nikon Shot Info D300a Tags</h3>
+<p>Click on a column header to sort the table.</p>
+__NikonSiD300a__
+<br>
+
+<h3>Nikon Shot Info D300b Tags</h3>
+<p>Click on a column header to sort the table.</p>
+__NikonSiD300b__
+<br>
+
+<h3>Nikon Shot Info Tags</h3>
+<p>Click on a column header to sort the table.</p>
+__NikonSi01xx__
+<br>
+
+<h3>Nikon Color Balance 1 Tags</h3>
+<p>Click on a column header to sort the table.</p>
+__NikonCb1__
+<br>
+
+<h3>Nikon Color Balance 2 Tags</h3>
+<p>Click on a column header to sort the table.</p>
+__NikonCb2__
+<br>
+
+<h3>Nikon Color Balance 2a Tags</h3>
+<p>Click on a column header to sort the table.</p>
+__NikonCb2a__
+<br>
+
+<h3>Nikon Color Balance 2b Tags</h3>
+<p>Click on a column header to sort the table.</p>
+__NikonCb2b__
+<br>
+
+<h3>Nikon Color Balance 3 Tags</h3>
+<p>Click on a column header to sort the table.</p>
+__NikonCb3__
+<br>
+
+<h3>Nikon Color Balance 4 Tags</h3>
+<p>Click on a column header to sort the table.</p>
+__NikonCb4__
+<br>
+
+<h3>Nikon Lens Data 1 Tags</h3>
+<p>Click on a column header to sort the table.</p>
+__NikonLd1__
+<br>
+
+<h3>Nikon Lens Data 2 Tags</h3>
+<p>Click on a column header to sort the table.</p>
+__NikonLd2__
+<br>
+
+<h3>Nikon Lens Data 3 Tags</h3>
+<p>Click on a column header to sort the table.</p>
+__NikonLd3__
+<br>
+
</div>
<!-- closes content -->
diff --git a/src/basicio.cpp b/src/basicio.cpp
index 6d8e3f4..44e10ff 100644
--- a/src/basicio.cpp
+++ b/src/basicio.cpp
@@ -88,35 +88,37 @@ namespace Exiv2 {
//! Constructor accepting a unicode path in an std::wstring
Impl(const std::wstring& wpath);
#endif
- // Enumeration
+ // Enumerations
+ //! Mode of operation
enum OpMode { opRead, opWrite, opSeek };
#ifdef EXV_UNICODE_PATH
+ //! Used to indicate if the path is stored as a standard or unicode string
enum WpMode { wpStandard, wpUnicode };
#endif
// DATA
- std::string path_;
+ std::string path_; //!< (Standard) path
#ifdef EXV_UNICODE_PATH
- std::wstring wpath_;
- WpMode wpMode_;
+ std::wstring wpath_; //!< Unicode path
+ WpMode wpMode_; //!< Indicates which path is in use
#endif
- std::string openMode_;
- FILE *fp_;
- OpMode opMode_;
+ std::string openMode_; //!< File open mode
+ FILE *fp_; //!< File stream pointer
+ OpMode opMode_; //!< File open mode
#if defined WIN32 && !defined __CYGWIN__
- HANDLE hFile_; // Duplicated fd
- HANDLE hMap_; // Handle from CreateFileMapping
+ HANDLE hFile_; //!< Duplicated fd
+ HANDLE hMap_; //!< Handle from CreateFileMapping
#endif
- byte* pMappedArea_;
- size_t mappedLength_;
+ byte* pMappedArea_; //!< Pointer to the memory-mapped area
+ size_t mappedLength_; //!< Size of the memory-mapped area
bool isMalloced_; //!< Is the mapped area allocated?
bool isWriteable_; //!< Can the mapped area be written to?
// TYPES
//! Simple struct stat wrapper for internal use
struct StructStat {
StructStat() : st_mode(0), st_size(0) {}
- mode_t st_mode; //!< Permissions
- off_t st_size; //!< Size
+ mode_t st_mode; //!< Permissions
+ off_t st_size; //!< Size
};
// METHODS
@@ -712,24 +714,24 @@ namespace Exiv2 {
//! Internal Pimpl structure of class MemIo.
class MemIo::Impl {
public:
- Impl(); //<! Default constructor
- Impl(const byte* data, long size); //<! Constructor 2
+ Impl(); //!< Default constructor
+ Impl(const byte* data, long size); //!< Constructor 2
// DATA
- byte* data_;
- long idx_;
- long size_;
+ byte* data_; //!< Pointer to the start of the memory area
+ long idx_; //!< Index into the memory area
+ long size_; //!< Size of the memory area
long sizeAlloced_; //!< Size of the allocated buffer
bool isMalloced_; //!< Was the buffer allocated?
- bool eof_;
+ bool eof_; //!< EOF indicator
// METHODS
- void reserve(long wcount);
+ void reserve(long wcount); //!< Reserve memory
private:
// NOT IMPLEMENTED
- Impl(const Impl& rhs); //!< Copy constructor
- Impl& operator=(const Impl& rhs); //!< Assignment
+ Impl(const Impl& rhs); //!< Copy constructor
+ Impl& operator=(const Impl& rhs); //!< Assignment
}; // class MemIo::Impl
diff --git a/src/types.hpp b/src/types.hpp
index 3e1575c..6a7a6d8 100644
--- a/src/types.hpp
+++ b/src/types.hpp
@@ -74,7 +74,9 @@ typedef __int32 int32_t;
#define EXV_CALL_MEMBER_FN(object,ptrToMember) ((object).*(ptrToMember))
// Simple min and max macros
+//! Simple common min macro
#define EXV_MIN(a,b) ((a) < (b) ? (a) : (b))
+//! Simple common max macro
#define EXV_MAX(a,b) ((a) > (b) ? (a) : (b))
// *****************************************************************************
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list