Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=8cfdebe
The following commit has been merged in the master branch:
commit 8cfdebe01bb80d2759da3a2b0627b0e8b9978948
Author: HumanDynamo <caulier.gilles at gmail.com>
Date: Tue Sep 26 19:12:52 2006 +0000
update minolta lens ID (pass2) using Dimage Master Rev. Eng.
---
src/minoltamn.cpp | 35 ++++++++++++++++++++++++++++++-----
1 file changed, 30 insertions(+), 5 deletions(-)
diff --git a/src/minoltamn.cpp b/src/minoltamn.cpp
index a5faaa7..ff2f670 100644
--- a/src/minoltamn.cpp
+++ b/src/minoltamn.cpp
@@ -93,7 +93,11 @@ namespace Exiv2 {
};
//! Lookup table to translate Minolta Lens id values to readable labels
- /* NOTE: duplicate tags value : 0/25520, 4/25920, 13/25610, 19/25910 22/26050/26070 */
+ /* NOTE: duplicate tags value are :
+ 0/25520, 4/25920, 13/25610, 19/25910, 22/26050/26070,
+ 25500/25501/26130, 25540/25541/25850, 25580/25581, 2564025641,
+ 25720/25721, 25790/25791,
+ */
extern const TagDetails minoltaLensID[] = {
{ 0, "AF28-85mm F3.5-4.5" },
{ 1, "AF80-200mm F2.8G" },
@@ -117,7 +121,7 @@ namespace Exiv2 {
{ 19, "AF35mm F1.4G" },
{ 20, "STF135mm F2.8[T4.5]" },
{ 22, "AF35-80mm F4-5.6" },
- { 23, "AF200mm F4G Macro" },
+ { 23, "AF200mm F4G APO Macro" },
{ 24, "AF24-105mm F3.5-4.5(D) or SIGMA 18-50mm F2.8 or Sigma DC 18-125mm F4-5,6 D" },
{ 25, "AF100-300mm F4.5-5.6 APO(D)" },
{ 27, "AF85mm F1.4G(D)" },
@@ -125,30 +129,50 @@ namespace Exiv2 {
{ 29, "AF75-300mm F4.5-5.6(D)" },
{ 30, "AF28-80mm F3.5-5.6(D)" },
{ 31, "AF50mm F2.8 Macro(D) or AF50mm F3.5 Macro" },
- { 32, "AF100-400mm F4.5-6.7(D) x1.5 or AF300mm F2.8G(D) SSM" },
- { 33, "AF70-200mm F2.8G SSM" },
+ { 32, "AF100-400mm F4.5-6.7(D) x1.5 or AF300mm F2.8G APO(D) SSM" },
+ { 33, "AF70-200mm F2.8G APO(D) SSM" },
{ 35, "AF85mm F1.4G(D) Limited" },
+ { 36, "AF28-100mm F3.5-5.6(D)" },
{ 38, "AF17-35mm F2.8-4(D)" },
{ 39, "AF28-75mm F2.8(D)" },
{ 40, "AFDT18-70mm F3.5-5.6(D)" },
- { 41, "TAMRON Di II LD 11-18mm F4-5.6" },
+ { 41, "AFDT11-18mm F4.5-5.6(D)" },
+ { 42, "AFDT18-200mm F3.5-6.3(D)" },
{ 128, "TAMRON 18-200, 28-300 or 80-300mm F3.5-6.3" },
+ { 25500, "AF50mm F1.7" },
{ 25501, "AF50mm F1.7" },
+ { 25510, "AF35-70mm F1.4" },
{ 25520, "AF28-85mm F3.5-4.5" },
{ 25521, "TOKINA 19-35mm F3.5-4.5 or TOKINA 28-70mm F2.8 AT-X" },
+ { 25530, "AF28-135mm F4-4.5" },
+ { 25540, "AF35-105mm F3.5-4.5" },
{ 25541, "AF35-105mm F3.5-4.5" },
+ { 25550, "AF70-210mm F4" },
{ 25551, "AF70-210mm F4 Macro or SIGMA 70-210mm F4-5.6 APO" },
+ { 25560, "AF135mm F2.8" },
+ { 25570, "AF28mm F2.8" },
+ { 25580, "AF24-50mm F4" },
{ 25581, "AF24-50mm F4" },
+ { 25600, "AF100-200mm F4.5" },
{ 25610, "AF75-300mm F4.5-5.6" },
{ 25611, "SIGMA 70-300mm F4-5.6 or SIGMA 300mm F4 APO Macro" },
+ { 25620, "AF50mm F1.4" },
{ 25621, "AF50mm F1.4 NEW" },
+ { 25630, "AF300mm F2.8G APO" },
{ 25631, "AF300mm F2.8G" },
+ { 25640, "AF50mm F2.8 Macro" },
{ 25641, "AF50mm F2.8 Macro" },
+ { 25650, "AF600mm F4 APO" },
+ { 25660, "AF24mm F2.8" },
{ 25661, "AF24mm F2.8 or SIGMA 17-35mm F2.8-4.0 EX-D" },
+ { 25720, "AF500mm F8 Reflex" },
{ 25721, "AF500mm F8 Reflex" },
+ { 25780, "AF16mm F2.8 Fisheye" },
{ 25781, "AF16mm F2.8 Fisheye or SIGMA 8mm F4 Fisheye" },
+ { 25790, "AF20mm F2.8" },
{ 25791, "AF20mm F2.8" },
{ 25811, "AF100mm F2.8 Macro(D) or TAMRON 90mm F2.8 Macro or SIGMA 180mm F5.6 Macro" },
+ { 25850, "AF35-105mm F3.5-4.5" },
{ 25858, "TAMRON 24-135mm F3.5-5.6" },
{ 25891, "TOKINA 80-200mm F2.8" },
{ 25910, "AF35mm F1.4G" },
@@ -162,6 +186,7 @@ namespace Exiv2 {
{ 26070, "AF35-80mm F4-5.6" },
{ 26081, "AF300mm F2.8G" },
{ 26121, "AF200mm F2.8G(D)" },
+ { 26130, "AF50mm F1.7" },
{ 26131, "AF50mm F1.7" },
{ 26151, "AF28-105mm F3.5-4.5 Xi" },
{ 26241, "AF35-80mm F4-5.6" },
--
exiv2 packaging