[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=079199b

The following commit has been merged in the master branch:
commit 079199b3eeb37fd65c9d76c617a4689b32b21a88
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Fri Apr 2 09:53:41 2004 +0000

    Added insert action
---
 src/exiv2.cpp | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/exiv2.cpp b/src/exiv2.cpp
index 2fb4789..2af6a26 100644
--- a/src/exiv2.cpp
+++ b/src/exiv2.cpp
@@ -22,13 +22,13 @@
   Abstract:  Command line program to display and manipulate image %Exif data
 
   File:      exiv2.cpp
-  Version:   $Name:  $ $Revision: 1.4 $
+  Version:   $Name:  $ $Revision: 1.5 $
   Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
   History:   10-Dec-03, ahu: created
  */
 // *****************************************************************************
 #include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.4 $ $RCSfile: exiv2.cpp,v $")
+EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.5 $ $RCSfile: exiv2.cpp,v $")
 
 // *****************************************************************************
 // included header files
@@ -122,7 +122,16 @@ void Params::usage(std::ostream& os) const
 void Params::help(std::ostream& os) const
 {
     usage(os);
-    os << "
Options:
"
+    os << "
Actions:
"
+       << "  adjust   Adjust the metadata timestamp by the given time. This action
"
+       << "           requires the option -a time.
"
+       << "  print    Print the Exif (or other) image metadata.
"
+       << "  delete   Delete the Exif section or Exif thumbnail from the files.
"
+       << "  extract  Extract the Exif data or Exif thumbnail to files.
"
+       << "  insert   Insert the Exif data from corresponding *.exv files.
"
+       << "  rename   Rename files according to the metadata create timestamp. The
"
+       << "           filename format can be set with the option -r format.
"
+       << "
Options:
"
        << "   -h      Display this help and exit.
"
        << "   -V      Show the program version and exit.
"
        << "   -v      Be extra verbose during the program run.
"
@@ -140,15 +149,7 @@ void Params::help(std::ostream& os) const
        << "           default) and `t' to extract only the Exif thumbnail.
"
        << "   -r fmt  Filename format for the `rename' action. The format string
"
        << "           follows strftime(3). Default filename format is " 
-       <<             format_ << ".
"
-       << "Actions:
"
-       << "  adjust   Adjust the metadata timestamp by the given time. This action
"
-       << "           requires the option -a time.
"
-       << "  print    Print the Exif (or other) image metadata.
"
-       << "  delete   Delete the Exif section or Exif thumbnail from the files.
"
-       << "  extract  Extract the Exif data or Exif thumbnail to files.
"
-       << "  rename   Rename files according to the metadata create timestamp. The
"
-       << "           filename format can be set with the option -r format.

";
+       <<             format_ << ".

";
 } // Params::help
 
 int Params::option(int opt, const std::string& optarg, int optopt)
@@ -229,6 +230,7 @@ int Params::nonoption(const std::string& argv)
         if (argv == "print") action_ = Action::print;
         if (argv == "delete") action_ = Action::erase;
         if (argv == "extract") action_ = Action::extract;
+        if (argv == "insert") action_ = Action::insert;
         if (argv == "rename") action_ = Action::rename;
         if (action_ == Action::none) {
             std::cerr << progname() << ": Unrecognized action `" 

-- 
exiv2 packaging