[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:25 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=2f4c337
The following commit has been merged in the master branch:
commit 2f4c337ad6a6998c8c092035b5613492edfb61ad
Author: nkbj <nkbj1970 at hotmail.com>
Date: Sun Nov 16 03:23:09 2014 +0000
Update various lists to match ExifTool version 9.76.
---
src/nikonmn.cpp | 3 +++
src/olympusmn.cpp | 20 +++++++++++++-------
src/pentaxmn.cpp | 1 +
src/samsungmn.cpp | 34 +++++++++++++++++-----------------
4 files changed, 34 insertions(+), 24 deletions(-)
diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp
index 74fbafb..722963d 100644
--- a/src/nikonmn.cpp
+++ b/src/nikonmn.cpp
@@ -1987,6 +1987,7 @@ fmountlens[] = {
{0xA3,0x3C,0x29,0x44,0x30,0x30,0xA5,0x0E,0x01,0x00,0x00, "Nikon", "JAA806DA", "AF-S Nikkor 16-35mm f/4G ED VR"},
{0xA4,0x54,0x37,0x37,0x0C,0x0C,0xA6,0x06,0x01,0x00,0x00, "Nikon", "JAA131DA", "AF-S Nikkor 24mm f/1.4G ED"},
{0xA5,0x40,0x3C,0x8E,0x2C,0x3C,0xA7,0x0E,0x01,0x00,0x00, "Nikon", "JAA808DA", "AF-S Nikkor 28-300mm f/3.5-5.6G ED VR"},
+{0xA5,0x4C,0x44,0x44,0x14,0x14,0xC0,0x06,0x01,0x00,0x00, "Nikon", "", "AF-S Nikkor 35mm f/1.8G"},
{0xA6,0x48,0x8E,0x8E,0x24,0x24,0xA8,0x0E,0x13,0x00,0x00, "Nikon", "JAA339DA", "AF-S Nikkor 300mm f/2.8G IF-ED VR II"},
{0xA7,0x4B,0x62,0x62,0x2C,0x2C,0xA9,0x0E,0x41,0x00,0x00, "Nikon", "JAA637DA", "AF-S DX Micro Nikkor 85mm f/3.5G ED VR"},
{0xA8,0x48,0x80,0x98,0x30,0x30,0xAA,0x0E,0x03,0x00,0x00, "Nikon", "JAA809DA", "AF-S Zoom-Nikkor 200-400mm f/4G IF-ED VR II"},
@@ -2363,7 +2364,9 @@ fmountlens[] = {
// Lenses, that were upgraded with custom CPU
//
{0x00,0x47,0x10,0x10,0x24,0x24,0x00,0x00,0x00,0x00,0x00, "Nikon", "JAA604AC", "Fisheye Nikkor 8mm f/2.8 AiS"},
+{0x00,0x47,0x3C,0x3C,0x24,0x24,0x00,0x00,0x00,0x00,0x00, "Nikon", "", "Nikkor 28mm f/2.8 AiS"},
{0x00,0x54,0x44,0x44,0x0C,0x0C,0x00,0x00,0x00,0x00,0x00, "Nikon", "JAA115AD", "Nikkor 35mm f/1.4 AiS"},
+{0x00,0x57,0x50,0x50,0x14,0x14,0x00,0x00,0x00,0x00,0x00, "Nikon", "", "Nikkor 50mm f/1.8 AI"},
{0x00,0x48,0x50,0x50,0x18,0x18,0x00,0x00,0x00,0x00,0x00, "Nikon", "", "Nikkor H 50mm f/2"},
{0x00,0x48,0x68,0x68,0x24,0x24,0x00,0x00,0x00,0x00,0x00, "Nikon", "JAA304AA", "Series E 100mm f/2.8"},
{0x00,0x4C,0x6A,0x6A,0x20,0x20,0x00,0x00,0x00,0x00,0x00, "Nikon", "JAA305AA", "Nikkor 105mm f/2.5 AiS"},
diff --git a/src/olympusmn.cpp b/src/olympusmn.cpp
index ad2a6c2..9c0af98 100644
--- a/src/olympusmn.cpp
+++ b/src/olympusmn.cpp
@@ -563,22 +563,28 @@ namespace Exiv2 {
//! WhiteBalance, tag 0x0500
extern const TagDetails olympusWhiteBalance[] = {
{ 0, N_("Auto") },
+ { 1, N_("Auto (Keep Warm Color Off") },
{ 16, N_("7500K (Fine Weather with Shade)") },
{ 17, N_("6000K (Cloudy)") },
{ 18, N_("5300K (Fine Weather)") },
{ 20, N_("3000K (Tungsten light)") },
{ 21, N_("3600K (Tungsten light-like)") },
+ { 22, N_("Auto Setup") },
+ { 23, N_("5500K (Flash)") },
{ 33, N_("6600K (Daylight fluorescent)") },
{ 34, N_("4500K (Neutral white fluorescent)") },
{ 35, N_("4000K (Cool white fluorescent)") },
+ { 36, N_("White Fluorescent") },
{ 48, N_("3600K (Tungsten light-like)") },
- { 256, N_("Custom WB 1") },
- { 257, N_("Custom WB 2") },
- { 258, N_("Custom WB 3") },
- { 259, N_("Custom WB 4") },
- { 512, N_("Custom WB 5400K") },
- { 513, N_("Custom WB 2900K") },
- { 514, N_("Custom WB 8000K") }
+ { 67, N_("Underwater") },
+ { 256, N_("One Touch WB 1") },
+ { 257, N_("One Touch WB 2") },
+ { 258, N_("One Touch WB 3") },
+ { 259, N_("One Touch WB 4") },
+ { 512, N_("Custom WB 1") },
+ { 513, N_("Custom WB 2") },
+ { 514, N_("Custom WB 3") },
+ { 515, N_("Custom WB 4") }
};
//! ModifiedSaturation, tag 0x0504
diff --git a/src/pentaxmn.cpp b/src/pentaxmn.cpp
index 0ab0f45..2ae95a9 100644
--- a/src/pentaxmn.cpp
+++ b/src/pentaxmn.cpp
@@ -187,6 +187,7 @@ namespace Exiv2 {
{ 0x13006, N_("WG-20") },
{ 0x13010, N_("645Z") },
{ 0x1301a, N_("K-S1") },
+ { 0x1302e, N_("Q-S1") },
};
//! Quality, tag 0x0008
diff --git a/src/samsungmn.cpp b/src/samsungmn.cpp
index ea9e13d..afc5be4 100644
--- a/src/samsungmn.cpp
+++ b/src/samsungmn.cpp
@@ -50,23 +50,23 @@ namespace Exiv2 {
//! LensType, tag 0xa003
extern const TagDetails samsung2LensType[] = {
- { 0, N_("Built-in") },
- { 1, N_("Samsung NX 30mm F2 Pancake") },
- { 2, N_("Samsung NX 18-55mm F3.5-5.6 OIS") },
- { 3, N_("Samsung NX 50-200mm F4-5.6 ED OIS") },
- { 4, N_("Samsung NX 20-50mm F3.5-5.6 ED") },
- { 6, N_("Samsung NX 18-200mm F3.5-6.3 ED OIS") },
- { 5, N_("Samsung NX 20mm F2.8 Pancake") },
- { 7, N_("Samsung NX 60mm F2.8 Macro ED OIS SSA") },
- { 8, N_("Samsung NX 16mm F2.4 Pancake") },
- { 9, N_("Samsung NX 85mm F1.4 ED SSA") },
- { 10, N_("Samsung NX 45mm F1.8") },
- { 11, N_("Samsung NX 45mm F1.8 2D/3D") },
- { 12, N_("Samsung NX 12-24mm F4-5.6 ED") },
- { 13, N_("Saumsun NX 16-50mm F2-2.8 S ED OIS") },
- { 14, N_("Samsung NX 10mm F3.5 Fisheye") },
- { 15, N_("Samsung NX 16-50mm F3.5-5.6 PZ ED OIS") },
- { 20, N_("Samsung NX 50-150mm F2.8 S ED OIS") }
+ { 0, N_("Built-in") },
+ { 1, N_("Samsung NX 30mm F2 Pancake") },
+ { 2, N_("Samsung NX 18-55mm F3.5-5.6 OIS") },
+ { 3, N_("Samsung NX 50-200mm F4-5.6 ED OIS") },
+ { 4, N_("Samsung NX 20-50mm F3.5-5.6 ED") },
+ { 6, N_("Samsung NX 18-200mm F3.5-6.3 ED OIS") },
+ { 5, N_("Samsung NX 20mm F2.8 Pancake") },
+ { 7, N_("Samsung NX 60mm F2.8 Macro ED OIS SSA") },
+ { 8, N_("Samsung NX 16mm F2.4 Pancake") },
+ { 9, N_("Samsung NX 85mm F1.4 ED SSA") },
+ { 10, N_("Samsung NX 45mm F1.8") },
+ { 11, N_("Samsung NX 45mm F1.8 2D/3D") },
+ { 12, N_("Samsung NX 12-24mm F4-5.6 ED") },
+ { 13, N_("Saumsun NX 16-50mm F2-2.8 S ED OIS") },
+ { 14, N_("Samsung NX 10mm F3.5 Fisheye") },
+ { 15, N_("Samsung NX 16-50mm F3.5-5.6 Power Zoom ED OIS") },
+ { 20, N_("Samsung NX 50-150mm F2.8 S ED OIS") }
};
//! ColorSpace, tag 0xa011
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list