[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=7d8becc

The following commit has been merged in the master branch:
commit 7d8becc8e5bf9710398864b3e11eaf87f727f6cb
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat Dec 10 08:51:07 2011 +0000

    Added -Q option to the utility, set the default log level for LogMsg to "warn", converted debug message about write strategy to an EXV_INFO log message.
---
 src/error.cpp            |  4 ++--
 src/error.hpp            |  2 +-
 src/exiv2.1              |  5 +++++
 src/exiv2.cpp            | 21 +++++++++++++++++++++
 src/exiv2app.hpp         |  3 ++-
 src/tiffimage.cpp        |  8 ++++----
 test/data/exiv2-test.out |  1 +
 7 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/src/error.cpp b/src/error.cpp
index d6db58e..5c5fc2d 100644
--- a/src/error.cpp
+++ b/src/error.cpp
@@ -114,14 +114,14 @@ namespace {
 // class member definitions
 namespace Exiv2 {
 
-    LogMsg::Level LogMsg::level_ = LogMsg::info; // Default output level
+    LogMsg::Level LogMsg::level_ = LogMsg::warn; // Default output level
     LogMsg::Handler LogMsg::handler_ = LogMsg::defaultHandler;
 
     void LogMsg::defaultHandler(int level, const char* s)
     {
         switch (static_cast<LogMsg::Level>(level)) {
         case LogMsg::debug: std::cerr << "Debug: "; break;
-        case LogMsg::info:  break;
+        case LogMsg::info:  std::cerr << "Info: "; break;
         case LogMsg::warn:  std::cerr << "Warning: "; break;
         case LogMsg::error: std::cerr << "Error: "; break;
         case LogMsg::mute:  assert(false);
diff --git a/src/error.hpp b/src/error.hpp
index 2f02b13..084bca2 100644
--- a/src/error.hpp
+++ b/src/error.hpp
@@ -110,7 +110,7 @@ namespace Exiv2 {
         /*!
           @brief Set the log level. Only log messages with a level greater or
                  equal \em level are sent to the log message handler. Default
-                 log level is 
-- 
exiv2 packaging