[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:45:36 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=3ec3708
The following commit has been merged in the master branch:
commit 3ec3708f943e72878f1565f9f7a4020aab4e204e
Author: asp <alan.pater at gmail.com>
Date: Wed Aug 5 17:39:12 2015 +0000
#1093 ExifEX for XMP namespace and properties
---
doc/templates/Makefile | 1 +
doc/templates/__index2__ | 1 +
doc/templates/tags-xmp-exifEX.html.in | 27 +++++++++++++++++++++++++++
src/doxygen.hpp.in | 1 +
src/properties.cpp | 33 +++++++++++++++++++++++++++++++++
src/xmp.cpp | 1 +
website/Makefile | 1 +
website/master/metadata.html.in | 1 +
website/master/tags-xmp-exifEX.html.in | 29 +++++++++++++++++++++++++++++
website/var/__sidebar4__ | 1 +
10 files changed, 96 insertions(+)
diff --git a/doc/templates/Makefile b/doc/templates/Makefile
index 129b28c..66cc447 100644
--- a/doc/templates/Makefile
+++ b/doc/templates/Makefile
@@ -126,6 +126,7 @@ SCHEMA = xmp_dc \
xmp_crs \
xmp_tiff \
xmp_exif \
+ xmp_exifEX \
xmp_aux \
xmp_iptc \
xmp_MicrosoftPhoto \
diff --git a/doc/templates/__index2__ b/doc/templates/__index2__
index 7511383..3f63493 100644
--- a/doc/templates/__index2__
+++ b/doc/templates/__index2__
@@ -40,6 +40,7 @@
<ul>
<li><a href="tags-xmp-tiff.html"><span>tiff</span></a></li>
<li><a href="tags-xmp-exif.html"><span>exif</span></a></li>
+ <li><a href="tags-xmp-exifEX.html"><span>exifEX</span></a></li>
<li><a href="tags-xmp-aux.html"><span>aux</span></a></li>
</ul>
<ul>
diff --git a/doc/templates/tags-xmp-exifEX.html.in b/doc/templates/tags-xmp-exifEX.html.in
new file mode 100644
index 0000000..67764d4
--- /dev/null
+++ b/doc/templates/tags-xmp-exifEX.html.in
@@ -0,0 +1,27 @@
+__doctype__
+<html>
+__header2__
+<body>
+
+<div id="content">
+__index1__
+__index2__
+
+<h2>Exif 2.3 metadata for XMP Properties</h2>
+<p>The following table lists additional XMP properties defined solely by Exif.</p>
+ <ul>
+ <li>Exiv2 keys are <b><code>Xmp.exifEX.<Property></code></b>
+ <li>The schema namespace URI is <b><code>http://cipa.jp/exif/1.0/</code></b></li>
+ <li>The preferred schema namespace prefix is <b><code>exifEX</code></b></li>
+ </ul>
+Reference: <a href="http://www.cipa.jp/std/documents/e/DC-010-2012_E.pdf" title="Exif 2.3 metadata for XMP">Exif 2.3 metadata for XMP</a>
+</p>
+<p>Click on a column header to sort the table.</p>
+
+__xmp_exifEX__
+
+</div>
+<!-- closes content -->
+
+</body>
+</html>
diff --git a/src/doxygen.hpp.in b/src/doxygen.hpp.in
index dac8ef1..8e2871c 100644
--- a/src/doxygen.hpp.in
+++ b/src/doxygen.hpp.in
@@ -69,6 +69,7 @@
- <a href="tags-xmp-crs.html">crs schema</a>
- <a href="tags-xmp-tiff.html">tiff schema</a>
- <a href="tags-xmp-exif.html">exif schema</a>
+ - <a href="tags-xmp-exifEX.html">exifEX schema</a>
- <a href="tags-xmp-aux.html">aux schema</a>
- <a href="tags-xmp-iptc.html">Iptc4xmpCore schema</a>
- <a href="tags-xmp-iptcExt.html">Iptc4xmpExt schema</a>
diff --git a/src/properties.cpp b/src/properties.cpp
index 7f9ddf4..285f869 100644
--- a/src/properties.cpp
+++ b/src/properties.cpp
@@ -86,6 +86,7 @@ namespace Exiv2 {
extern const XmpPropertyInfo xmpCrsInfo[];
extern const XmpPropertyInfo xmpTiffInfo[];
extern const XmpPropertyInfo xmpExifInfo[];
+ extern const XmpPropertyInfo xmpExifEXInfo[];
extern const XmpPropertyInfo xmpAuxInfo[];
extern const XmpPropertyInfo xmpIptcInfo[];
extern const XmpPropertyInfo xmpIptcExtInfo[];
@@ -123,6 +124,7 @@ namespace Exiv2 {
{ "http://ns.adobe.com/camera-raw-settings/1.0/", "crs", xmpCrsInfo, N_("Camera Raw schema") },
{ "http://ns.adobe.com/tiff/1.0/", "tiff", xmpTiffInfo, N_("Exif Schema for TIFF Properties") },
{ "http://ns.adobe.com/exif/1.0/", "exif", xmpExifInfo, N_("Exif schema for Exif-specific Properties") },
+ { "http://cipa.jp/exif/1.0/", "exifEX", xmpExifEXInfo, N_("Exif 2.3 metadata for XMP") },
{ "http://ns.adobe.com/exif/1.0/aux/", "aux", xmpAuxInfo, N_("Exif schema for Additional Exif Properties")},
{ "http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/", "iptc", xmpIptcInfo, N_("IPTC Core schema") }, // NOTE: 'Iptc4xmpCore' is just too long, so make 'iptc'
{ "http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/", "Iptc4xmpCore", xmpIptcInfo, N_("IPTC Core schema") }, // the default prefix. But provide the official one too.
@@ -654,6 +656,37 @@ namespace Exiv2 {
{ 0, 0, 0, invalidTypeId, xmpInternal, 0 }
};
+ extern const XmpPropertyInfo xmpExifEXInfo[] = {
+ { "Gamma", N_("Gamma"), "Rational", xmpText, xmpInternal, N_("EXIF tag 42240, 0xA500. Indicates the value of coefficient gamma.") },
+ { "PhotographicSensitivity", N_("Photographic Sensitivity"), "Integer", xmpText, xmpInternal, N_("EXIF tag 34855, 0x8827. Indicates the sensitivity of the camera or input device when the image was shot up to the value of 65535 with one of the following parameters that are defined in ISO 12232: standard output sensitivity (SOS), recommended exposure index (REI), or ISO speed.") },
+ { "SensitivityType", N_("Sensitivity Type"), "Closed Choice of Integer", xmpText, xmpInternal, N_("EXIF tag 34864, 0x8830. Indicates which one of the parameters of ISO12232 is used for PhotographicSensitivity:0 = Unknown "
+ "1 = Standard output sensitivity (SOS) "
+ "2 = Recommended exposure index (REI) "
+ "3 = ISO speed "
+ "4 = Standard output sensitivity (SOS) and recommended exposure index (REI) "
+ "5 = Standard output sensitivity (SOS) and ISO speed "
+ "6 = Recommended exposure index (REI) and ISO speed "
+ "7 = Standard output sensitivity (SOS) and recommended exposure index (REI) and ISO speed") },
+ { "StandardOutput-Sensitivity", N_("Standard Output Sensitivity"), "Integer", xmpText, xmpInternal, N_("EXIF tag 34865, 0x8831. Indicates the standard output sensitivity value of a camera or input device defined in ISO 12232.") },
+ { "RecommendedExposureIndex" N_("Recommended Exposure Index"), "Integer", xmpText, xmpInternal, N_("EXIF tag 34866, 0x8832. Indicates the recommended exposure index value of a camera or input device defined in ISO 12232.") },
+ { "ISOSpeed", N_("ISO Speed"), "Integer", xmpText, xmpInternal, N_("EXIF tag 34867, 0x8833. Indicates the ISO speed value of a camera or input device defined in ISO 12232.") },
+ { "ISOSpeedLatitudeyyy", N_("ISO Speed Latitude yyy"), "Integer", xmpText, xmpInternal, N_("EXIF tag 34868, 0x8834. Indicates the ISO speed latitude yyy value of a camera or input device defined in ISO 12232.") },
+ { "ISOSpeedLatitudezzz", N_("ISO Speed Latitude zzz"), "Integer", xmpText, xmpInternal, N_("EXIF tag 34869, 0x8835. Indicates the ISO speed latitude zzz value of a camera or input device defined in ISO 12232.") },
+ { "CameraOwnerName", N_("Camera Owner Name"), "Proper-Name", xmpText, xmpInternal, N_("EXIF tag 42032, 0xA430. This tag records the owner of a camera used in photography as an ASCII string.") },
+ { "BodySerialNumber", N_("Body Serial Number"), "Text", xmpText, xmpInternal, N_("EXIF tag 42033, 0xA431. The serial number of the camera or camera body used to take the photograph.") },
+ { "LensSpecification", N_("Lens Specification"), "Ordered array of Rational", xmpText, xmpInternal, N_("EXIF tag 42034, 0xA432. notes minimum focal length, maximum focal length, minimum F number in the minimum focal length, and minimum F number in the maximum focal length, which are specification information for the lens that was used in photography.") },
+ { "LensMake", N_("Lens Make"), "Proper-Name", xmpText, xmpInternal, N_("EXIF tag 42035, 0xA433. Records the lens manufacturer as an ASCII string.") },
+ { "LensModel", N_("Lens Model"), "Text", xmpText, xmpInternal, N_("EXIF tag 42036, 0xA434. Records the lens’s model name and model number as an ASCII string.") },
+ { "LensSerialNumber", N_("Lens Serial Number"), "Text", xmpText, xmpInternal, N_("EXIF tag 42037, 0xA435. This tag records the serial number of the interchangeable lens that was used in photography as an ASCII string.") },
+
+ { "InteroperabilityIndex", N_("Interoperability Index"), "Closed Choice of Text", xmpText, xmpInternal, N_("EXIF tag 1, 0x0001. Indicates the identification of the Interoperability rule. "
+ "R98 = Indicates a file conforming to R98 file specification of Recommended Exif Interoperability Rules (Exif R 98) or to DCF basic file stipulated by Design Rule for Camera File System (DCF). "
+ "THM = Indicates a file conforming to DCF thumbnail file stipulated by Design rule for Camera File System. "
+ "R03 = Indicates a file conforming to DCF Option File stipulated by Design rule for Camera File System.") },
+ // End of list marker
+ { 0, 0, 0, invalidTypeId, xmpInternal, 0 }
+ };
+
extern const XmpPropertyInfo xmpAuxInfo[] = {
{ "Lens", N_("Lens"), "Text", xmpText, xmpInternal, N_("A description of the lens used to take the photograph. For example, \"70-200 mm f/2.8-4.0\".") },
{ "SerialNumber", N_("Serial Number"), "Text", xmpText, xmpInternal, N_("The serial number of the camera or camera body used to take the photograph.") },
diff --git a/src/xmp.cpp b/src/xmp.cpp
index ebd6397..1faa7f6 100644
--- a/src/xmp.cpp
+++ b/src/xmp.cpp
@@ -419,6 +419,7 @@ namespace Exiv2 {
SXMPMeta::RegisterNamespace("http://www.metadataworkinggroup.com/schemas/regions/", "mwg-rs");
SXMPMeta::RegisterNamespace("http://www.metadataworkinggroup.com/schemas/keywords/", "mwg-kw");
SXMPMeta::RegisterNamespace("http://ns.adobe.com/xmp/sType/Area#", "stArea");
+ SXMPMeta::RegisterNamespace("http://cipa.jp/exif/1.0/", "exifEX");
#else
initialized_ = true;
diff --git a/website/Makefile b/website/Makefile
index f2e50b3..7f37ae7 100644
--- a/website/Makefile
+++ b/website/Makefile
@@ -75,6 +75,7 @@ SCHEMA = dc \
crs \
tiff \
exif \
+ exifEX \
aux \
iptc \
iptcExt \
diff --git a/website/master/metadata.html.in b/website/master/metadata.html.in
index 880ce2b..37364f0 100644
--- a/website/master/metadata.html.in
+++ b/website/master/metadata.html.in
@@ -43,6 +43,7 @@ __maintitle__
<li><a href="tags-xmp-tiff.html">Exif schema for TIFF Properties (tiff)</a></li>
<li><a href="tags-xmp-exif.html">Exif schema for Exif-specific Properties (exif)</a></li>
+ <li><a href="tags-xmp-exifEX.html">Exif 2.3 metadata for XMP Properties (exif)</a></li>
<li><a href="tags-xmp-aux.html">Exif schema for Additional Exif Properties (aux)</a></li>
<li><a href="tags-xmp-iptc.html">IPTC Core schema (Iptc4xmpCore)</a></li>
diff --git a/website/master/tags-xmp-exifEX.html.in b/website/master/tags-xmp-exifEX.html.in
new file mode 100644
index 0000000..bb055f2
--- /dev/null
+++ b/website/master/tags-xmp-exifEX.html.in
@@ -0,0 +1,29 @@
+__doctype__
+<html>
+__header2__
+<body>
+__sidebar4__
+
+<div id="content">
+__maintitle__
+
+<h2>Exif 2.3 metadata for XMP Properties</h2>
+<p>The following table lists additional XMP properties defined solely by Exif.</p>
+ <ul>
+ <li>Exiv2 keys are <b><code>Xmp.exifEX.<Property></code></b>
+ <li>The schema namespace URI is <b><code>http://cipa.jp/exif/1.0/</code></b></li>
+ <li>The preferred schema namespace prefix is <b><code>exifEX</code></b></li>
+ </ul>
+Reference: <a href="http://www.cipa.jp/std/documents/e/DC-010-2012_E.pdf" title="Exif 2.3 metadata for XMP">Exif 2.3 metadata for XMP</a>
+</p>
+<p>Click on a column header to sort the table.</p>
+
+__xmp_exifEX__
+
+__footer__
+</div>
+<!-- closes content -->
+
+__tracker__
+</body>
+</html>
diff --git a/website/var/__sidebar4__ b/website/var/__sidebar4__
index 014dd6d..56b9d77 100644
--- a/website/var/__sidebar4__
+++ b/website/var/__sidebar4__
@@ -22,6 +22,7 @@
<li><a href="tags-xmp-tiff.html"><strong>tiff</strong></a></li>
<li><a href="tags-xmp-exif.html"><strong>exif</strong></a></li>
+ <li><a href="tags-xmp-exifEX.html"><strong>exifEX</strong></a></li>
<li><a href="tags-xmp-aux.html"><strong>aux</strong></a></li>
<li><a href="tags-xmp-iptc.html"><strong>Iptc4xmpCore</strong></a></li>
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list