[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:36 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=09d81fe
The following commit has been merged in the master branch:
commit 09d81feb316bac8d80d63476a7a38a1e594e339b
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Thu May 11 12:23:06 2006 +0000
Updated Minolta Makernote (Gilles Caulier)
---
src/minoltamn.cpp | 118 ++++++++++++++++++++++++++++--------------------------
1 file changed, 62 insertions(+), 56 deletions(-)
diff --git a/src/minoltamn.cpp b/src/minoltamn.cpp
index 13d618a..8bed896 100644
--- a/src/minoltamn.cpp
+++ b/src/minoltamn.cpp
@@ -87,58 +87,59 @@ 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)" },
- { 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" }
+ { 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 or Sigma DC 18-125mm F4-5,6 D" },
+ { 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)" },
+ { 41, "TAMRON Di II LD 11-18mm F4-5.6" },
+ { 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" }
};
// Minolta Tag Info
@@ -422,8 +423,8 @@ namespace Exiv2 {
TagInfo(0x0021, "Sharpness", "Sharpness", "Sharpness", minoltaCsNewIfdId, makerTags, unsignedLong, printTag<COUNTOF(minoltaSharpnessStd), minoltaSharpnessStd>),
TagInfo(0x0022, "SubjectProgram", "Subject Program", "Subject program", minoltaCsNewIfdId, makerTags, unsignedLong, printTag<COUNTOF(minoltaSubjectProgramStd), minoltaSubjectProgramStd>),
TagInfo(0x0023, "FlashExposureComp", "Flash Exposure Comp", "Flash exposure comp", minoltaCsNewIfdId, makerTags, unsignedLong, printValue),
- TagInfo(0x0024, "ISOSetting", "ISO Setting", "ISO setting", minoltaCsNewIfdId, makerTags, unsignedShort, printTag<COUNTOF(minoltaISOSettingStd), minoltaISOSettingStd>),
- TagInfo(0x0025, "MinoltaModel", "Minolta Model", "Minolta model", minoltaCsNewIfdId, makerTags, unsignedShort, printTag<COUNTOF(minoltaModelStd), minoltaModelStd>),
+ TagInfo(0x0024, "ISOSetting", "ISO Setting", "ISO setting", minoltaCsNewIfdId, makerTags, unsignedLong, printTag<COUNTOF(minoltaISOSettingStd), minoltaISOSettingStd>),
+ TagInfo(0x0025, "MinoltaModel", "Minolta Model", "Minolta model", minoltaCsNewIfdId, makerTags, unsignedLong, printTag<COUNTOF(minoltaModelStd), minoltaModelStd>),
TagInfo(0x0026, "IntervalMode", "Interval Mode", "Interval mode", minoltaCsNewIfdId, makerTags, unsignedLong, printTag<COUNTOF(minoltaIntervalModeStd), minoltaIntervalModeStd>),
TagInfo(0x0027, "FolderName", "Folder Name", "Folder name", minoltaCsNewIfdId, makerTags, unsignedLong, printTag<COUNTOF(minoltaFolderNameStd), minoltaFolderNameStd>),
TagInfo(0x0028, "ColorMode", "ColorMode", "ColorMode", minoltaCsNewIfdId, makerTags, unsignedLong, printTag<COUNTOF(minoltaColorModeStd), minoltaColorModeStd>),
@@ -564,6 +565,7 @@ namespace Exiv2 {
TagInfo(0x000E, "FocusMode", "Focus Mode", "Focus mode", minoltaCs7DIfdId, makerTags, unsignedShort, printTag<COUNTOF(minoltaFocusMode7D), minoltaFocusMode7D>),
TagInfo(0x0010, "AFPoints", "AF Points", "AF points", minoltaCs7DIfdId, makerTags, unsignedShort, printTag<COUNTOF(minoltaAFPoints7D), minoltaAFPoints7D>),
TagInfo(0x0015, "Flash", "Flash", "Flash", minoltaCs7DIfdId, makerTags, unsignedShort, printTag<COUNTOF(minoltaFlash7D), minoltaFlash7D>),
+ TagInfo(0x0016, "FlashMode", "Flash Mode", "Flash mode", minoltaCs7DIfdId, makerTags, unsignedShort, printValue),
TagInfo(0x001C, "ISOSetting", "ISO Setting", "ISO setting", minoltaCs7DIfdId, makerTags, unsignedShort, printTag<COUNTOF(minoltaISOSetting7D), minoltaISOSetting7D>),
TagInfo(0x001E, "ExposureCompensation", "Exposure Compensation", "Exposure compensation", minoltaCs7DIfdId, makerTags, signedShort, printValue),
TagInfo(0x0025, "ColorSpace", "Color Space", "Color space", minoltaCs7DIfdId, makerTags, unsignedShort, printTag<COUNTOF(minoltaColorSpace7D), minoltaColorSpace7D>),
@@ -572,13 +574,16 @@ namespace Exiv2 {
TagInfo(0x0028, "Saturation", "Saturation", "Saturation", minoltaCs7DIfdId, makerTags, unsignedShort, printValue),
TagInfo(0x002D, "FreeMemoryCardImages", "Free Memory Card Images", "Free memory card images", minoltaCs7DIfdId, makerTags, unsignedShort, printValue),
TagInfo(0x003F, "ColorTemperature", "Color Temperature", "Color temperature", minoltaCs7DIfdId, makerTags, signedShort, printValue),
- TagInfo(0x0046, "Rotation", "Rotation", "Rotation", minoltaCs7DIfdId, makerTags, unsignedShort, printTag<COUNTOF(minoltaRotation7D), minoltaRotation7D>),
+ TagInfo(0x0040, "Hue", "Hue", "Hue", minoltaCsNewIfdId, makerTags, unsignedShort, printValue),
+ TagInfo(0x0046, "Rotation", "Rotation", "Rotation", minoltaCs7DIfdId, makerTags, unsignedShort, printTag<COUNTOF(minoltaRotation7D), minoltaRotation7D>),
TagInfo(0x0047, "FNumber", "FNumber", "FNumber", minoltaCs7DIfdId, makerTags, unsignedShort, printValue),
TagInfo(0x0048, "ExposureTime", "Exposure Time", "Exposure time", minoltaCs7DIfdId, makerTags, unsignedShort, printValue),
+ // 0x004A is a dupplicate than 0x002D.
TagInfo(0x004A, "FreeMemoryCardImages", "Free Memory Card Images", "Free memory card images", minoltaCs7DIfdId, makerTags, unsignedShort, printValue),
TagInfo(0x005E, "ImageNumber", "Image Number", "Image number", minoltaCs7DIfdId, makerTags, unsignedShort, printValue),
TagInfo(0x0060, "NoiseReduction", "Noise Reduction", "Noise reduction", minoltaCs7DIfdId, makerTags, unsignedShort, printTag<COUNTOF(minoltaNoiseReduction7D), minoltaNoiseReduction7D>),
- TagInfo(0x0062, "ImageNumber", "Image Number", "Image number", minoltaCs7DIfdId, makerTags, unsignedShort, printValue),
+ // 0x0062 is a dupplicate than 0x005E.
+ TagInfo(0x0062, "ImageNumber", "Image Number", "Image number", minoltaCs7DIfdId, makerTags, unsignedShort, printValue),
TagInfo(0x0071, "ImageStabilization", "Image Stabilization", "Image stabilization", minoltaCs7DIfdId, makerTags, unsignedShort, printTag<COUNTOF(minoltaImageStabilization7D), minoltaImageStabilization7D>),
TagInfo(0x0075, "ZoneMatchingOn", "Zone Matching On", "Zone matching on", minoltaCs7DIfdId, makerTags, unsignedShort, printTag<COUNTOF(minoltaZoneMatchingOn7D), minoltaZoneMatchingOn7D>),
@@ -687,6 +692,7 @@ namespace Exiv2 {
TagInfo(0x0035, "ExposureTime", "Exposure Time", "Exposure time", minoltaCs5DIfdId, makerTags, unsignedShort, printValue),
TagInfo(0x0036, "FNumber", "FNumber", "FNumber", minoltaCs5DIfdId, makerTags, unsignedShort, printValue),
TagInfo(0x0037, "FreeMemoryCardImages", "Free Memory Card Images", "Free memory card images", minoltaCs5DIfdId, makerTags, unsignedShort, printValue),
+ TagInfo(0x0038, "ExposureRevision", "Exposure Revision", "Exposure revision", minoltaCs5DIfdId, makerTags, unsignedShort, printValue),
TagInfo(0x0049, "ColorTemperature", "Color Temperature", "Color temperature", minoltaCs5DIfdId, makerTags, signedShort, printValue),
TagInfo(0x0050, "Rotation", "Rotation", "Rotation", minoltaCs5DIfdId, makerTags, unsignedShort, printTag<COUNTOF(minoltaRotation5D), minoltaRotation5D>),
TagInfo(0x0053, "ExposureCompensation", "Exposure Compensation", "Exposure compensation", minoltaCs5DIfdId, makerTags, unsignedShort, printValue),
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list