[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:39:14 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=90adc97
The following commit has been merged in the master branch:
commit 90adc9721881b34eea2528e99b23563542292335
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Tue Jan 29 17:16:52 2008 +0000
Started to remove XMP TagDetails tables and use those from Exif instead.
---
src/properties.cpp | 51 ++++-----------------------------------------------
src/tags.cpp | 21 ++++++++++++++++++---
src/tags.hpp | 12 +++++++++---
3 files changed, 31 insertions(+), 53 deletions(-)
diff --git a/src/properties.cpp b/src/properties.cpp
index e6555b0..b59c318 100644
--- a/src/properties.cpp
+++ b/src/properties.cpp
@@ -446,49 +446,6 @@ namespace Exiv2 {
{ 0, 0, 0, invalidTypeId, xmpInternal, 0 }
};
- //! exif:ColorSpace
- extern const TagDetails xmpExifColorSpace[] = {
- { 1, N_("sRGB") },
- { 2, N_("Adobe RGB") }, // Not defined to Exif 2.2 spec. But used by a lot of cameras.
- { 65535, N_("Uncalibrated") }
- };
-
- //! exif:ComponentsConfiguration
- extern const TagDetails xmpExifComponentsConfiguration[] = {
- { 0, N_("does not exist") },
- { 1, "Y" },
- { 2, "Cb" },
- { 3, "Cr" },
- { 4, "R" },
- { 5, "G" },
- { 6, "B" }
- };
-
- //! exif:ExposureProgram
- extern const TagDetails xmpExifExposureProgram[] = {
- { 0, N_("not defined") },
- { 1, N_("Manual") },
- { 2, N_("Normal program") },
- { 3, N_("Aperture priority") },
- { 4, N_("Shutter priority") },
- { 5, N_("Creative program") },
- { 6, N_("Action program") },
- { 7, N_("Portrait mode") },
- { 8, N_("Landscape mode") }
- };
-
- //! exif:MeteringMode
- extern const TagDetails xmpExifMeteringMode[] = {
- { 0, N_("unknown") },
- { 1, N_("Average") },
- { 2, N_("Center weighted average") },
- { 3, N_("Spot") },
- { 4, N_("Multi-spot") },
- { 5, N_("Multi-segment") },
- { 6, N_("Partial") },
- { 255, N_("other") }
- };
-
//! exif:LightSource
extern const TagDetails xmpExifLightSource[] = {
{ 0, N_("unknown") },
@@ -788,15 +745,15 @@ namespace Exiv2 {
{"Xmp.crs.CropUnits", EXV_PRINT_TAG(xmpCrsCropUnits) },
{"Xmp.exif.ApertureValue", print0x9202 },
{"Xmp.exif.BrightnessValue", printFloat },
- {"Xmp.exif.ColorSpace", EXV_PRINT_TAG(xmpExifColorSpace) },
- {"Xmp.exif.ComponentsConfiguration", EXV_PRINT_TAG(xmpExifComponentsConfiguration) },
+ {"Xmp.exif.ColorSpace", print0xa001 },
+ {"Xmp.exif.ComponentsConfiguration", print0x9101 },
{"Xmp.exif.Contrast", EXV_PRINT_TAG(xmpExifNormalSoftHard) },
{"Xmp.exif.CreateDate", printXmpDate },
{"Xmp.exif.CustomRendered", EXV_PRINT_TAG(xmpExifCustomRendered) },
{"Xmp.exif.DateTimeOriginal", printXmpDate },
{"Xmp.exif.ExifVersion", printXmpVersion },
{"Xmp.exif.ExposureBiasValue", print0x9204 },
- {"Xmp.exif.ExposureProgram", EXV_PRINT_TAG(xmpExifExposureProgram) },
+ {"Xmp.exif.ExposureProgram", print0x8822 },
{"Xmp.exif.FileSource", EXV_PRINT_TAG(xmpExifFileSource) },
{"Xmp.exif.FlashpixVersion", printXmpVersion },
{"Xmp.exif.FNumber", print0x829d },
@@ -816,7 +773,7 @@ namespace Exiv2 {
{"Xmp.exif.GPSTimeStamp", printXmpDate },
{"Xmp.exif.GPSTrackRef", EXV_PRINT_TAG(xmpExifGPSDirection) },
{"Xmp.exif.LightSource", EXV_PRINT_TAG(xmpExifLightSource) },
- {"Xmp.exif.MeteringMode", EXV_PRINT_TAG(xmpExifMeteringMode) },
+ {"Xmp.exif.MeteringMode", print0x9207 },
{"Xmp.exif.ModifyDate", printXmpDate },
{"Xmp.exif.Saturation", EXV_PRINT_TAG(xmpExifSaturation) },
{"Xmp.exif.SceneCaptureType", EXV_PRINT_TAG(xmpExifSceneCaptureType) },
diff --git a/src/tags.cpp b/src/tags.cpp
index 3fd629a..1b1caba 100644
--- a/src/tags.cpp
+++ b/src/tags.cpp
@@ -714,7 +714,7 @@ namespace Exiv2 {
TagInfo(0x8822, "ExposureProgram", N_("Exposure Program"),
N_("The class of the program used by the camera to set exposure "
"when the picture is taken."),
- exifIfdId, captureCond, unsignedShort, EXV_PRINT_TAG(exifExposureProgram)),
+ exifIfdId, captureCond, unsignedShort, print0x8822),
TagInfo(0x8824, "SpectralSensitivity", N_("Spectral Sensitivity"),
N_("Indicates the spectral sensitivity of each channel of the "
"camera used. The tag value is an ASCII string compatible "
@@ -779,7 +779,7 @@ namespace Exiv2 {
exifIfdId, captureCond, unsignedRational, print0x9206),
TagInfo(0x9207, "MeteringMode", N_("Metering Mode"),
N_("The metering mode."),
- exifIfdId, captureCond, unsignedShort, EXV_PRINT_TAG(exifMeteringMode)),
+ exifIfdId, captureCond, unsignedShort, print0x9207),
TagInfo(0x9208, "LightSource", N_("Light Source"),
N_("The kind of light source."),
exifIfdId, captureCond, unsignedShort, EXV_PRINT_TAG(exifLightSource)),
@@ -823,7 +823,7 @@ namespace Exiv2 {
"sRGB is used, Uncalibrated is set. Image data "
"recorded as Uncalibrated can be treated as sRGB when it is "
"converted to FlashPix."),
- exifIfdId, imgCharacter, unsignedShort, EXV_PRINT_TAG(exifColorSpace)),
+ exifIfdId, imgCharacter, unsignedShort, print0xa001),
TagInfo(0xa002, "PixelXDimension", N_("Pixel X Dimension"),
N_("Information specific to compressed data. When a "
"compressed file is recorded, the valid width of the "
@@ -1896,6 +1896,11 @@ namespace Exiv2 {
return os;
}
+ std::ostream& print0x8822(std::ostream& os, const Value& value)
+ {
+ return EXV_PRINT_TAG(exifExposureProgram)(os, value);
+ }
+
std::ostream& print0x8827(std::ostream& os, const Value& value)
{
return os << value.toLong();
@@ -1986,6 +1991,11 @@ namespace Exiv2 {
return os;
}
+ std::ostream& print0x9207(std::ostream& os, const Value& value)
+ {
+ return EXV_PRINT_TAG(exifMeteringMode)(os, value);
+ }
+
std::ostream& print0x920a(std::ostream& os, const Value& value)
{
Rational length = value.toRational();
@@ -2018,6 +2028,11 @@ namespace Exiv2 {
return os;
}
+ std::ostream& print0xa001(std::ostream& os, const Value& value)
+ {
+ return EXV_PRINT_TAG(exifColorSpace)(os, value);
+ }
+
std::ostream& print0xa404(std::ostream& os, const Value& value)
{
Rational zoom = value.toRational();
diff --git a/src/tags.hpp b/src/tags.hpp
index da17f29..7bdbe06 100644
--- a/src/tags.hpp
+++ b/src/tags.hpp
@@ -444,7 +444,7 @@ namespace Exiv2 {
std::ostream& printDegrees(std::ostream& os, const Value& value);
//! Print function converting from UCS-2LE to UTF-8
std::ostream& printUcs2(std::ostream& os, const Value& value);
- //! Print function for Exif units (wrapper to be able to this also for XMP properties)
+ //! Print function for Exif units (wrapper to be able to use this also for XMP properties)
std::ostream& printExifUnit(std::ostream& os, const Value& value);
//! Print GPS version
std::ostream& print0x0000(std::ostream& os, const Value& value);
@@ -452,9 +452,9 @@ namespace Exiv2 {
std::ostream& print0x0006(std::ostream& os, const Value& value);
//! Print GPS timestamp
std::ostream& print0x0007(std::ostream& os, const Value& value);
- //! Print orientation (wrapper to be able to this also for XMP properties)
+ //! Print orientation (wrapper to be able to use this also for XMP properties)
std::ostream& print0x0112(std::ostream& os, const Value& value);
- //! Print YCbCrPositioning (wrapper to be able to this also for XMP properties)
+ //! Print YCbCrPositioning (wrapper to be able to use this also for XMP properties)
std::ostream& print0x0213(std::ostream& os, const Value& value);
//! Print the copyright
std::ostream& print0x8298(std::ostream& os, const Value& value);
@@ -462,6 +462,8 @@ namespace Exiv2 {
std::ostream& print0x829a(std::ostream& os, const Value& value);
//! Print the f-number
std::ostream& print0x829d(std::ostream& os, const Value& value);
+ //! Print exposure program (wrapper to be able to use this also for XMP properties)
+ std::ostream& print0x8822(std::ostream& os, const Value& value);
//! Print ISO speed ratings
std::ostream& print0x8827(std::ostream& os, const Value& value);
//! Print components configuration specific to compressed data
@@ -474,10 +476,14 @@ namespace Exiv2 {
std::ostream& print0x9204(std::ostream& os, const Value& value);
//! Print the subject distance
std::ostream& print0x9206(std::ostream& os, const Value& value);
+ //! Print metering mode (wrapper to be able to use this also for XMP properties)
+ std::ostream& print0x9207(std::ostream& os, const Value& value);
//! Print the actual focal length of the lens
std::ostream& print0x920a(std::ostream& os, const Value& value);
//! Print the user comment
std::ostream& print0x9286(std::ostream& os, const Value& value);
+ //! Print color space (wrapper to be able to use this also for XMP properties)
+ std::ostream& print0xa001(std::ostream& os, const Value& value);
//! Print digital zoom ratio
std::ostream& print0xa404(std::ostream& os, const Value& value);
//! Print 35mm equivalent focal length
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list