[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=3de498a

The following commit has been merged in the master branch:
commit 3de498a4736415deee7a583c8084cd3ebad7f924
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sun May 21 10:12:18 2006 +0000

    Changed the default of the -b option to suppress large binary values, minor tweaks
---
 src/doxygen.hpp          | 2 +-
 src/exiv2.1              | 5 +++--
 src/exiv2.cpp            | 4 ++--
 src/exiv2.hpp            | 2 +-
 test/bugfixes-test.sh    | 6 +++---
 test/data/exiv2-test.out | 2 +-
 test/exiv2-test.sh       | 8 ++++----
 7 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/doxygen.hpp b/src/doxygen.hpp
index e59c5d3..6dc61fc 100644
--- a/src/doxygen.hpp
+++ b/src/doxygen.hpp
@@ -54,7 +54,7 @@
 
   - Jpeg
   - <A HREF="crw-mapping.html">Canon CRW</A>
-  - TIFF and related RAW formats (Canon CR2, Nikon NEF, Pentax PEF, Sony SR2), read-only
+  - TIFF and related RAW formats (Canon CR2, Nikon NEF, Pentax PEF, Sony SR2 and Minolta MRW), read-only
 
   @section supp Support
 
diff --git a/src/exiv2.1 b/src/exiv2.1
index 7db8467..b5356e6 100644
--- a/src/exiv2.1
+++ b/src/exiv2.1
@@ -31,7 +31,8 @@ exiv2 \- EXIF/IPTC metadata manipulation tool
 is a program to read and write EXIF/IPTC metadata. Supported image
 formats are JPEG, Canon CRW and Canon THM.  Read-only support is
 currently available for TIFF format and includes TIFF-based RAW
-formats such as Nikon NEF, Canon CR2, Sony SR2 and Pentax PEF.
+formats such as Nikon NEF, Canon CR2, Sony SR2, Pentax PEF and 
+Minolta MRW.
 .SH ACTIONS
 The 
Iaction
P argument is only required if it is not clear which
 action is implied.
@@ -81,7 +82,7 @@ Show the program version and exit.
 Be verbose during the program run.
 .TP
 .B \-b
-Don't show large binary values.
+Show large binary values (default is to suppress them).
 .TP
 .B \-u
 Don't show unknown tags.
diff --git a/src/exiv2.cpp b/src/exiv2.cpp
index 6615e2d..8b178b5 100644
--- a/src/exiv2.cpp
+++ b/src/exiv2.cpp
@@ -218,7 +218,7 @@ void Params::help(std::ostream& os) const
        << "   -h      Display this help and exit.
"
        << "   -V      Show the program version and exit.
"
        << "   -v      Be verbose during the program run.
"
-       << "   -b      Don't show large binary values.
"
+       << "   -b      Show large binary values.
"
        << "   -u      Don't show unknown tags.
"
        << "   -k      Preserve file timestamps (keep).
"
        << "   -t      Also set the file timestamp in 'rename' action (overrides -k).
"
@@ -278,7 +278,7 @@ int Params::option(int opt, const std::string& optarg, int optopt)
     case 'V': version_ = true; break;
     case 'v': verbose_ = true; break;
     case 'k': preserve_ = true; break;
-    case 'b': binary_ = true; break;
+    case 'b': binary_ = false; break;
     case 'u': unknown_ = true; break;
     case 'f': force_ = true; fileExistsPolicy_ = overwritePolicy; break;
     case 'F': force_ = true; fileExistsPolicy_ = renamePolicy; break;
diff --git a/src/exiv2.hpp b/src/exiv2.hpp
index 0716fd2..1d90e7c 100644
--- a/src/exiv2.hpp
+++ b/src/exiv2.hpp
@@ -182,7 +182,7 @@ private:
                version_(false),
                verbose_(false),
                force_(false),
-               binary_(false),
+               binary_(true),
                unknown_(false),
                preserve_(false),
                timestamp_(false),
diff --git a/test/bugfixes-test.sh b/test/bugfixes-test.sh
index 5cd7028..ded5662 100755
--- a/test/bugfixes-test.sh
+++ b/test/bugfixes-test.sh
@@ -35,7 +35,7 @@ $binpath/exiv2 -pi $filename
 
 num=443
 filename=`prep_file $num`
-$binpath/exiv2 -pt $filename
+$binpath/exiv2 -b -pt $filename
 
 num=444
 filename=`prep_file $num`
@@ -44,11 +44,11 @@ $binpath/exiv2 -pi $filename
 num=445
 filename=`prep_file $num`
 $binpath/exiv2 -v -M'set Exif.Photo.UserComment A comment' $filename
-$binpath/exiv2 -pt $filename
+$binpath/exiv2 -b -pt $filename
 filename=exiv2-empty.jpg
 cp -f ../data/$filename .
 $binpath/exiv2 -v -M'set Exif.Photo.UserComment A comment' $filename
-$binpath/exiv2 -pt $filename
+$binpath/exiv2 -b -pt $filename
 
 num=447 # Problem only visible in Valgrind
 filename=`prep_file $num`
diff --git a/test/data/exiv2-test.out b/test/data/exiv2-test.out
index 11407ef..6f3218d 100644
--- a/test/data/exiv2-test.out
+++ b/test/data/exiv2-test.out
@@ -47,7 +47,7 @@ Options:
    -h      Display this help and exit.
    -V      Show the program version and exit.
    -v      Be verbose during the program run.
-   -b      Don't show large binary values.
+   -b      Show large binary values.
    -u      Don't show unknown tags.
    -k      Preserve file timestamps (keep).
    -t      Also set the file timestamp in 'rename' action (overrides -k).
diff --git a/test/exiv2-test.sh b/test/exiv2-test.sh
index d61636c..0b92e62 100755
--- a/test/exiv2-test.sh
+++ b/test/exiv2-test.sh
@@ -79,15 +79,15 @@ $exiv2 -vf rename $images
 echo
 echo "Print --------------------------------------------------------------------"
 $exiv2 -v print $image2
-$exiv2 -v -pt print $image2
-$exiv2 -v -pt print $image2 > iii
+$exiv2 -v -b -pt print $image2
+$exiv2 -v -b -pt print $image2 > iii
 echo
 echo "Extract Exif data --------------------------------------------------------"
 $exiv2 -vf extract $image2
 echo
 echo "Extract Thumbnail --------------------------------------------------------"
 $exiv2 -vf -et extract $image2
-$exiv2 -v -pt print $image3 > jjj
+$exiv2 -v -b -pt print $image3 > jjj
 echo
 echo "Compare image data and extracted data ------------------------------------"
 diff iii jjj
@@ -102,7 +102,7 @@ $exiv2 -v print $image2
 echo
 echo "Insert Exif data ---------------------------------------------------------"
 $exiv2 -v insert $image2
-$exiv2 -v -pt print $image3 > kkk
+$exiv2 -v -b -pt print $image3 > kkk
 echo
 echo "Compare original and inserted image data ---------------------------------"
 diff iii kkk

-- 
exiv2 packaging