[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:44:54 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=6897087
The following commit has been merged in the master branch:
commit 68970872799520d839e0f5b3e277136cbf25951f
Author: Robin Mills <robin at clanmills.com>
Date: Wed Mar 11 10:55:05 2015 +0000
#1039. Thank You, Torsten for raising this matter. Thank You, Phil for your help with this.
---
src/exiv2.1 | 63 ++++++++++++++++++++++++++++++++++++++++++-----------------
src/types.cpp | 43 ++++++++++++++++++++++++++++------------
2 files changed, 76 insertions(+), 30 deletions(-)
diff --git a/src/exiv2.1 b/src/exiv2.1
index 14be208..2a066cf 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 "Jan 10, 2015"
+.TH EXIV2 1 "Mar 11, 2015"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
@@ -25,7 +25,7 @@ exiv2 \- Image metadata manipulation tool
.SH DESCRIPTION
.PP
.\" TeX users may be more comfortable with the
B<whatever>
P and
-.\"
I<whatever>
P escape sequences to invode bold face and italics,
+.\"
I<whatever>
P escape sequences to invode bold face and italics,
.\" respectively.
.B exiv2
is a program to read and write Exif, IPTC and XMP image metadata and
@@ -76,7 +76,7 @@ Print image metadata. This is the default action, i.e., the command
Iexiv2 image.jpg
P will print a summary of the image Exif metadata.
.TP
.B ex | extract
-Extract metadata to *.exv, XMP sidecar (*.xmp) and thumbnail image files.
+Extract metadata to *.exv, XMP sidecar (*.xmp) and thumbnail image files.
Modification commands can be applied on-the-fly.
.TP
.B in | insert
@@ -161,10 +161,10 @@ regex use key for a substring match. You can determine the availability of rege
using the command: exiv2 -v -V -g have_regex
.nf
-exiv2 \-g Date \-pt R.jpg
+exiv2 \-g Date \-pt R.jpg
Exif.Image.DateTime Ascii 20 2012:08:07 16:01:05
Exif.Photo.DateTimeOriginal Ascii 20 2011:09:18 16:25:48
-Exif.Photo.DateTimeDigitized Ascii 20 2011:09:18 16:25:48
+Exif.Photo.DateTimeDigitized Ascii 20 2011:09:18 16:25:48
.fi
.TP
@@ -192,12 +192,12 @@ environment variable for this option to work correctly.
Do not prompt before overwriting existing files (force overwrite).
.TP
.B \-F
-Do not prompt before renaming files (Force rename). Appends '_1'
+Do not prompt before renaming files (Force rename). Appends '_1'
('_2', ...) to the name of the new file.
.TP
.B \-a
Itime
P
Time adjustment in the format [\-]HH[:MM[:SS]]. This option is only
-used with the 'adjust' action. Examples: 1 adds one hour, 1:01
+used with the 'adjust' action. Examples: 1 adds one hour, 1:01
adds one hour and one minute, \-0:00:30 subtracts 30 seconds.
.TP
.B \-Y
Iyrs
P
@@ -219,7 +219,7 @@ s : print a summary of the Exif metadata (the default)
.br
a : print Exif, IPTC and XMP metadata (shortcut for \-Pkyct)
.br
-t : interpreted (translated) Exif tags (\-PEkyct)
+t : interpreted (translated) Exif tags (\-PEkyct)
.br
v : plain Exif tag values (\-PExgnycv)
.br
@@ -291,11 +291,11 @@ file. Possible are Exif, IPTC and XMP and the default is all of
these. Note that the inserted XMP properties include those converted
to Exif and IPTC.
.br
-Only JPEG thumbnails can be inserted (not TIFF thumbnails), they need to
+Only JPEG thumbnails can be inserted (not TIFF thumbnails), they need to
be named
Ifile
P\-thumb.jpg.
.TP
.B \-e
Itgt
P
-Extract target(s) for the 'extract' action. Possible targets are the same
+Extract target(s) for the 'extract' action. Possible targets are the same
as those for the
B\-d
P option, plus a target to extract preview
images and a modifier to generate an XMP sidecar file:
.br
@@ -342,7 +342,7 @@ Location (directory) for files to be inserted or extracted.
.B \-S
I.suf
P
Use suffix
I.suf
P for source files in 'insert' action.
.SH COMMANDS
-Commands for the 'modify' action can be read from a command file, e.g.,
+Commands for the 'modify' action can be read from a command file, e.g.,
.sp 1
.nf
exiv2 \-m cmd.txt image.jpg
@@ -356,13 +356,13 @@ or given on the command line, as in
.sp 1
Note the quotes. Multiple
B\-m
P and
B\-M
P options can be combined.
.sp 1
-When writing Exif, IPTC and XMP metadata,
-.B exiv2
+When writing Exif, IPTC and XMP metadata,
+.B exiv2
enforces only a correct
metadata structure. It is possible to write tags with types and values
different from those specified in the standards, duplicate Exif tags,
-undefined tags, or incomplete metadata. While
-.B exiv2
+undefined tags, or incomplete metadata. While
+.B exiv2
is able to read
all metadata that it can write, other programs may have difficulties
with images that contain non standard-conforming metadata.
@@ -413,7 +413,7 @@ specification at the beginning:
.sp 1
.B [charset=Ascii|Jis|Unicode|Undefined ]
Icomment
P
.sp 1
-.B Undefined
+.B Undefined
is used by default if the value doesn't start with a charset
definition.
.sp 1
@@ -423,6 +423,33 @@ refers to local hour, minute and seconds and +|\-HH:MM refers to hours
and minutes ahead or behind Universal Coordinated Time (+|\- means
either a + or a \- sign is required).
.sp 1
+The format for
BRational
P (and
BSRational
P) is one of:
+.br
+ integer
+.br
+ integer-numerator,integer-denominator
+.br
+ Fnumber
+.br
+ fnumber
+.sp 1
+Examples:
+.br
+ exiv2 "-Mset Exif.Photo.MaxApertureValue 557429/62500" X.jpg
+.br
+ exiv2 "-Mset Exif.Photo.MaxApertureValue F5.6" X.jpg
+.sp 1
+The format Fnumber is for the convenience of setting aperture values.
+The aperture value stored in Exif is an
BAPEX
P number which can be evaluated by the expression::
+.br
+ apex-value = 2 * log(Fnumber) / log(2)
+.br
+ Fnumber = exp(log(2.0) * apex-value / 2
+.sp 1
+The Fnumber syntax is valid for any
BRational
P, even when the key is not an Aperture.
+.br
+More information about
BAPEX
P is available from: http://en.wikipedia.org/wiki/APEX_system
+.sp 1
The format of XMP
BLangAlt
P values includes an optional language
qualifier:
.sp 1
@@ -465,7 +492,7 @@ exiv2 \-ep1,2 image.jpg
Extracts previews 1 and 2 from the image to the files image\-preview1.jpg
and image\-preview2.jpg.
.TP
-exiv2 \-eiX image.jpg
+exiv2 \-eiX image.jpg
Extracts IPTC datasets into an XMP sidecar file image.xmp and in the
process converts them to "IPTC Core" XMP schema.
.TP
@@ -507,7 +534,7 @@ Sample command files.
.I http://www.exiv2.org/metadata.html
Taglists with
Ikey
P and default
Itype
P values.
.SH AUTHORS
-.B exiv2
+.B exiv2
was written by Andreas Huggel <ahuggel at gmx.net>.
.PP
This manual page was originally written by KELEMEN Peter <fuji at debian.org>,
diff --git a/src/types.cpp b/src/types.cpp
index c5a7015..ce8e47a 100644
--- a/src/types.cpp
+++ b/src/types.cpp
@@ -49,6 +49,7 @@ EXIV2_RCSID("@(#) $Id$")
#include <cstdlib>
#include <cassert>
#include <cstring>
+#include <cmath>
// *****************************************************************************
namespace {
@@ -186,12 +187,21 @@ namespace Exiv2 {
std::istream& operator>>(std::istream& is, Rational& r)
{
- int32_t nominator;
- int32_t denominator;
- char c('
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list