[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=ba8a824

The following commit has been merged in the master branch:
commit ba8a824c25ff98fd00ebce2b3fd1c3043e9a4f2e
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Fri May 28 02:17:37 2010 +0000

    Doc added to silence doxygen warnings.
---
 src/pentaxmn.hpp  | 1 +
 src/tiffimage.cpp | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/src/pentaxmn.hpp b/src/pentaxmn.hpp
index f9e4d18..01eab38 100644
--- a/src/pentaxmn.hpp
+++ b/src/pentaxmn.hpp
@@ -116,6 +116,7 @@ namespace Exiv2 {
 
 //! Shortcut for the printCombiTag template which requires typing the array name only once.
 #define EXV_PRINT_COMBITAG(array, count, ignoredcount) printCombiTag<EXV_COUNTOF(array), array, count, ignoredcount, ignoredcount>
+//! Shortcut for the printCombiTag template which requires typing the array name only once.
 #define EXV_PRINT_COMBITAG_MULTI(array, count, ignoredcount, ignoredcountmax) printCombiTag<EXV_COUNTOF(array), array, count, ignoredcount, ignoredcountmax>
 
 }                                       // namespace Exiv2
diff --git a/src/tiffimage.cpp b/src/tiffimage.cpp
index 8c8aa26..247f4a0 100644
--- a/src/tiffimage.cpp
+++ b/src/tiffimage.cpp
@@ -543,6 +543,7 @@ namespace Exiv2 {
         true,             // Concatenate gaps
         { 0, ttUnsignedByte,  1 }
     };
+    //! Nikon Flash Info binary array - definition 1
     extern const ArrayDef nikonFl1Def[] = {
         {  0, ttUndefined,     4 }, // Version
         {  4, ttUnsignedByte,  1 }, // FlashSource
@@ -566,6 +567,7 @@ namespace Exiv2 {
         true,             // Concatenate gaps
         { 0, ttUnsignedByte,  1 }
     };
+    //! Nikon Flash Info binary array - definition 2
     extern const ArrayDef nikonFl2Def[] = {
         {  0, ttUndefined,     4 }, // Version
         {  4, ttUnsignedByte,  1 }, // FlashSource

-- 
exiv2 packaging