diff --git a/doc/templates/Makefile b/doc/templates/Makefile
index d9380f33..84813d37 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 bba8a0c3..3ba184a3 100644
--- a/doc/templates/tags-canon.html.in
+++ b/doc/templates/tags-canon.html.in
@@ -39,6 +39,11 @@ __CanonCf__
__CanonPi__
+Canon File Info Tags
+Click on a column header to sort the table.
+__CanonFi__
+
+
diff --git a/doc/templates/tags-nikon.html.in b/doc/templates/tags-nikon.html.in
index b4bb8bde..7a2b1c69 100644
--- a/doc/templates/tags-nikon.html.in
+++ b/doc/templates/tags-nikon.html.in
@@ -29,6 +29,103 @@ __Nikon2__
Click on a column header to sort the table.
__Nikon3__
+
+
+Nikon Vibration Reduction Tags
+Click on a column header to sort the table.
+__NikonVr__
+
+
+Nikon Picture Control Tags
+Click on a column header to sort the table.
+__NikonPc__
+
+
+Nikon World Time Tags
+Click on a column header to sort the table.
+__NikonWt__
+
+
+Nikon ISO Info Tags
+Click on a column header to sort the table.
+__NikonIi__
+
+
+Nikon Auto Focus Tags
+Click on a column header to sort the table.
+__NikonAf__
+
+
+Nikon Shot Info D80 Tags
+Click on a column header to sort the table.
+__NikonSiD80__
+
+
+Nikon Shot Info D40 Tags
+Click on a column header to sort the table.
+__NikonSiD40__
+
+
+Nikon Shot Info D300a Tags
+Click on a column header to sort the table.
+__NikonSiD300a__
+
+
+Nikon Shot Info D300b Tags
+Click on a column header to sort the table.
+__NikonSiD300b__
+
+
+Nikon Shot Info Tags
+Click on a column header to sort the table.
+__NikonSi01xx__
+
+
+Nikon Color Balance 1 Tags
+Click on a column header to sort the table.
+__NikonCb1__
+
+
+Nikon Color Balance 2 Tags
+Click on a column header to sort the table.
+__NikonCb2__
+
+
+Nikon Color Balance 2a Tags
+Click on a column header to sort the table.
+__NikonCb2a__
+
+
+Nikon Color Balance 2b Tags
+Click on a column header to sort the table.
+__NikonCb2b__
+
+
+Nikon Color Balance 3 Tags
+Click on a column header to sort the table.
+__NikonCb3__
+
+
+Nikon Color Balance 4 Tags
+Click on a column header to sort the table.
+__NikonCb4__
+
+
+Nikon Lens Data 1 Tags
+Click on a column header to sort the table.
+__NikonLd1__
+
+
+Nikon Lens Data 2 Tags
+Click on a column header to sort the table.
+__NikonLd2__
+
+
+Nikon Lens Data 3 Tags
+Click on a column header to sort the table.
+__NikonLd3__
+
+
diff --git a/src/basicio.cpp b/src/basicio.cpp
index 6d8e3f44..44e10ff1 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(); // (b) ? (a) : (b))
// *****************************************************************************