[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:17 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=e2f05aa
The following commit has been merged in the master branch:
commit e2f05aa19e75991a2e34494502282eb02779cdeb
Author: nkbj <nkbj1970 at hotmail.com>
Date: Fri Mar 4 17:24:19 2016 +0000
Update various lists to match ExifTool version 10.12.
---
src/canonmn.cpp | 12 +++++++++++-
src/nikonmn.cpp | 1 +
src/pentaxmn.cpp | 3 +++
src/sonymn.cpp | 3 ++-
test/data/bugfixes-test.out | Bin 1857523 -> 1857519 bytes
test/data/exiv2-test.out | 40 ++++++++++++++++++++--------------------
6 files changed, 37 insertions(+), 22 deletions(-)
diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index f7b5ffe..224de2b 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -287,7 +287,14 @@ namespace Exiv2 {
{ (long int)0x3910000, "PowerShot SX410 HS" },
{ (long int)0x3930000, "PowerShot G9 X" },
{ (long int)0x3950000, "PowerShot G5 X" },
+ { (long int)0x3970000, "PowerShot G7 X Mark II" },
+ { (long int)0x3990000, "PowerShot ELPH 360 HS / IXUS 285 HS / IXY 650" },
+ { (long int)0x4010000, "PowerShot SX540 HS" },
+ { (long int)0x4020000, "PowerShot SX420 IS" },
+ { (long int)0x4030000, "PowerShot ELPH 190 IS / IXUS 180 / IXY 190" },
{ (long int)0x4040000, "PowerShot G1" },
+ { (long int)0x4040001, "IXY 180" },
+ { (long int)0x4050000, "PowerShot SX720 HS" },
{ (long int)0x6040000, "PowerShot S100 / Digital IXUS / IXY Digital" },
{ (long int)0x4007d673, "DC19/DC21/DC22" },
{ (long int)0x4007d674, "XH A1" },
@@ -363,6 +370,7 @@ namespace Exiv2 {
{ (long int)0x80000327, "EOS Rebel T5 / 1200D / Kiss X70" },
{ (long int)0x80000328, "EOS-1D X MARK II" },
{ (long int)0x80000331, "EOS M" },
+ { (long int)0x80000350, "EOS 80D" },
{ (long int)0x80000355, "EOS M2" },
{ (long int)0x80000346, "EOS Rebel SL1 / 100D / Kiss X7" },
{ (long int)0x80000347, "EOS Rebel T6s / 760D / 8000D" },
@@ -945,7 +953,9 @@ namespace Exiv2 {
{ 4152,"Canon EF 24-105mm f/3.5-5.6 IS STM" },
{ 4153,"Canon EF-M 15-45mm f/3.5-6.3 IS STM" },
{ 4154,"Canon EF-S 24mm f/2.8 STM" },
- { 4156,"Canon EF 50mm f/1.8 STM" }
+ { 4156,"Canon EF 50mm f/1.8 STM" },
+ {36912,"Canon EF-S 18-135mm f/3.5-5.6 IS USM" },
+ {65535,"n/a" }
};
//! A lens id and a pretty-print function for special treatment of the id.
diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp
index e70cbcd..dca364d 100644
--- a/src/nikonmn.cpp
+++ b/src/nikonmn.cpp
@@ -2023,6 +2023,7 @@ fmountlens[] = {
{0xAB,0x3C,0xA0,0xA0,0x30,0x30,0xC6,0x4E,0x01,0x00,0x02, "Nikon", "JAA533DA", "AF-S Nikkor 500mm f/4E FL ED VR"},
{0xAC,0x3C,0xA6,0xA6,0x30,0x30,0xC7,0x4E,0x01,0x00,0x02, "Nikon", "JAA534DA", "AF-S Nikkor 600mm f/4E FL ED VR"},
{0xAD,0x48,0x28,0x60,0x24,0x30,0xC8,0x4E,0x01,0x00,0x02, "Nikon", "JAA825DA", "AF-S DX Nikkor 16-80mm 2.8-4.0E ED VR"},
+{0xAD,0x48,0x28,0x60,0x24,0x30,0xC8,0x0E,0x01,0x00,0x02, "Nikon", "JAA825DA", "AF-S DX Nikkor 16-80mm 2.8-4.0E ED VR"},
{0xAE,0x3C,0x80,0xA0,0x3C,0x3C,0xC9,0x4E,0x01,0x00,0x02, "Nikon", "JAA822DA", "AF-S Nikkor 200-500mm f/5.6E ED VR"},
{0xAE,0x3C,0x80,0xA0,0x3C,0x3C,0xC9,0x0E,0x01,0x00,0x02, "Nikon", "JAA822DA", "AF-S Nikkor 200-500mm f/5.6E ED VR"},
{0xAF,0x4C,0x37,0x37,0x14,0x14,0xCC,0x06,0x01,0x00,0x02, "Nikon", "JAA139DA", "AF-S Nikkor 24mm f/1.8G ED"},
diff --git a/src/pentaxmn.cpp b/src/pentaxmn.cpp
index 544a47a..92dfb82 100644
--- a/src/pentaxmn.cpp
+++ b/src/pentaxmn.cpp
@@ -195,6 +195,7 @@ namespace Exiv2 {
{ 0x13056, "WG-30" },
{ 0x1307e, "WG-30W" },
{ 0x13088, "WG-5 GPS" },
+ { 0x13092, "K-1" },
{ 0x1309c, "K-3 II" },
};
@@ -919,7 +920,9 @@ namespace Exiv2 {
{ 0x0822, "Sigma 18-300mm F3.5-6.3 DC Macro HSM" },
{ 0x083b, "HD PENTAX-D FA 150-450mm F4.5-5.6 ED DC AW" },
{ 0x083c, "HD PENTAX-D FA* 70-200mm F2.8 ED DC AW" },
+ { 0x083d, "HD PENTAX-D FA 28-105mm F3.5-5.6 ED DC WR" },
{ 0x083e, "HD PENTAX-D FA 24-70mm F2.8 ED SDM WR" },
+ { 0x083f, "HD PENTAX-D FA 15-30mm F2.8 ED SDM WR" },
{ 0x08c6, "smc PENTAX-DA L 18-50mm F4-5.6 DC WR RE" },
{ 0x08c7, "HD PENTAX-DA 18-50mm F4-5.6 DC WR RE" },
{ 0x08c8, "HD PENTAX-DA 16-85mm F3.5-5.6 ED DC WR" },
diff --git a/src/sonymn.cpp b/src/sonymn.cpp
index e0f1c26..c14ab35 100644
--- a/src/sonymn.cpp
+++ b/src/sonymn.cpp
@@ -125,7 +125,8 @@ namespace Exiv2 {
{ 344, "DSC-RX1RM2" },
{ 346, "ILCE-QX1" },
{ 347, "ILCE-7RM2" },
- { 350, "ILCE-7SM2" }
+ { 350, "ILCE-7SM2" },
+ { 357, "ILCE-6300" }
};
//! Lookup table to translate Sony dynamic range optimizer values to readable labels
diff --git a/test/data/bugfixes-test.out b/test/data/bugfixes-test.out
index 602ecc1..3ab4673 100644
Binary files a/test/data/bugfixes-test.out and b/test/data/bugfixes-test.out differ
diff --git a/test/data/exiv2-test.out b/test/data/exiv2-test.out
index 584fdb4..619a5fc 100644
--- a/test/data/exiv2-test.out
+++ b/test/data/exiv2-test.out
@@ -655,7 +655,7 @@ File 2/15: 20031214_000043.jpg
20031214_000043.jpg Exif.CanonCs.AFPoint Short 1 Center
20031214_000043.jpg Exif.CanonCs.ExposureProgram Short 1 Program (P)
20031214_000043.jpg Exif.CanonCs.0x0015 Short 1 65535
-20031214_000043.jpg Exif.CanonCs.LensType Short 1 (65535)
+20031214_000043.jpg Exif.CanonCs.LensType Short 1 n/a
20031214_000043.jpg Exif.CanonCs.Lens Short 3 7.1 - 21.3 mm
20031214_000043.jpg Exif.CanonCs.MaxAperture Short 1 F5
20031214_000043.jpg Exif.CanonCs.MinAperture Short 1 F8
@@ -1073,7 +1073,7 @@ File 6/15: 20030925_201850.jpg
20030925_201850.jpg Exif.CanonCs.AFPoint Short 1 Manual AF point selection
20030925_201850.jpg Exif.CanonCs.ExposureProgram Short 1 Program (P)
20030925_201850.jpg Exif.CanonCs.0x0015 Short 1 32767
-20030925_201850.jpg Exif.CanonCs.LensType Short 1 (65535)
+20030925_201850.jpg Exif.CanonCs.LensType Short 1 n/a
20030925_201850.jpg Exif.CanonCs.Lens Short 3 18.0 - 55.0 mm
20030925_201850.jpg Exif.CanonCs.MaxAperture Short 1 F3.6
20030925_201850.jpg Exif.CanonCs.MinAperture Short 1 F22
@@ -1666,7 +1666,7 @@ Warning: Directory Canon has an unexpected next pointer; ignored.
20060802_095200.jpg Exif.CanonCs.AFPoint Short 1 (0)
20060802_095200.jpg Exif.CanonCs.ExposureProgram Short 1 Program (P)
20060802_095200.jpg Exif.CanonCs.0x0015 Short 1 65535
-20060802_095200.jpg Exif.CanonCs.LensType Short 1 (65535)
+20060802_095200.jpg Exif.CanonCs.LensType Short 1 n/a
20060802_095200.jpg Exif.CanonCs.Lens Short 3 28.0 - 135.0 mm
20060802_095200.jpg Exif.CanonCs.MaxAperture Short 1 65535
20060802_095200.jpg Exif.CanonCs.MinAperture Short 1 65535
@@ -2017,7 +2017,7 @@ File 15/15: 20060127_225027.jpg
20060127_225027.jpg Exif.CanonCs.AFPoint Short 1 Auto AF point selection
20060127_225027.jpg Exif.CanonCs.ExposureProgram Short 1 Easy shooting (Auto)
20060127_225027.jpg Exif.CanonCs.0x0015 Short 1 32767
-20060127_225027.jpg Exif.CanonCs.LensType Short 1 (65535)
+20060127_225027.jpg Exif.CanonCs.LensType Short 1 n/a
20060127_225027.jpg Exif.CanonCs.Lens Short 3 5.8 - 23.2 mm
20060127_225027.jpg Exif.CanonCs.MaxAperture Short 1 F2.7
20060127_225027.jpg Exif.CanonCs.MinAperture Short 1 F8
@@ -2268,7 +2268,7 @@ Compare image data and extracted data ------------------------------------
< 20031214_000043.jpg Exif.CanonCs.AFPoint Short 1 Center
< 20031214_000043.jpg Exif.CanonCs.ExposureProgram Short 1 Program (P)
< 20031214_000043.jpg Exif.CanonCs.0x0015 Short 1 65535
-< 20031214_000043.jpg Exif.CanonCs.LensType Short 1 (65535)
+< 20031214_000043.jpg Exif.CanonCs.LensType Short 1 n/a
< 20031214_000043.jpg Exif.CanonCs.Lens Short 3 7.1 - 21.3 mm
< 20031214_000043.jpg Exif.CanonCs.MaxAperture Short 1 F5
< 20031214_000043.jpg Exif.CanonCs.MinAperture Short 1 F8
@@ -2686,7 +2686,7 @@ Compare image data and extracted data ------------------------------------
< 20030925_201850.jpg Exif.CanonCs.AFPoint Short 1 Manual AF point selection
< 20030925_201850.jpg Exif.CanonCs.ExposureProgram Short 1 Program (P)
< 20030925_201850.jpg Exif.CanonCs.0x0015 Short 1 32767
-< 20030925_201850.jpg Exif.CanonCs.LensType Short 1 (65535)
+< 20030925_201850.jpg Exif.CanonCs.LensType Short 1 n/a
< 20030925_201850.jpg Exif.CanonCs.Lens Short 3 18.0 - 55.0 mm
< 20030925_201850.jpg Exif.CanonCs.MaxAperture Short 1 F3.6
< 20030925_201850.jpg Exif.CanonCs.MinAperture Short 1 F22
@@ -3278,7 +3278,7 @@ Compare image data and extracted data ------------------------------------
< 20060802_095200.jpg Exif.CanonCs.AFPoint Short 1 (0)
< 20060802_095200.jpg Exif.CanonCs.ExposureProgram Short 1 Program (P)
< 20060802_095200.jpg Exif.CanonCs.0x0015 Short 1 65535
-< 20060802_095200.jpg Exif.CanonCs.LensType Short 1 (65535)
+< 20060802_095200.jpg Exif.CanonCs.LensType Short 1 n/a
< 20060802_095200.jpg Exif.CanonCs.Lens Short 3 28.0 - 135.0 mm
< 20060802_095200.jpg Exif.CanonCs.MaxAperture Short 1 65535
< 20060802_095200.jpg Exif.CanonCs.MinAperture Short 1 65535
@@ -3629,7 +3629,7 @@ Compare image data and extracted data ------------------------------------
< 20060127_225027.jpg Exif.CanonCs.AFPoint Short 1 Auto AF point selection
< 20060127_225027.jpg Exif.CanonCs.ExposureProgram Short 1 Easy shooting (Auto)
< 20060127_225027.jpg Exif.CanonCs.0x0015 Short 1 32767
-< 20060127_225027.jpg Exif.CanonCs.LensType Short 1 (65535)
+< 20060127_225027.jpg Exif.CanonCs.LensType Short 1 n/a
< 20060127_225027.jpg Exif.CanonCs.Lens Short 3 5.8 - 23.2 mm
< 20060127_225027.jpg Exif.CanonCs.MaxAperture Short 1 F2.7
< 20060127_225027.jpg Exif.CanonCs.MinAperture Short 1 F8
@@ -3809,7 +3809,7 @@ Compare image data and extracted data ------------------------------------
> 20031214_000043.exv Exif.CanonCs.AFPoint Short 1 Center
> 20031214_000043.exv Exif.CanonCs.ExposureProgram Short 1 Program (P)
> 20031214_000043.exv Exif.CanonCs.0x0015 Short 1 65535
-> 20031214_000043.exv Exif.CanonCs.LensType Short 1 (65535)
+> 20031214_000043.exv Exif.CanonCs.LensType Short 1 n/a
> 20031214_000043.exv Exif.CanonCs.Lens Short 3 7.1 - 21.3 mm
> 20031214_000043.exv Exif.CanonCs.MaxAperture Short 1 F5
> 20031214_000043.exv Exif.CanonCs.MinAperture Short 1 F8
@@ -4227,7 +4227,7 @@ Compare image data and extracted data ------------------------------------
> 20030925_201850.exv Exif.CanonCs.AFPoint Short 1 Manual AF point selection
> 20030925_201850.exv Exif.CanonCs.ExposureProgram Short 1 Program (P)
> 20030925_201850.exv Exif.CanonCs.0x0015 Short 1 32767
-> 20030925_201850.exv Exif.CanonCs.LensType Short 1 (65535)
+> 20030925_201850.exv Exif.CanonCs.LensType Short 1 n/a
> 20030925_201850.exv Exif.CanonCs.Lens Short 3 18.0 - 55.0 mm
> 20030925_201850.exv Exif.CanonCs.MaxAperture Short 1 F3.6
> 20030925_201850.exv Exif.CanonCs.MinAperture Short 1 F22
@@ -4819,7 +4819,7 @@ Compare image data and extracted data ------------------------------------
> 20060802_095200.exv Exif.CanonCs.AFPoint Short 1 (0)
> 20060802_095200.exv Exif.CanonCs.ExposureProgram Short 1 Program (P)
> 20060802_095200.exv Exif.CanonCs.0x0015 Short 1 65535
-> 20060802_095200.exv Exif.CanonCs.LensType Short 1 (65535)
+> 20060802_095200.exv Exif.CanonCs.LensType Short 1 n/a
> 20060802_095200.exv Exif.CanonCs.Lens Short 3 28.0 - 135.0 mm
> 20060802_095200.exv Exif.CanonCs.MaxAperture Short 1 65535
> 20060802_095200.exv Exif.CanonCs.MinAperture Short 1 65535
@@ -5170,7 +5170,7 @@ Compare image data and extracted data ------------------------------------
> 20060127_225027.exv Exif.CanonCs.AFPoint Short 1 Auto AF point selection
> 20060127_225027.exv Exif.CanonCs.ExposureProgram Short 1 Easy shooting (Auto)
> 20060127_225027.exv Exif.CanonCs.0x0015 Short 1 32767
-> 20060127_225027.exv Exif.CanonCs.LensType Short 1 (65535)
+> 20060127_225027.exv Exif.CanonCs.LensType Short 1 n/a
> 20060127_225027.exv Exif.CanonCs.Lens Short 3 5.8 - 23.2 mm
> 20060127_225027.exv Exif.CanonCs.MaxAperture Short 1 F2.7
> 20060127_225027.exv Exif.CanonCs.MinAperture Short 1 F8
@@ -5570,7 +5570,7 @@ Compare original and inserted image data ---------------------------------
< 20031214_000043.jpg Exif.CanonCs.AFPoint Short 1 Center
< 20031214_000043.jpg Exif.CanonCs.ExposureProgram Short 1 Program (P)
< 20031214_000043.jpg Exif.CanonCs.0x0015 Short 1 65535
-< 20031214_000043.jpg Exif.CanonCs.LensType Short 1 (65535)
+< 20031214_000043.jpg Exif.CanonCs.LensType Short 1 n/a
< 20031214_000043.jpg Exif.CanonCs.Lens Short 3 7.1 - 21.3 mm
< 20031214_000043.jpg Exif.CanonCs.MaxAperture Short 1 F5
< 20031214_000043.jpg Exif.CanonCs.MinAperture Short 1 F8
@@ -5988,7 +5988,7 @@ Compare original and inserted image data ---------------------------------
< 20030925_201850.jpg Exif.CanonCs.AFPoint Short 1 Manual AF point selection
< 20030925_201850.jpg Exif.CanonCs.ExposureProgram Short 1 Program (P)
< 20030925_201850.jpg Exif.CanonCs.0x0015 Short 1 32767
-< 20030925_201850.jpg Exif.CanonCs.LensType Short 1 (65535)
+< 20030925_201850.jpg Exif.CanonCs.LensType Short 1 n/a
< 20030925_201850.jpg Exif.CanonCs.Lens Short 3 18.0 - 55.0 mm
< 20030925_201850.jpg Exif.CanonCs.MaxAperture Short 1 F3.6
< 20030925_201850.jpg Exif.CanonCs.MinAperture Short 1 F22
@@ -6580,7 +6580,7 @@ Compare original and inserted image data ---------------------------------
< 20060802_095200.jpg Exif.CanonCs.AFPoint Short 1 (0)
< 20060802_095200.jpg Exif.CanonCs.ExposureProgram Short 1 Program (P)
< 20060802_095200.jpg Exif.CanonCs.0x0015 Short 1 65535
-< 20060802_095200.jpg Exif.CanonCs.LensType Short 1 (65535)
+< 20060802_095200.jpg Exif.CanonCs.LensType Short 1 n/a
< 20060802_095200.jpg Exif.CanonCs.Lens Short 3 28.0 - 135.0 mm
< 20060802_095200.jpg Exif.CanonCs.MaxAperture Short 1 65535
< 20060802_095200.jpg Exif.CanonCs.MinAperture Short 1 65535
@@ -6931,7 +6931,7 @@ Compare original and inserted image data ---------------------------------
< 20060127_225027.jpg Exif.CanonCs.AFPoint Short 1 Auto AF point selection
< 20060127_225027.jpg Exif.CanonCs.ExposureProgram Short 1 Easy shooting (Auto)
< 20060127_225027.jpg Exif.CanonCs.0x0015 Short 1 32767
-< 20060127_225027.jpg Exif.CanonCs.LensType Short 1 (65535)
+< 20060127_225027.jpg Exif.CanonCs.LensType Short 1 n/a
< 20060127_225027.jpg Exif.CanonCs.Lens Short 3 5.8 - 23.2 mm
< 20060127_225027.jpg Exif.CanonCs.MaxAperture Short 1 F2.7
< 20060127_225027.jpg Exif.CanonCs.MinAperture Short 1 F8
@@ -7111,7 +7111,7 @@ Compare original and inserted image data ---------------------------------
> 20031214_000043.exv Exif.CanonCs.AFPoint Short 1 Center
> 20031214_000043.exv Exif.CanonCs.ExposureProgram Short 1 Program (P)
> 20031214_000043.exv Exif.CanonCs.0x0015 Short 1 65535
-> 20031214_000043.exv Exif.CanonCs.LensType Short 1 (65535)
+> 20031214_000043.exv Exif.CanonCs.LensType Short 1 n/a
> 20031214_000043.exv Exif.CanonCs.Lens Short 3 7.1 - 21.3 mm
> 20031214_000043.exv Exif.CanonCs.MaxAperture Short 1 F5
> 20031214_000043.exv Exif.CanonCs.MinAperture Short 1 F8
@@ -7529,7 +7529,7 @@ Compare original and inserted image data ---------------------------------
> 20030925_201850.exv Exif.CanonCs.AFPoint Short 1 Manual AF point selection
> 20030925_201850.exv Exif.CanonCs.ExposureProgram Short 1 Program (P)
> 20030925_201850.exv Exif.CanonCs.0x0015 Short 1 32767
-> 20030925_201850.exv Exif.CanonCs.LensType Short 1 (65535)
+> 20030925_201850.exv Exif.CanonCs.LensType Short 1 n/a
> 20030925_201850.exv Exif.CanonCs.Lens Short 3 18.0 - 55.0 mm
> 20030925_201850.exv Exif.CanonCs.MaxAperture Short 1 F3.6
> 20030925_201850.exv Exif.CanonCs.MinAperture Short 1 F22
@@ -8121,7 +8121,7 @@ Compare original and inserted image data ---------------------------------
> 20060802_095200.exv Exif.CanonCs.AFPoint Short 1 (0)
> 20060802_095200.exv Exif.CanonCs.ExposureProgram Short 1 Program (P)
> 20060802_095200.exv Exif.CanonCs.0x0015 Short 1 65535
-> 20060802_095200.exv Exif.CanonCs.LensType Short 1 (65535)
+> 20060802_095200.exv Exif.CanonCs.LensType Short 1 n/a
> 20060802_095200.exv Exif.CanonCs.Lens Short 3 28.0 - 135.0 mm
> 20060802_095200.exv Exif.CanonCs.MaxAperture Short 1 65535
> 20060802_095200.exv Exif.CanonCs.MinAperture Short 1 65535
@@ -8472,7 +8472,7 @@ Compare original and inserted image data ---------------------------------
> 20060127_225027.exv Exif.CanonCs.AFPoint Short 1 Auto AF point selection
> 20060127_225027.exv Exif.CanonCs.ExposureProgram Short 1 Easy shooting (Auto)
> 20060127_225027.exv Exif.CanonCs.0x0015 Short 1 32767
-> 20060127_225027.exv Exif.CanonCs.LensType Short 1 (65535)
+> 20060127_225027.exv Exif.CanonCs.LensType Short 1 n/a
> 20060127_225027.exv Exif.CanonCs.Lens Short 3 5.8 - 23.2 mm
> 20060127_225027.exv Exif.CanonCs.MaxAperture Short 1 F2.7
> 20060127_225027.exv Exif.CanonCs.MinAperture Short 1 F8
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list