[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:41:38 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=9599a58
The following commit has been merged in the master branch:
commit 9599a5810045969471b392cac275da8d328ff365
Author: HumanDynamo <caulier.gilles at gmail.com>
Date: Tue May 25 11:55:12 2010 +0000
Warning : Exiftool database give a list of tags shorted in decimal mode, not hexadecimal
---
src/sonymn.cpp | 56 +++++++++++++++++++++++++++++---------------------------
1 file changed, 29 insertions(+), 27 deletions(-)
diff --git a/src/sonymn.cpp b/src/sonymn.cpp
index 80c4608..1a68872 100644
--- a/src/sonymn.cpp
+++ b/src/sonymn.cpp
@@ -516,6 +516,8 @@ namespace Exiv2 {
// NOTE: all are for A200, A230, A300, A350, A700, A850 and A900 Sony model excepted
// some entries which are only relevant with A700.
+ // Warnings: Exiftool database give a list of tags shorted in decimal mode, not hexadecimal.
+
const TagInfo SonyMakerNote::tagInfoCs_[] = {
// NOTE: A700 only
TagInfo(0x0004, "DriveMode", N_("Drive Mode"),
@@ -525,91 +527,91 @@ namespace Exiv2 {
TagInfo(0x0006, "WhiteBalanceFineTune", N_("White Balance Fine Tune"),
N_("White Balance Fine Tune"),
sony1CsIfdId, makerTags, signedShort, printValue),
- TagInfo(0x0016, "FocusMode", N_("Focus Mode"),
+ TagInfo(0x0010, "FocusMode", N_("Focus Mode"),
N_("Focus Mode"),
sony1CsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyCSFocusMode)),
- TagInfo(0x0017, "AFAreaMode", N_("AF Area Mode"),
+ TagInfo(0x0011, "AFAreaMode", N_("AF Area Mode"),
N_("AF Area Mode"),
sony1CsIfdId, makerTags, unsignedShort, printMinoltaSonyAFAreaMode),
- TagInfo(0x0018, "LocalAFAreaPoint", N_("Local AF Area Point"),
+ TagInfo(0x0012, "LocalAFAreaPoint", N_("Local AF Area Point"),
N_("Local AF Area Point"),
sony1CsIfdId, makerTags, unsignedShort, printMinoltaSonyLocalAFAreaPoint),
- TagInfo(0x0021, "MeteringMode", N_("Metering Mode"),
+ TagInfo(0x0015, "MeteringMode", N_("Metering Mode"),
N_("Metering Mode"),
sony1CsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyMeteringMode)),
- TagInfo(0x0022, "ISOSetting", N_("ISO Setting"),
+ TagInfo(0x0016, "ISOSetting", N_("ISO Setting"),
N_("ISO Setting"),
sony1CsIfdId, makerTags, unsignedShort, printValue),
- TagInfo(0x0024, "DynamicRangeOptimizerMode", N_("Dynamic Range Optimizer Mode"),
+ TagInfo(0x0018, "DynamicRangeOptimizerMode", N_("Dynamic Range Optimizer Mode"),
N_("Dynamic Range Optimizer Mode"),
sony1CsIfdId, makerTags, unsignedShort, printMinoltaSonyDynamicRangeOptimizerMode),
- TagInfo(0x0025, "DynamicRangeOptimizerLevel", N_("Dynamic Range Optimizer Level"),
+ TagInfo(0x0019, "DynamicRangeOptimizerLevel", N_("Dynamic Range Optimizer Level"),
N_("Dynamic Range Optimizer Level"),
sony1CsIfdId, makerTags, unsignedShort, printValue),
- TagInfo(0x0026, "CreativeStyle", N_("Creative Style"),
+ TagInfo(0x001A, "CreativeStyle", N_("Creative Style"),
N_("Creative Style"),
sony1CsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyCreativeStyle)),
- TagInfo(0x0028, "Sharpness", N_("Sharpness"),
+ TagInfo(0x001C, "Sharpness", N_("Sharpness"),
N_("Sharpness"),
sony1CsIfdId, makerTags, unsignedShort, printValue),
- TagInfo(0x0029, "Contrast", N_("Contrast"),
+ TagInfo(0x001D, "Contrast", N_("Contrast"),
N_("Contrast"),
sony1CsIfdId, makerTags, unsignedShort, printValue),
- TagInfo(0x0030, "Saturation", N_("Saturation"),
+ TagInfo(0x001E, "Saturation", N_("Saturation"),
N_("Saturation"),
sony1CsIfdId, makerTags, unsignedShort, printValue),
- TagInfo(0x0031, "ZoneMatchingValue", N_("Zone Matching Value"),
+ TagInfo(0x001F, "ZoneMatchingValue", N_("Zone Matching Value"),
N_("Zone Matching Value"),
sony1CsIfdId, makerTags, unsignedShort, printValue),
- TagInfo(0x0034, "Brightness", N_("Brightness"),
+ TagInfo(0x0022, "Brightness", N_("Brightness"),
N_("Brightness"),
sony1CsIfdId, makerTags, unsignedShort, printValue),
- TagInfo(0x0035, "FlashMode", N_("FlashMode"),
+ TagInfo(0x0023, "FlashMode", N_("FlashMode"),
N_("FlashMode"),
sony1CsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyFlashMode)),
// NOTE: A700 only
- TagInfo(0x0040, "PrioritySetupShutterRelease", N_("Priority Setup Shutter Release"),
+ TagInfo(0x0028, "PrioritySetupShutterRelease", N_("Priority Setup Shutter Release"),
N_("Priority Setup Shutter Release"),
sony1CsIfdId, makerTags, unsignedShort, printMinoltaSonyPrioritySetupShutterRelease),
// NOTE: A700 only
- TagInfo(0x0041, "AFIlluminator", N_("AF Illuminator"),
+ TagInfo(0x0029, "AFIlluminator", N_("AF Illuminator"),
N_("AF Illuminator"),
sony1CsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyAFIlluminatorCS)),
// NOTE: A700 only
- TagInfo(0x0042, "AFWithShutter", N_("AF With Shutter"),
+ TagInfo(0x002A, "AFWithShutter", N_("AF With Shutter"),
N_("AF With Shutter"),
sony1CsIfdId, makerTags, unsignedShort, printMinoltaSonyBoolInverseValue),
// NOTE: A700 only
- TagInfo(0x0043, "LongExposureNoiseReduction", N_("Long Exposure Noise Reduction"),
+ TagInfo(0x002B, "LongExposureNoiseReduction", N_("Long Exposure Noise Reduction"),
N_("Long Exposure Noise Reduction"),
sony1CsIfdId, makerTags, unsignedShort, printMinoltaSonyBoolValue),
// NOTE: A700 only
- TagInfo(0x0044, "HighISONoiseReduction", N_("High ISO NoiseReduction"),
+ TagInfo(0x002C, "HighISONoiseReduction", N_("High ISO NoiseReduction"),
N_("High ISO NoiseReduction"),
sony1CsIfdId, makerTags, unsignedShort, printValue),
// NOTE: A700 only
- TagInfo(0x0045, "ImageStyle", N_("Image Style"),
+ TagInfo(0x002D, "ImageStyle", N_("Image Style"),
N_("Image Style"),
sony1CsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyImageStyle)),
- TagInfo(0x0060, "ExposureProgram", N_("Exposure Program"),
+ TagInfo(0x003C, "ExposureProgram", N_("Exposure Program"),
N_("Exposure Program"),
sony1CsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyExposureProgram)),
- TagInfo(0x0061, "ImageStabilization", N_("Image Stabilization"),
+ TagInfo(0x003D, "ImageStabilization", N_("Image Stabilization"),
N_("Image Stabilization"),
sony1CsIfdId, makerTags, unsignedShort, printMinoltaSonyBoolValue),
- TagInfo(0x0063, "Rotation", N_("Rotation"),
+ TagInfo(0x003F, "Rotation", N_("Rotation"),
N_("Rotation"),
sony1CsIfdId, makerTags, unsignedShort, printMinoltaSonyRotation),
- TagInfo(0x0084, "SonyImageSize", N_("Sony Image Size"),
+ TagInfo(0x0054, "SonyImageSize", N_("Sony Image Size"),
N_("Sony Image Size"),
sony1CsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyImageSize)),
- TagInfo(0x0085, "AspectRatio", N_("Aspect Ratio"),
+ TagInfo(0x0055, "AspectRatio", N_("Aspect Ratio"),
N_("Aspect Ratio"),
sony1CsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyAspectRatio)),
- TagInfo(0x0086, "Quality", N_("Quality"),
+ TagInfo(0x0056, "Quality", N_("Quality"),
N_("Quality"),
sony1CsIfdId, makerTags, unsignedShort, printMinoltaSonyQualityCS),
- TagInfo(0x0088, "ExposureLevelIncrements", N_("Exposure Level Increments"),
+ TagInfo(0x0058, "ExposureLevelIncrements", N_("Exposure Level Increments"),
N_("Exposure Level Increments"),
sony1CsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyExposureLevelIncrements)),
// End of list marker
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list