[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:40:55 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=65c421e
The following commit has been merged in the master branch:
commit 65c421e6eed5867166342ebd2edf5e66154830d7
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Sun Nov 29 07:40:34 2009 +0000
#620: Fixed a few Nikon tag names.
---
src/nikonmn.cpp | 12 ++++++------
test/data/exifdata-test.out | 8 ++++----
test/data/exiv2-test.out | 10 +++++-----
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp
index 2b178d9..c61e0d0 100644
--- a/src/nikonmn.cpp
+++ b/src/nikonmn.cpp
@@ -551,11 +551,11 @@ namespace Exiv2 {
TagInfo(0x0085, "FocusDistance", N_("Focus Distance"), N_("Manual focus distance"), nikon3IfdId, makerTags, unsignedRational, print0x0085),
TagInfo(0x0086, "DigitalZoom", N_("Digital Zoom"), N_("Digital zoom setting"), nikon3IfdId, makerTags, unsignedRational, print0x0086),
TagInfo(0x0087, "FlashMode", N_("Flash Mode"), N_("Mode of flash used"), nikon3IfdId, makerTags, unsignedByte, EXV_PRINT_TAG(nikonFlashMode)),
- TagInfo(0x0088, "AFFocusPos", N_("AF Focus Position"), N_("AF focus position information"), nikon3IfdId, makerTags, undefined, print0x0088),
+ TagInfo(0x0088, "AFInfo", N_("AF Info"), N_("AF info"), nikon3IfdId, makerTags, undefined, printValue),
TagInfo(0x0089, "ShootingMode", N_("Shooting Mode"), N_("Shooting mode"), nikon3IfdId, makerTags, unsignedShort, print0x0089),
TagInfo(0x008a, "AutoBracketRelease", N_("Auto Bracket Release"), N_("Auto bracket release"), nikon3IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(nikonAutoBracketRelease)),
TagInfo(0x008b, "LensFStops", N_("Lens FStops"), N_("Lens FStops"), nikon3IfdId, makerTags, undefined, print0x008b),
- TagInfo(0x008c, "ToneCurve", N_("Tone Curve"), N_("Tone curve"), nikon3IfdId, makerTags, undefined, printValue),
+ TagInfo(0x008c, "ContrastCurve", N_("Contrast Curve"), N_("Contrast curve"), nikon3IfdId, makerTags, undefined, printValue),
TagInfo(0x008d, "ColorHue", N_("Color Hue"), N_("Color hue"), nikon3IfdId, makerTags, asciiString, printValue),
TagInfo(0x008f, "SceneMode", N_("Scene Mode"), N_("Scene mode"), nikon3IfdId, makerTags, asciiString, printValue),
TagInfo(0x0090, "LightSource", N_("Light Source"), N_("Light source"), nikon3IfdId, makerTags, asciiString, printValue),
@@ -564,7 +564,7 @@ namespace Exiv2 {
TagInfo(0x0093, "NEFCompression", N_("NEF Compression"), N_("NEF compression"), nikon3IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(nikonNefCompression)),
TagInfo(0x0094, "Saturation", N_("Saturation"), N_("Saturation"), nikon3IfdId, makerTags, signedShort, printValue),
TagInfo(0x0095, "NoiseReduction", N_("Noise Reduction"), N_("Noise reduction"), nikon3IfdId, makerTags, asciiString, printValue),
- TagInfo(0x0096, "CompressionCurve", N_("Compression Curve"), N_("Compression curve"), nikon3IfdId, makerTags, undefined, printValue),
+ TagInfo(0x0096, "LinearizationTable", N_("Linearization Table"), N_("Linearization table"), nikon3IfdId, makerTags, undefined, printValue),
TagInfo(0x0097, "ColorBalance", N_("Color Balance"), N_("Color balance"), nikon3IfdId, makerTags, undefined, printValue),
TagInfo(0x0098, "LensData", N_("Lens Data"), N_("Lens data settings"), nikon3IfdId, makerTags, undefined, printValue),
TagInfo(0x0099, "RawImageCenter", N_("Raw Image Center"), N_("Raw image center"), nikon3IfdId, makerTags, unsignedShort, printValue),
@@ -577,7 +577,7 @@ namespace Exiv2 {
TagInfo(0x00a2, "ImageDataSize", N_("Image Data Size"), N_("Image data size"), nikon3IfdId, makerTags, unsignedLong, printValue),
TagInfo(0x00a3, "0x00a3", "0x00a3", N_("Unknown"), nikon3IfdId, makerTags, unsignedByte, printValue),
TagInfo(0x00a5, "ImageCount", N_("Image Count"), N_("Image count"), nikon3IfdId, makerTags, unsignedLong, printValue),
- TagInfo(0x00a6, "DeleteImageCount", N_("Delete Image Count"), N_("Delete image count"), nikon3IfdId, makerTags, unsignedLong, printValue),
+ TagInfo(0x00a6, "DeletedImageCount", N_("Deleted Image Count"), N_("Deleted image count"), nikon3IfdId, makerTags, unsignedLong, printValue),
TagInfo(0x00a7, "ShutterCount", N_("Shutter Count"), N_("Number of shots taken by camera"), nikon3IfdId, makerTags, unsignedLong, printValue),
TagInfo(0x00a8, "FlashInfo", "Flash Info", N_("Flash info"), nikon3IfdId, makerTags, undefined, printValue),
TagInfo(0x00a9, "ImageOptimization", N_("Image Optimization"), N_("Image optimization"), nikon3IfdId, makerTags, asciiString, printValue),
@@ -588,7 +588,7 @@ namespace Exiv2 {
TagInfo(0x00b0, "MultiExposure", "Multi Exposure", N_("Multi exposure"), nikon3IfdId, makerTags, undefined, printValue),
TagInfo(0x00b1, "HighISONoiseReduction", N_("High ISO Noise Reduction"), N_("High ISO Noise Reduction"), nikon3IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(nikonHighISONoiseReduction)),
TagInfo(0x00b3, "ToningEffect", "Toning Effect", N_("Toning effect"), nikon3IfdId, makerTags, asciiString, printValue),
- TagInfo(0x00b7, "AFInfo", "AF Info", N_("AF info"), nikon3IfdId, makerTags, undefined, printValue),
+ TagInfo(0x00b7, "AFInfo2", "AF Info 2", N_("AF info 2"), nikon3IfdId, makerTags, undefined, printValue),
TagInfo(0x00b8, "FileInfo", "File Info", N_("File info"), nikon3IfdId, makerTags, undefined, printValue),
TagInfo(0x0e00, "PrintIM", N_("Print IM"), N_("PrintIM information"), nikon3IfdId, makerTags, undefined, printValue),
// TODO: Add Capture Data decoding implementation.
@@ -597,7 +597,7 @@ namespace Exiv2 {
// TODO: Add Capture Offsets decoding implementation.
TagInfo(0x0e0e, "CaptureOffsets", N_("Capture Offsets"), N_("Capture offsets"), nikon3IfdId, makerTags, undefined, printValue),
TagInfo(0x0e10, "ScanIFD", "Scan IFD", N_("Scan IFD"), nikon3IfdId, makerTags, undefined, printValue),
- TagInfo(0x0e1d, "CCProfile", "CC Profile", N_("CC profile"), nikon3IfdId, makerTags, undefined, printValue),
+ TagInfo(0x0e1d, "ICCProfile", "ICC Profile", N_("ICC profile"), nikon3IfdId, makerTags, undefined, printValue),
TagInfo(0x0e1e, "CaptureOutput", "Capture Output", N_("Capture output"), nikon3IfdId, makerTags, undefined, printValue),
// End of list marker
TagInfo(0xffff, "(UnknownNikon3MnTag)", "(UnknownNikon3MnTag)", N_("Unknown Nikon3MakerNote tag"), nikon3IfdId, makerTags, invalidTypeId, printValue)
diff --git a/test/data/exifdata-test.out b/test/data/exifdata-test.out
index d05cd0b..6283e3c 100644
--- a/test/data/exifdata-test.out
+++ b/test/data/exifdata-test.out
@@ -743,7 +743,7 @@ Exif.Nikon3.ToneComp 0x0081 Makernote Ascii 9
Exif.Nikon3.LensType 0x0083 Makernote Byte 1 6
Exif.Nikon3.Lens 0x0084 Makernote Rational 4 180/10 700/10 35/10 45/10
Exif.Nikon3.FlashMode 0x0087 Makernote Byte 1 0
-Exif.Nikon3.AFFocusPos 0x0088 Makernote Undefined 4 0 0 0 1
+Exif.Nikon3.AFInfo 0x0088 Makernote Undefined 4 0 0 0 1
Exif.Nikon3.ShootingMode 0x0089 Makernote Short 1 0
Exif.Nikon3.AutoBracketRelease 0x008a Makernote Short 1 0
Exif.Nikon3.LensFStops 0x008b Makernote Undefined 4 64 1 12 0
@@ -888,7 +888,7 @@ Exif.Nikon3.ToneComp 0x0081 Makernote Ascii 9
Exif.Nikon3.LensType 0x0083 Makernote Byte 1 6
Exif.Nikon3.Lens 0x0084 Makernote Rational 4 180/10 700/10 35/10 45/10
Exif.Nikon3.FlashMode 0x0087 Makernote Byte 1 0
-Exif.Nikon3.AFFocusPos 0x0088 Makernote Undefined 4 0 0 0 1
+Exif.Nikon3.AFInfo 0x0088 Makernote Undefined 4 0 0 0 1
Exif.Nikon3.ShootingMode 0x0089 Makernote Short 1 0
Exif.Nikon3.AutoBracketRelease 0x008a Makernote Short 1 0
Exif.Nikon3.LensFStops 0x008b Makernote Undefined 4 64 1 12 0
@@ -1034,7 +1034,7 @@ Exif.Nikon3.ToneComp 0x0081 Makernote Ascii 9
Exif.Nikon3.LensType 0x0083 Makernote Byte 1 6
Exif.Nikon3.Lens 0x0084 Makernote Rational 4 180/10 700/10 35/10 45/10
Exif.Nikon3.FlashMode 0x0087 Makernote Byte 1 0
-Exif.Nikon3.AFFocusPos 0x0088 Makernote Undefined 4 0 0 0 1
+Exif.Nikon3.AFInfo 0x0088 Makernote Undefined 4 0 0 0 1
Exif.Nikon3.ShootingMode 0x0089 Makernote Short 1 0
Exif.Nikon3.AutoBracketRelease 0x008a Makernote Short 1 0
Exif.Nikon3.LensFStops 0x008b Makernote Undefined 4 64 1 12 0
@@ -1180,7 +1180,7 @@ Exif.Nikon3.ToneComp 0x0081 Makernote Ascii 9
Exif.Nikon3.LensType 0x0083 Makernote Byte 1 6
Exif.Nikon3.Lens 0x0084 Makernote Rational 4 180/10 700/10 35/10 45/10
Exif.Nikon3.FlashMode 0x0087 Makernote Byte 1 0
-Exif.Nikon3.AFFocusPos 0x0088 Makernote Undefined 4 0 0 0 1
+Exif.Nikon3.AFInfo 0x0088 Makernote Undefined 4 0 0 0 1
Exif.Nikon3.ShootingMode 0x0089 Makernote Short 1 0
Exif.Nikon3.AutoBracketRelease 0x008a Makernote Short 1 0
Exif.Nikon3.LensFStops 0x008b Makernote Undefined 4 64 1 12 0
diff --git a/test/data/exiv2-test.out b/test/data/exiv2-test.out
index 47f09a3..16b7663 100644
--- a/test/data/exiv2-test.out
+++ b/test/data/exiv2-test.out
@@ -848,7 +848,7 @@ File 4/15: 20040329_224245.jpg
20040329_224245.jpg Exif.Nikon3.LensType Byte 1 D G
20040329_224245.jpg Exif.Nikon3.Lens Rational 4 18-70mm F3.5-4.5
20040329_224245.jpg Exif.Nikon3.FlashMode Byte 1 Did not fire
-20040329_224245.jpg Exif.Nikon3.AFFocusPos Undefined 4 Single area; Center used
+20040329_224245.jpg Exif.Nikon3.AFInfo Undefined 4 0 0 0 1
20040329_224245.jpg Exif.Nikon3.ShootingMode Short 1 Single-frame
20040329_224245.jpg Exif.Nikon3.AutoBracketRelease Short 1 None
20040329_224245.jpg Exif.Nikon3.LensFStops Undefined 4 5.33333
@@ -2422,7 +2422,7 @@ Compare image data and extracted data ------------------------------------
< 20040329_224245.jpg Exif.Nikon3.LensType Byte 1 D G
< 20040329_224245.jpg Exif.Nikon3.Lens Rational 4 18-70mm F3.5-4.5
< 20040329_224245.jpg Exif.Nikon3.FlashMode Byte 1 Did not fire
-< 20040329_224245.jpg Exif.Nikon3.AFFocusPos Undefined 4 Single area; Center used
+< 20040329_224245.jpg Exif.Nikon3.AFInfo Undefined 4 0 0 0 1
< 20040329_224245.jpg Exif.Nikon3.ShootingMode Short 1 Single-frame
< 20040329_224245.jpg Exif.Nikon3.AutoBracketRelease Short 1 None
< 20040329_224245.jpg Exif.Nikon3.LensFStops Undefined 4 5.33333
@@ -3924,7 +3924,7 @@ Compare image data and extracted data ------------------------------------
> 20040329_224245.exv Exif.Nikon3.LensType Byte 1 D G
> 20040329_224245.exv Exif.Nikon3.Lens Rational 4 18-70mm F3.5-4.5
> 20040329_224245.exv Exif.Nikon3.FlashMode Byte 1 Did not fire
-> 20040329_224245.exv Exif.Nikon3.AFFocusPos Undefined 4 Single area; Center used
+> 20040329_224245.exv Exif.Nikon3.AFInfo Undefined 4 0 0 0 1
> 20040329_224245.exv Exif.Nikon3.ShootingMode Short 1 Single-frame
> 20040329_224245.exv Exif.Nikon3.AutoBracketRelease Short 1 None
> 20040329_224245.exv Exif.Nikon3.LensFStops Undefined 4 5.33333
@@ -5646,7 +5646,7 @@ Compare original and inserted image data ---------------------------------
< 20040329_224245.jpg Exif.Nikon3.LensType Byte 1 D G
< 20040329_224245.jpg Exif.Nikon3.Lens Rational 4 18-70mm F3.5-4.5
< 20040329_224245.jpg Exif.Nikon3.FlashMode Byte 1 Did not fire
-< 20040329_224245.jpg Exif.Nikon3.AFFocusPos Undefined 4 Single area; Center used
+< 20040329_224245.jpg Exif.Nikon3.AFInfo Undefined 4 0 0 0 1
< 20040329_224245.jpg Exif.Nikon3.ShootingMode Short 1 Single-frame
< 20040329_224245.jpg Exif.Nikon3.AutoBracketRelease Short 1 None
< 20040329_224245.jpg Exif.Nikon3.LensFStops Undefined 4 5.33333
@@ -7148,7 +7148,7 @@ Compare original and inserted image data ---------------------------------
> 20040329_224245.exv Exif.Nikon3.LensType Byte 1 D G
> 20040329_224245.exv Exif.Nikon3.Lens Rational 4 18-70mm F3.5-4.5
> 20040329_224245.exv Exif.Nikon3.FlashMode Byte 1 Did not fire
-> 20040329_224245.exv Exif.Nikon3.AFFocusPos Undefined 4 Single area; Center used
+> 20040329_224245.exv Exif.Nikon3.AFInfo Undefined 4 0 0 0 1
> 20040329_224245.exv Exif.Nikon3.ShootingMode Short 1 Single-frame
> 20040329_224245.exv Exif.Nikon3.AutoBracketRelease Short 1 None
> 20040329_224245.exv Exif.Nikon3.LensFStops Undefined 4 5.33333
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list