[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:47:13 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=5664393
The following commit has been merged in the master branch:
commit 5664393767a95a813c469cf851538917ee064337
Author: Robin Mills <robin at clanmills.com>
Date: Wed Oct 19 14:57:18 2016 +0000
#1246 Fix submitted.
---
src/exiv2.1 | 76 +++++++++++++++++++++++++-----------------------
src/exiv2.cpp | 4 +++
test/data/exiv2-test.out | 3 ++
3 files changed, 46 insertions(+), 37 deletions(-)
diff --git a/src/exiv2.1 b/src/exiv2.1
index f78c9b3..19400e1 100644
--- a/src/exiv2.1
+++ b/src/exiv2.1
@@ -3,7 +3,7 @@
.\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1)
-.TH EXIV2 1 "Sep 23, 2016"
+.TH EXIV2 1 "Oct 19, 2016"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
@@ -36,35 +36,35 @@ the XMP specification and Metadata Working Group guidelines.
.br
The following image formats are supported:
.TS
-lB lB lB lB lB
-_ _ _ _ _
-l l l l l.
-Type Exif IPTC XMP Image comments
-JPEG Read/Write Read/Write Read/Write Read/Write
-EXV Read/Write Read/Write Read/Write Read/Write
-CR2 Read/Write Read/Write Read/Write -
-CRW Read/Write - - Read/Write
-MRW Read Read Read -
-TIFF Read/Write Read/Write Read/Write -
-WEBP Read/Write - Read/Write -
-DNG Read/Write Read/Write Read/Write -
-NEF Read/Write Read/Write Read/Write -
-PEF Read/Write Read/Write Read/Write -
-ARW Read Read Read -
-RW2 Read Read Read -
-SR2 Read Read Read -
-SRW Read/Write Read/Write Read/Write -
-ORF Read/Write Read/Write Read/Write -
-PNG Read/Write Read/Write Read/Write Read/Write
-PGF Read/Write Read/Write Read/Write Read/Write
-RAF Read Read Read -
-EPS - - Read/Write -
-XMP - - Read/Write -
-GIF - - - -
-PSD Read/Write Read/Write Read/Write -
-TGA - - - -
-BMP - - - -
-JP2 Read/Write Read/Write Read/Write -
+lB lB lB lB lB lB
+_ _ _ _ _ _
+l l l l l l.
+Type Exif IPTC XMP Image Comments ICC Profile
+JPEG Read/Write Read/Write Read/Write Read/Write Read/Write
+EXV Read/Write Read/Write Read/Write Read/Write Read/Write
+CR2 Read/Write Read/Write Read/Write - Read/Write
+CRW Read/Write - - Read/Write -
+MRW Read Read Read - -
+TIFF Read/Write Read/Write Read/Write - Read/Write
+WEBP Read/Write - Read/Write - Read/Write
+DNG Read/Write Read/Write Read/Write - Read/Write
+NEF Read/Write Read/Write Read/Write - Read/Write
+PEF Read/Write Read/Write Read/Write - Read/Write
+ARW Read Read Read - -
+RW2 Read Read Read - -
+SR2 Read Read Read - -
+SRW Read/Write Read/Write Read/Write - -
+ORF Read/Write Read/Write Read/Write - -
+PNG Read/Write Read/Write Read/Write Read/Write Read/Write
+PGF Read/Write Read/Write Read/Write Read/Write Read/Write
+RAF Read Read Read - -
+EPS - - Read/Write - -
+XMP - - Read/Write - -
+GIF - - - - -
+PSD Read/Write Read/Write Read/Write - -
+TGA - - - - -
+BMP - - - - -
+JP2 Read/Write Read/Write Read/Write - Read/Write
.TE
.IP \(bu 2
Support for GIF, TGA and BMP images is minimal: the image format is
@@ -144,7 +144,7 @@ option [arg] long option description
-h --help Display help and exit.
-i tgt --insert Insert target(s) for the 'insert' action. ...
-k --keep Preserve file timestamps when updating files
--K Key --key Report key. Similar to -g (grep) however key must match exactly.
+-K key --key Report key. Similar to -g (grep) however key must match exactly.
-l dir --location Location (directory) for files to be inserted or extracted.
-m file --modify read commands from cmd-file
-M cmd --Modify Command line for the 'modify' action. ...
@@ -176,8 +176,8 @@ fmt Default format is %Y%m%d_%H%M%S.
lvl d | i | i | w | e
debug, info, warning, error
-mod s | a | t | v | h | i | x | c | p | i | C | R | S | X
- summary, all, translated, vanilla, hex, iptc, xmp, comment, preview,
+mod s | a | e | t | v | h | i | x | c | p | i | C | R | S | X
+ summary, all, exif, translated, vanilla, hex, iptc, xmp, comment, preview,
ICC Profile, Recursive Structure, Simple Structure, raw XMP
tgt a | c | e | i | p | t | x | C | X | XX | -
@@ -302,6 +302,8 @@ s : print a summary of the Exif metadata (the default)
.br
a : print Exif, IPTC and XMP metadata (shortcut for \-Pkyct)
.br
+e : print Exif metadata (shortcut for \-PEkycv)
+.br
t : interpreted (translated) Exif tags (\-PEkyct)
.br
v : plain Exif tag values (\-PExgnycv)
@@ -316,13 +318,13 @@ c : JPEG comment
.br
p : list available image previews, sorted by preview image size in pixels
.br
-C : print image ICC Profile (jpg, png, tiff, webp, cr2 only)
+C : print image ICC Profile (jpg, png, tiff, webp, cr2, jp2 only)
.br
-R : print image structure recursively (jpg, png, tiff, webp, cr2 only)
+R : print image structure recursively (jpg, png, tiff, webp, cr2, jp2 only)
.br
-S : print image structure information (jpg, png, tiff, webp, cr2 only)
+S : print image structure information (jpg, png, tiff, webp, cr2, jp2 only)
.br
-X : print "raw" XMP (jpg, png, tiff, cr2, webp only)
+X : print "raw" XMP (jpg, png, tiff, webp, cr2, jp2 only)
.TP
.B \-P
Iflgs
P
Print flags for fine control of the tag list ('print' action). Allows
diff --git a/src/exiv2.cpp b/src/exiv2.cpp
index 239eaa5..e0f9cc3 100644
--- a/src/exiv2.cpp
+++ b/src/exiv2.cpp
@@ -302,6 +302,7 @@ void Params::help(std::ostream& os) const
<< _(" -p mode Print mode for the 'print' action. Possible modes are:
")
<< _(" s : print a summary of the Exif metadata (the default)
")
<< _(" a : print Exif, IPTC and XMP metadata (shortcut for -Pkyct)
")
+ << _(" e : print Exif metadata (shortcut for -PEkycv)
")
<< _(" t : interpreted (translated) Exif data (-PEkyct)
")
<< _(" v : plain Exif data values (-PExgnycv)
")
<< _(" h : hexdump of the Exif data (-PExgnycsh)
")
@@ -309,6 +310,8 @@ void Params::help(std::ostream& os) const
<< _(" x : XMP properties (-PXkyct)
")
<< _(" c : JPEG comment
")
<< _(" p : list available previews
")
+ << _(" C : print ICC profile embedded in image
")
+ << _(" R : recursive print structure of image
")
<< _(" S : print structure of image
")
<< _(" X : extract XMP from image
")
<< _(" -P flgs Print flags for fine control of tag lists ('print' action):
")
@@ -590,6 +593,7 @@ int Params::evalPrint(const std::string& optarg)
switch (optarg[0]) {
case 's': action_ = Action::print; printMode_ = pmSummary; break;
case 'a': rc = evalPrintFlags("kyct"); break;
+ case 'e': rc = evalPrintFlags("Ekycv"); break;
case 't': rc = evalPrintFlags("Ekyct"); break;
case 'v': rc = evalPrintFlags("Exgnycv"); break;
case 'h': rc = evalPrintFlags("Exgnycsh"); break;
diff --git a/test/data/exiv2-test.out b/test/data/exiv2-test.out
index 45116ac..231fffa 100644
--- a/test/data/exiv2-test.out
+++ b/test/data/exiv2-test.out
@@ -69,6 +69,7 @@ Options:
-p mode Print mode for the 'print' action. Possible modes are:
s : print a summary of the Exif metadata (the default)
a : print Exif, IPTC and XMP metadata (shortcut for -Pkyct)
+ e : print Exif metadata (shortcut for -PEkycv)
t : interpreted (translated) Exif data (-PEkyct)
v : plain Exif data values (-PExgnycv)
h : hexdump of the Exif data (-PExgnycsh)
@@ -76,6 +77,8 @@ Options:
x : XMP properties (-PXkyct)
c : JPEG comment
p : list available previews
+ C : print ICC profile embedded in image
+ R : recursive print structure of image
S : print structure of image
X : extract XMP from image
-P flgs Print flags for fine control of tag lists ('print' action):
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list