[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:42:46 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=3a8561f
The following commit has been merged in the master branch:
commit 3a8561fcf3b603f2317341b817806268b194f042
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Mon Sep 12 15:54:13 2011 +0000
Updated Samsung makernote, part 1.
---
src/samsungmn.cpp | 81 +++++++++++++++++++++++++++++++++----------------------
1 file changed, 49 insertions(+), 32 deletions(-)
diff --git a/src/samsungmn.cpp b/src/samsungmn.cpp
index a976b67..58d2e79 100644
--- a/src/samsungmn.cpp
+++ b/src/samsungmn.cpp
@@ -50,9 +50,24 @@ namespace Exiv2 {
//! LensType, tag 0xa003
extern const TagDetails samsung2LensType[] = {
- { 1, N_("Samsung 30mm F2") },
- { 2, N_("Samsung Zoom 18-55mm F3.5-5.6 OIS") },
- { 3, N_("Samsung Zoom 50-200mm F4-5.6 ED OIS") }
+ { 0, N_("Built-in") },
+ { 1, N_("Samsung 30mm F2 Pancake") },
+ { 2, N_("Samsung Zoom 18-55mm F3.5-5.6 OIS") },
+ { 3, N_("Samsung Zoom 50-200mm F4-5.6 ED OIS") },
+ { 4, N_("Samsung 20-50mm F3.5-5.6 Compact Zoom") },
+ { 5, N_("Samsung 20mm F2.8 Pancake") }
+ };
+
+ //! ColorSpace, tag 0xa011
+ extern const TagDetails samsung2ColorSpace[] = {
+ { 0, N_("sRGB") },
+ { 1, N_("Adobe RGB") }
+ };
+
+ //! SmartRange, tag 0xa012
+ extern const TagDetails samsung2SmartRange[] = {
+ { 0, N_("Off") },
+ { 1, N_("On") }
};
std::ostream& printPictureWizard(std::ostream& os, const Value& value, const ExifData*)
@@ -95,36 +110,38 @@ namespace Exiv2 {
// Samsung MakerNote Tag Info
const TagInfo Samsung2MakerNote::tagInfo_[] = {
- TagInfo(0x0001, "Version", N_("Version"), N_("Makernote version"),
- samsung2Id, makerTags, undefined, -1, printExifVersion),
- TagInfo(0x0021, "PictureWizard", N_("PictureWizard"), N_("Picture wizard"),
- samsung2Id, makerTags, unsignedShort, -1, printPictureWizard),
- TagInfo(0x0035, "Preview", N_("Pointer to a preview image"), N_("Offset to an IFD containing a preview image"),
- samsung2Id, makerTags, unsignedLong, -1, printValue),
- TagInfo(0x0043, "CameraTemperature", N_("Camera Temperature"), N_("Camera temperature"),
- samsung2Id, makerTags, signedRational, -1, printCameraTemperature),
- TagInfo(0xa001, "FirmwareName", N_("Firmware Name"), N_("Firmware name"),
- samsung2Id, makerTags, asciiString, -1, printValue),
- TagInfo(0xa003, "LensType", N_("Lens Type"), N_("Lens type"),
- samsung2Id, makerTags, unsignedShort, -1, EXV_PRINT_TAG(samsung2LensType)),
- TagInfo(0xa010, "SensorAreas", N_("Sensor Areas"), N_("Sensor areas"),
- samsung2Id, makerTags, unsignedLong, -1, printValue),
- TagInfo(0xa013, "ExposureBiasValue", N_("Exposure Bias Value"), N_("Exposure bias value"),
- samsung2Id, makerTags, signedRational, -1, print0x9204),
- TagInfo(0xa014, "ISO", N_("ISO"), N_("ISO"),
- samsung2Id, makerTags, unsignedLong, -1, printValue),
- TagInfo(0xa018, "ExposureTime", N_("Exposure Time"), N_("Exposure time"),
- samsung2Id, makerTags, unsignedRational, -1, print0x829a),
- TagInfo(0xa019, "FNumber", N_("FNumber"), N_("The F number."),
- samsung2Id, makerTags, unsignedRational, -1, print0x829d),
- TagInfo(0xa01a, "FocalLengthIn35mmFormat", N_("Focal Length In 35mm Format"), N_("Focal length in 35mm format"),
- samsung2Id, makerTags, unsignedLong, -1, printFocalLength35),
- TagInfo(0xa021, "WB_RGGBLevels", N_("WB RGGB Levels"), N_("WB RGGB levels"),
- samsung2Id, makerTags, unsignedLong, -1, printValue),
+ TagInfo(0x0001, "Version", N_("Version"), N_("Makernote version"), samsung2Id, makerTags, undefined, -1, printExifVersion),
+ TagInfo(0x0021, "PictureWizard", N_("Picture Wizard"), N_("Picture wizard"), samsung2Id, makerTags, unsignedShort, -1, printPictureWizard),
+ TagInfo(0x0030, "LocalLocationName", N_("Local Location Name"), N_("Local location name"), samsung2Id, makerTags, asciiString, -1, printValue),
+ TagInfo(0x0031, "LocationName", N_("Location Name"), N_("Location name"), samsung2Id, makerTags, asciiString, -1, printValue),
+ TagInfo(0x0035, "Preview", N_("Pointer to a preview image"), N_("Offset to an IFD containing a preview image"), samsung2Id, makerTags, unsignedLong, -1, printValue),
+ TagInfo(0x0043, "CameraTemperature", N_("Camera Temperature"), N_("Camera temperature"), samsung2Id, makerTags, signedRational, -1, printCameraTemperature),
+ TagInfo(0xa001, "FirmwareName", N_("Firmware Name"), N_("Firmware name"), samsung2Id, makerTags, asciiString, -1, printValue),
+ TagInfo(0xa003, "LensType", N_("Lens Type"), N_("Lens type"), samsung2Id, makerTags, unsignedShort, -1, EXV_PRINT_TAG(samsung2LensType)),
+ TagInfo(0xa004, "LensFirmware", N_("Lens Firmware"), N_("Lens firmware"), samsung2Id, makerTags, asciiString, -1, printValue),
+ TagInfo(0xa010, "SensorAreas", N_("Sensor Areas"), N_("Sensor areas"), samsung2Id, makerTags, unsignedLong, -1, printValue),
+ TagInfo(0xa011, "ColorSpace", N_("Color Space"), N_("Color space"), samsung2Id, makerTags, unsignedShort, -1, EXV_PRINT_TAG(samsung2ColorSpace)),
+ TagInfo(0xa012, "SmartRange", N_("Smart Range"), N_("Smart range"), samsung2Id, makerTags, unsignedShort, -1, EXV_PRINT_TAG(samsung2SmartRange)),
+ TagInfo(0xa013, "ExposureBiasValue", N_("Exposure Bias Value"), N_("Exposure bias value"), samsung2Id, makerTags, signedRational, -1, print0x9204),
+ TagInfo(0xa014, "ISO", N_("ISO"), N_("ISO"), samsung2Id, makerTags, unsignedLong, -1, printValue),
+ TagInfo(0xa018, "ExposureTime", N_("Exposure Time"), N_("Exposure time"), samsung2Id, makerTags, unsignedRational, -1, print0x829a),
+ TagInfo(0xa019, "FNumber", N_("FNumber"), N_("The F number."), samsung2Id, makerTags, unsignedRational, -1, print0x829d),
+ TagInfo(0xa01a, "FocalLengthIn35mmFormat", N_("Focal Length In 35mm Format"), N_("Focal length in 35mm format"), samsung2Id, makerTags, unsignedLong, -1, printFocalLength35),
+ TagInfo(0xa020, "EncryptionKey", N_("Encryption Key"), N_("Encryption key"), samsung2Id, makerTags, unsignedLong, -1, printValue),
+ TagInfo(0xa021, "WB_RGGBLevelsUncorrected", N_("WB RGGB Levels Uncorrected"), N_("WB RGGB levels not corrected for WB_RGGBLevelsBlack"), samsung2Id, makerTags, unsignedLong, -1, printValue),
+ TagInfo(0xa022, "WB_RGGBLevelsAuto", N_("WB RGGB Levels Auto"), N_("WB RGGB levels auto"), samsung2Id, makerTags, unsignedLong, -1, printValue),
+ TagInfo(0xa023, "WB_RGGBLevelsIlluminator1", N_("WB RGGB Levels Illuminator1"), N_("WB RGGB levels illuminator1"), samsung2Id, makerTags, unsignedLong, -1, printValue),
+ TagInfo(0xa024, "WB_RGGBLevelsIlluminator2", N_("WB RGGB Levels Illuminator2"), N_("WB RGGB levels illuminator2"), samsung2Id, makerTags, unsignedLong, -1, printValue),
+ TagInfo(0xa028, "WB_RGGBLevelsBlack", N_("WB RGGB Levels Black"), N_("WB RGGB levels black"), samsung2Id, makerTags, signedLong, -1, printValue),
+ TagInfo(0xa030, "ColorMatrix", N_("Color Matrix"), N_("Color matrix"), samsung2Id, makerTags, signedLong, -1, printValue),
+ TagInfo(0xa031, "ColorMatrixSRGB", N_("Color Matrix sRGB"), N_("Color matrix sRGB"), samsung2Id, makerTags, signedLong, -1, printValue),
+ TagInfo(0xa032, "ColorMatrixAdobeRGB", N_("Color Matrix Adobe RGB"), N_("Color matrix Adobe RGB"), samsung2Id, makerTags, signedLong, -1, printValue),
+ TagInfo(0xa040, "ToneCurve1", N_("Tone Curve 1"), N_("Tone curve 1"), samsung2Id, makerTags, unsignedLong, -1, printValue),
+ TagInfo(0xa041, "ToneCurve2", N_("Tone Curve 2"), N_("Tone curve 2"), samsung2Id, makerTags, unsignedLong, -1, printValue),
+ TagInfo(0xa042, "ToneCurve3", N_("Tone Curve 3"), N_("Tone curve 3"), samsung2Id, makerTags, unsignedLong, -1, printValue),
+ TagInfo(0xa043, "ToneCurve4", N_("Tone Curve 4"), N_("Tone curve 4"), samsung2Id, makerTags, unsignedLong, -1, printValue),
// End of list marker
- TagInfo(0xffff, "(UnknownSamsung2MakerNoteTag)", "(UnknownSamsung2MakerNoteTag)",
- N_("Unknown Samsung2MakerNote tag"),
- samsung2Id, makerTags, undefined, -1, printValue)
+ TagInfo(0xffff, "(UnknownSamsung2MakerNoteTag)", "(UnknownSamsung2MakerNoteTag)", N_("Unknown Samsung2MakerNote tag"), samsung2Id, makerTags, undefined, -1, printValue)
};
const TagInfo* Samsung2MakerNote::tagList()
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list