[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:37:35 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=8bf1544
The following commit has been merged in the master branch:
commit 8bf15447d61e612fe7e08a79ca300b3f8dee9daf
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Sun May 7 18:16:14 2006 +0000
Added LensID 8 to lookup table (Gilles Caulier)
---
src/minoltamn.cpp | 105 ++++++++++++++++++++++++++----------------------------
1 file changed, 51 insertions(+), 54 deletions(-)
diff --git a/src/minoltamn.cpp b/src/minoltamn.cpp
index 42dd082..abe49d0 100644
--- a/src/minoltamn.cpp
+++ b/src/minoltamn.cpp
@@ -85,57 +85,58 @@ namespace Exiv2 {
//! Lookup table to translate Minolta Lens id values to readable labels
extern const TagDetails minoltaLensID[] = {
- { 1, "AF80-200mm F2.8G" },
- { 2, "AF28-70mm F2.8G" },
- { 6, "AF24-85mm F3.5-4.5" },
- { 7, "AF100-400mm F4.5-6.7(D)" },
- { 11, "AF300mm F4G" },
- { 12, "AF100mm F2.8 Soft" },
- { 15, "AF400mm F4.5G" },
- { 16, "AF17-35mm F3.5G" },
- { 19, "AF35mm/1.4" },
- { 20, "STF135mm F2.8[T4.5]" },
- { 23, "AF200mm F4G Macro" },
- { 24, "AF24-105mm F3.5-4.5(D) or SIGMA 18-50mm F2.8" },
- { 25, "AF100-300mm F4.5-5.6(D)" },
- { 27, "AF85mm F1.4G" },
- { 28, "AF100mm F2.8 Macro(D)" },
- { 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" },
- { 33, "AF70-200mm F2.8G SSM" },
- { 35, "AF85mm F1.4G(D) Limited" },
- { 38, "AF17-35mm F2.8-4(D)" },
- { 39, "AF28-75mm F2.8(D)" },
- { 40, "AFDT18-70mm F3.5-5.6(D)" },
- { 128, "TAMRON 18-200, 28-300 or 80-300mm F3.5-6.3" },
- { 25501, "AF50mm F1.7" },
- { 25521, "TOKINA 19-35mm F3.5-4.5 or TOKINA 28-70mm F2.8 AT-X" },
- { 25541, "AF35-105mm F3.5-4.5" },
- { 25551, "AF70-210mm F4 Macro or SIGMA 70-210mm F4-5.6 APO" },
- { 25581, "AF24-50mm F4" },
- { 25611, "SIGMA 70-300mm F4-5.6 or SIGMA 300mm F4 APO Macro" },
- { 25621, "AF50mm F1.4 NEW" },
- { 25631, "AF300mm F2.8G" },
- { 25641, "AF50mm F2.8 Macro" },
- { 25661, "AF24mm F2.8" },
- { 25721, "AF500mm F8 Reflex" },
- { 25781, "AF16mm F2.8 Fisheye or SIGMA 8mm F4 Fisheye" },
- { 25791, "AF20mm F2.8" },
+ { 1, "AF80-200mm F2.8G" },
+ { 2, "AF28-70mm F2.8G" },
+ { 6, "AF24-85mm F3.5-4.5" },
+ { 7, "AF100-400mm F4.5-6.7(D)" },
+ { 8, "AF70-210mm F4.5-5.6" },
+ { 11, "AF300mm F4G" },
+ { 12, "AF100mm F2.8 Soft" },
+ { 15, "AF400mm F4.5G" },
+ { 16, "AF17-35mm F3.5G" },
+ { 19, "AF35mm/1.4" },
+ { 20, "STF135mm F2.8[T4.5]" },
+ { 23, "AF200mm F4G Macro" },
+ { 24, "AF24-105mm F3.5-4.5(D) or SIGMA 18-50mm F2.8" },
+ { 25, "AF100-300mm F4.5-5.6(D)" },
+ { 27, "AF85mm F1.4G" },
+ { 28, "AF100mm F2.8 Macro(D)" },
+ { 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" },
+ { 33, "AF70-200mm F2.8G SSM" },
+ { 35, "AF85mm F1.4G(D) Limited" },
+ { 38, "AF17-35mm F2.8-4(D)" },
+ { 39, "AF28-75mm F2.8(D)" },
+ { 40, "AFDT18-70mm F3.5-5.6(D)" },
+ { 128, "TAMRON 18-200, 28-300 or 80-300mm F3.5-6.3" },
+ { 25501, "AF50mm F1.7" },
+ { 25521, "TOKINA 19-35mm F3.5-4.5 or TOKINA 28-70mm F2.8 AT-X" },
+ { 25541, "AF35-105mm F3.5-4.5" },
+ { 25551, "AF70-210mm F4 Macro or SIGMA 70-210mm F4-5.6 APO" },
+ { 25581, "AF24-50mm F4" },
+ { 25611, "SIGMA 70-300mm F4-5.6 or SIGMA 300mm F4 APO Macro" },
+ { 25621, "AF50mm F1.4 NEW" },
+ { 25631, "AF300mm F2.8G" },
+ { 25641, "AF50mm F2.8 Macro" },
+ { 25661, "AF24mm F2.8" },
+ { 25721, "AF500mm F8 Reflex" },
+ { 25781, "AF16mm F2.8 Fisheye or SIGMA 8mm F4 Fisheye" },
+ { 25791, "AF20mm F2.8" },
{ 25811, "AF100mm F2.8 Macro(D), TAMRON 90mm F2.8 Macro or SIGMA 180mm F5.6 Macro" },
- { 25858, "TAMRON 24-135mm F3.5-5.6" },
- { 25891, "TOKINA 80-200mm F2.8" },
- { 25921, "AF85mm F1.4G(D)" },
- { 25931, "AF200mm F2.8G" },
- { 25961, "AF28mm F2" },
- { 25981, "AF100mm F2" },
- { 26061, "AF100-300mm F4.5-5.6(D)" },
- { 26081, "AF300mm F2.8G" },
- { 26121, "AF200mm F2.8G(D)" },
- { 26131, "AF50mm F1.7" },
- { 26241, "AF35-80mm F4-5.6" },
- { 45741, "AF200mm F2.8G x2 or TOKINA 300mm F2.8 x2" }
+ { 25858, "TAMRON 24-135mm F3.5-5.6" },
+ { 25891, "TOKINA 80-200mm F2.8" },
+ { 25921, "AF85mm F1.4G(D)" },
+ { 25931, "AF200mm F2.8G" },
+ { 25961, "AF28mm F2" },
+ { 25981, "AF100mm F2" },
+ { 26061, "AF100-300mm F4.5-5.6(D)" },
+ { 26081, "AF300mm F2.8G" },
+ { 26121, "AF200mm F2.8G(D)" },
+ { 26131, "AF50mm F1.7" },
+ { 26241, "AF35-80mm F4-5.6" },
+ { 45741, "AF200mm F2.8G x2 or TOKINA 300mm F2.8 x2" }
};
//! @cond IGNORE
@@ -167,12 +168,8 @@ namespace Exiv2 {
TagInfo(0x0107, "ImageStabilization", "Image Stabilization", "Image stabilization", minoltaIfdId, makerTags, unsignedLong, printTag<COUNTOF(minoltaImageStabilization), minoltaImageStabilization>),
TagInfo(0x010a, "ZoneMatching", "Zone Matching", "Zone matching", minoltaIfdId, makerTags, unsignedLong, printTag<COUNTOF(minoltaZoneMatching), minoltaZoneMatching>),
-
- // Todo: this tag is important. Check ExifTool doc when description will be updated.
TagInfo(0x010b, "ColorTemperature", "Color Temperature", "Color temperature", minoltaIfdId, makerTags, unsignedLong, printValue),
-
TagInfo(0x010c, "LensID", "Lens ID", "Lens ID", minoltaIfdId, makerTags, unsignedLong, printTag<COUNTOF(minoltaLensID), minoltaLensID>),
-
TagInfo(0x0114, "CameraSettings5D", "Camera Settings (5D)", "Camera Settings (5D)", minoltaIfdId, makerTags, undefined, printValue),
TagInfo(0x0e00, "PIM_IFD", "PIM IFD", "PIM information", minoltaIfdId, makerTags, undefined, printValue),
TagInfo(0x0f00, "CameraSettingsNew2", "Camera Settings (New2)", "Camera Settings (new2)", minoltaIfdId, makerTags, undefined, printValue),
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list