[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:46:31 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=c8a400e
The following commit has been merged in the master branch:
commit c8a400e1c586f83d0efc9419b81626dc45cf5229
Author: asp <alan.pater at gmail.com>
Date: Wed Jun 15 21:15:15 2016 +0000
#1190 Add crss XMP namespace and properties
---
doc/templates/Makefile | 1 +
doc/templates/__index2__ | 1 +
doc/templates/tags-xmp-crss.html.in | 27 +++++++++++++++++++++++++++
src/properties.cpp | 11 +++++++++++
src/xmp.cpp | 1 +
website/Makefile | 1 +
website/master/metadata.html.in | 1 +
website/master/tags-xmp-crss.html.in | 28 ++++++++++++++++++++++++++++
8 files changed, 71 insertions(+)
diff --git a/doc/templates/Makefile b/doc/templates/Makefile
index 037a19d..a7bd77b 100644
--- a/doc/templates/Makefile
+++ b/doc/templates/Makefile
@@ -126,6 +126,7 @@ SCHEMA = xmp_dc \
xmp_photoshop \
xmp_lr \
xmp_crs \
+ xmp_crss \
xmp_tiff \
xmp_exif \
xmp_exifEX \
diff --git a/doc/templates/__index2__ b/doc/templates/__index2__
index 8e810e1..1b98167 100644
--- a/doc/templates/__index2__
+++ b/doc/templates/__index2__
@@ -37,6 +37,7 @@
<li><a href="tags-xmp-pdf.html"><span>pdf</span></a></li>
<li><a href="tags-xmp-photoshop.html"><span>photoshop</span></a></li>
<li><a href="tags-xmp-crs.html"><span>crs</span></a></li>
+ <li><a href="tags-xmp-crss.html"><span>crss</span></a></li>
</ul>
<ul>
<li><a href="tags-xmp-tiff.html"><span>tiff</span></a></li>
diff --git a/doc/templates/tags-xmp-crss.html.in b/doc/templates/tags-xmp-crss.html.in
new file mode 100644
index 0000000..76f50c1
--- /dev/null
+++ b/doc/templates/tags-xmp-crss.html.in
@@ -0,0 +1,27 @@
+__doctype__
+<html>
+__header2__
+<body>
+
+<div id="content">
+__index1__
+__index2__
+
+<h2>Camera Raw Saved Settings</h2>
+<p>This schema specifies XMP properties used to store development settings for raw image files.
+ <ul>
+ <li>Exiv2 keys are nested in the form <b><code>Xmp.crss.SavedSettings[#]/crss:<Property>/crs:<Property></code></b></li>
+ <li>The schema namespace URI is <b><code>http://ns.adobe.com/camera-raw-saved-settings/1.0/</code></b></li>
+ <li>The preferred schema namespace prefix is <b><code>crss</code></b></li>
+ </ul>
+Reference: No official document on this schema was found. Properties derived from examples posted in Adobe forums.
+</p>
+<p>Click on a column header to sort the table.</p>
+
+__xmp_crss__
+
+</div>
+<!-- closes content -->
+
+</body>
+</html>
diff --git a/src/properties.cpp b/src/properties.cpp
index a4dadde..8f42013 100644
--- a/src/properties.cpp
+++ b/src/properties.cpp
@@ -85,6 +85,7 @@ namespace Exiv2 {
extern const XmpPropertyInfo xmpPdfInfo[];
extern const XmpPropertyInfo xmpPhotoshopInfo[];
extern const XmpPropertyInfo xmpCrsInfo[];
+ extern const XmpPropertyInfo xmpCrssInfo[];
extern const XmpPropertyInfo xmpTiffInfo[];
extern const XmpPropertyInfo xmpExifInfo[];
extern const XmpPropertyInfo xmpExifEXInfo[];
@@ -123,6 +124,7 @@ namespace Exiv2 {
{ "http://ns.adobe.com/pdf/1.3/", "pdf", xmpPdfInfo, N_("Adobe PDF schema") },
{ "http://ns.adobe.com/photoshop/1.0/", "photoshop", xmpPhotoshopInfo, N_("Adobe photoshop schema") },
{ "http://ns.adobe.com/camera-raw-settings/1.0/", "crs", xmpCrsInfo, N_("Camera Raw schema") },
+ { "http://ns.adobe.com/camera-raw-saved-settings/1.0/", "crss", xmpCrssInfo, N_("Camera Raw Saved Settings") },
{ "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") },
@@ -502,6 +504,15 @@ namespace Exiv2 {
{ 2, N_("cm") }
};
+ extern const XmpPropertyInfo xmpCrssInfo[] = {
+ { "SavedSettings", N_("Saved Settings"), "SavedSettings", xmpText, xmpInternal, N_("*Main structure* Camera Raw Saved Settings.") },
+ { "Name", N_("Name"), "Text", xmpText, xmpExternal, N_("Camera Raw Saved Settings Name.") },
+ { "Type", N_("Type"), "Text", xmpText, xmpExternal, N_("Camera Raw Saved Settings Type.") },
+ { "Parameters", N_("Parameters"), "Parameters", xmpText, xmpInternal, N_("*Main structure* Camera Raw Saved Settings Parameters.") },
+ // End of list marker
+ { 0, 0, 0, invalidTypeId, xmpInternal, 0 }
+ };
+
extern const XmpPropertyInfo xmpCrsInfo[] = {
{ "AutoBrightness", N_("Auto Brightness"), "Boolean", xmpText, xmpInternal, N_("When true, \"Brightness\" is automatically adjusted.") },
{ "AutoContrast", N_("Auto Contrast"), "Boolean", xmpText, xmpInternal, N_("When true, \"Contrast\" is automatically adjusted.") },
diff --git a/src/xmp.cpp b/src/xmp.cpp
index e09e87d..1a3e637 100644
--- a/src/xmp.cpp
+++ b/src/xmp.cpp
@@ -420,6 +420,7 @@ namespace Exiv2 {
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");
+ SXMPMeta::RegisterNamespace("http://ns.adobe.com/camera-raw-saved-settings/1.0/", "crss");
SXMPMeta::RegisterNamespace("http://www.audio/", "audio");
SXMPMeta::RegisterNamespace("http://www.video/", "video");
}
diff --git a/website/Makefile b/website/Makefile
index 3234cda..bfbc792 100644
--- a/website/Makefile
+++ b/website/Makefile
@@ -74,6 +74,7 @@ SCHEMA = dc \
pdf \
photoshop \
crs \
+ crss \
tiff \
exif \
exifEX \
diff --git a/website/master/metadata.html.in b/website/master/metadata.html.in
index 4dadf2f..e1eaa2c 100644
--- a/website/master/metadata.html.in
+++ b/website/master/metadata.html.in
@@ -25,6 +25,7 @@ __navbar__
<li><a href="tags-xmp-pdf.html">Adobe PDF schema (pdf)</a></li>
<li><a href="tags-xmp-photoshop.html">Photoshop schema (photoshop)</a></li>
<li><a href="tags-xmp-crs.html">Camera Raw schema (crs)</a></li>
+ <li><a href="tags-xmp-crs.html">Camera Raw Saved Settings schema (crss)</a></li>
<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>
diff --git a/website/master/tags-xmp-crss.html.in b/website/master/tags-xmp-crss.html.in
new file mode 100644
index 0000000..5597e1e
--- /dev/null
+++ b/website/master/tags-xmp-crss.html.in
@@ -0,0 +1,28 @@
+__doctype__
+<html lang="en">
+__header4__
+<body>
+__navbar__
+
+<div class="container">
+ <div class="page-header">
+ <h1>Metadata reference tables</h1>
+ </div>
+
+<div><h2>Camera Raw Saved Settings</h2></div>
+<p>This schema specifies XMP properties used to store development settings for raw image files.
+ <ul>
+ <li>Exiv2 keys are nested in the form <b><code>Xmp.crss.SavedSettings[#]/crss:<Property>/crs:<Property></code></b></li>
+ <li>The schema namespace URI is <b><code>http://ns.adobe.com/camera-raw-saved-settings/1.0/</code></b></li>
+ <li>The preferred schema namespace prefix is <b><code>crss</code></b></li>
+ </ul>
+Reference: No official document on this schema was found. Properties derived from examples posted in Adobe forums.
+</p>
+
+__xmp_crss__
+
+</div><!-- /.container -->
+__footer__
+__bootstrap__
+</body>
+</html>
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list