[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:44:21 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=c419885
The following commit has been merged in the master branch:
commit c41988539751528d6cd19f30cef2ba23d4768ee3
Author: nkbj <nkbj1970 at hotmail.com>
Date: Mon Sep 8 03:57:56 2014 +0000
Fix issues #929 and #972: Improve Panasonic makernotes support. Thanks goes to numerous people for patches and input.
---
src/panasonicmn.cpp | 454 +++++++++++++++++++++++++++++++++++++++++++----
src/panasonicmn_int.hpp | 16 ++
test/data/exiv2-test.out | 32 ++--
3 files changed, 452 insertions(+), 50 deletions(-)
diff --git a/src/panasonicmn.cpp b/src/panasonicmn.cpp
index 7f8624e..fcfab79 100644
--- a/src/panasonicmn.cpp
+++ b/src/panasonicmn.cpp
@@ -52,6 +52,7 @@ namespace Exiv2 {
//! Quality, tag 0x0001
extern const TagDetails panasonicQuality[] = {
+ { 1, N_("TIFF") },
{ 2, N_("High") },
{ 3, N_("Normal") },
{ 6, N_("Very High") },
@@ -69,7 +70,8 @@ namespace Exiv2 {
{ 8, N_("Flash") },
{ 10, N_("Black and white") },
{ 11, N_("Manual") },
- { 11, N_("Manual") } // To silence compiler warning
+ { 12, N_("Shade") },
+ { 13, N_("Kelvin") }
};
//! FocusMode, tag 0x0007
@@ -78,21 +80,26 @@ namespace Exiv2 {
{ 2, N_("Manual") },
{ 4, N_("Auto, focus button") },
{ 5, N_("Auto, continuous") },
- { 5, N_("Auto, continuous") } // To silence compiler warning
+ { 6, N_("AF-S") },
+ { 7, N_("AF-C") },
+ { 8, N_("AF-F") }
};
//! ImageStabilizer, tag 0x001a
extern const TagDetails panasonicImageStabilizer[] = {
{ 2, N_("On, Mode 1") },
{ 3, N_("Off") },
- { 4, N_("On, Mode 2") }
+ { 4, N_("On, Mode 2") },
+ { 5, N_("Panning") },
+ { 6, N_("On, Mode 3") },
};
//! Macro, tag 0x001c
extern const TagDetails panasonicMacro[] = {
{ 1, N_("On") },
{ 2, N_("Off") },
- { 257, N_("Tele-macro") }
+ { 257, N_("Tele-macro") },
+ { 513, N_("Macro-zoom") }
};
//! ShootingMode, tag 0x001f and SceneMode, tag 0x8001
@@ -113,6 +120,8 @@ namespace Exiv2 {
{ 13, N_("Panning") },
{ 14, N_("Simple") },
{ 15, N_("Color effects") },
+ { 16, N_("Self Portrait") },
+ { 17, N_("Economy") },
{ 18, N_("Fireworks") },
{ 19, N_("Party") },
{ 20, N_("Snow") },
@@ -130,14 +139,55 @@ namespace Exiv2 {
{ 32, N_("Sunset") },
{ 33, N_("Pet") },
{ 34, N_("Intelligent ISO") },
+ { 35, N_("Clipboard") },
{ 36, N_("High speed continuous shooting") },
{ 37, N_("Intelligent auto") },
+ { 39, N_("Multi-aspect") },
+ { 41, N_("Transform") },
+ { 42, N_("Flash Burst") },
+ { 43, N_("Pin Hole") },
+ { 44, N_("Film Grain") },
+ { 45, N_("My Color") },
+ { 46, N_("Photo Frame") },
+ { 51, N_("HDR") },
+ { 55, N_("Handheld Night Shot") },
+ { 57, N_("3D") },
+ { 59, N_("Creative Control") },
+ { 62, N_("Panorama") },
+ { 63, N_("Glass Through") },
+ { 64, N_("HDR") },
+ { 66, N_("Digital Filter") },
+ { 67, N_("Clear Portrait") },
+ { 68, N_("Silky Skin") },
+ { 69, N_("Backlit Softness") },
+ { 70, N_("Clear in Backlight") },
+ { 71, N_("Relaxing Tone") },
+ { 72, N_("Sweet Child's Face") },
+ { 73, N_("Distinct Scenery") },
+ { 74, N_("Bright Blue Sky") },
+ { 75, N_("Romantic Sunset Glow") },
+ { 76, N_("Vivid Sunset Glow") },
+ { 77, N_("Glistening Water") },
+ { 78, N_("Clear Nightscape") },
+ { 79, N_("Cool Night Sky") },
+ { 80, N_("Warm Glowing Nightscape") },
+ { 81, N_("Artistic Nightscape") },
+ { 82, N_("Glittering Illuminations") },
+ { 83, N_("Clear Night Portrait") },
+ { 84, N_("Soft Image of a Flower") },
+ { 85, N_("Appetizing Food") },
+ { 86, N_("Cute Desert") },
+ { 87, N_("Freeze Animal Motion") },
+ { 88, N_("Clear Sports Shot") },
+ { 89, N_("Monochrome") },
+ { 90, N_("Creative Control") }
};
//! Audio, tag 0x0020
extern const TagDetails panasonicAudio[] = {
- { 1, N_("Yes") },
- { 2, N_("No") }
+ { 1, N_("Yes") },
+ { 2, N_("No") },
+ { 3, N_("Stereo") }
};
//! ColorEffect, tag 0x0028
@@ -146,7 +196,8 @@ namespace Exiv2 {
{ 2, N_("Warm") },
{ 3, N_("Cool") },
{ 4, N_("Black and white") },
- { 5, N_("Sepia") }
+ { 5, N_("Sepia") },
+ { 6, N_("Happy") }
};
//! BustMode, tag 0x002a
@@ -180,18 +231,28 @@ namespace Exiv2 {
//! SelfTimer, tag 0x002e
extern const TagDetails panasonicSelfTimer[] = {
- { 1, N_("Off") },
- { 2, N_("10s") },
- { 3, N_("2s") }
+ { 1, N_("Off") },
+ { 2, N_("10 s") },
+ { 3, N_("2 s") },
+ { 4, N_("10 s / 3 pictures") }
};
//! Rotation, tag 0x0030
extern const TagDetails panasonicRotation[] = {
{ 1, N_("Horizontal (normal)") },
+ { 3, N_("Rotate 180") },
{ 6, N_("Rotate 90 CW") },
{ 8, N_("Rotate 270 CW") }
};
+ //! AFAssistLamp, tag 0x0031
+ extern const TagDetails panasonicAFAssistLamp[] = {
+ { 1, N_("Fired") },
+ { 2, N_("Enabled but Not Used") },
+ { 3, N_("Disabled but Required") },
+ { 4, N_("Disabled and Not Required") }
+ };
+
//! ColorMode, tag 0x0032
extern const TagDetails panasonicColorMode[] = {
{ 0, N_("Normal") },
@@ -220,15 +281,157 @@ namespace Exiv2 {
{ 2, N_("Destination") }
};
+ //! TextStamp, tag 0x003b, 0x003e, 000x8008 and 0x8009
+ extern const TagDetails panasonicTextStamp[] = {
+ { 1, N_("Off") },
+ { 2, N_("On") }
+ };
+
//! FilmMode, tag 0x0042
extern const TagDetails panasonicFilmMode[] = {
- { 1, N_("Standard (color)") },
- { 2, N_("Dynamic (color)") },
- { 3, N_("Nature (color)") },
- { 4, N_("Smooth (color)") },
- { 5, N_("Standard (B&W)") },
- { 6, N_("Dynamic (B&W)") },
- { 7, N_("Smooth (B&W)") }
+ { 1, N_("Standard (color)") },
+ { 2, N_("Dynamic (color)") },
+ { 3, N_("Nature (color)") },
+ { 4, N_("Smooth (color)") },
+ { 5, N_("Standard (B&W)") },
+ { 6, N_("Dynamic (B&W)") },
+ { 7, N_("Smooth (B&W)") },
+ { 10, N_("Nostalgic") },
+ { 11, N_("Vibrant") }
+ };
+
+ //! Bracket Settings, tag 0x0045
+ extern const TagDetails panasonicBracketSettings[] = {
+ { 0, N_("No Bracket") },
+ { 1, N_("3 images, Sequence 0/-/+") },
+ { 2, N_("3 images, Sequence -/0/+") },
+ { 3, N_("5 images, Sequence 0/-/+") },
+ { 4, N_("5 images, Sequence -/0/+") },
+ { 5, N_("7 images, Sequence 0/-/+") },
+ { 6, N_("7 images, Sequence -/0/+") }
+ };
+
+ //! Flash curtain, tag 0x0048
+ extern const TagDetails panasonicFlashCurtain[] = {
+ { 0, N_("n/a") },
+ { 1, N_("1st") },
+ { 2, N_("2nd") }
+ };
+
+ //! Long Shutter Noise Reduction, tag 0x0049
+ extern const TagDetails panasonicLongShutterNoiseReduction[] = {
+ { 1, N_("Off") },
+ { 2, N_("On") }
+ };
+
+ //! Intelligent exposure, tag 0x005d
+ extern const TagDetails panasonicIntelligentExposure[] = {
+ { 0, N_("Off") },
+ { 1, N_("Low") },
+ { 2, N_("Standard") },
+ { 3, N_("High") }
+ };
+
+ //! Flash warning, tag 0x0062
+ extern const TagDetails panasonicFlashWarning[] = {
+ { 0, N_("No") },
+ { 1, N_("Yes (flash required but disabled") }
+ };
+
+ //! Intelligent resolution, tag 0x0070
+ extern const TagDetails panasonicIntelligentResolution[] = {
+ { 0, N_("Off") },
+ { 1, N_("Low") },
+ { 2, N_("Standard") },
+ { 3, N_("High") },
+ { 4, N_("Extended") }
+ };
+
+ //! Intelligent D-Range, tag 0x0079
+ extern const TagDetails panasonicIntelligentDRange[] = {
+ { 0, N_("Off") },
+ { 1, N_("Low") },
+ { 2, N_("Standard") },
+ { 3, N_("High") }
+ };
+
+ //! Clear Retouch, tag 0x007c
+ extern const TagDetails panasonicClearRetouch[] = {
+ { 0, N_("Off") },
+ { 1, N_("On") }
+ };
+
+ //! Photo Style, tag 0x0089
+ extern const TagDetails panasonicPhotoStyle[] = {
+ { 0, N_("NoAuto") },
+ { 1, N_("Standard or Custom") },
+ { 2, N_("Vivid") },
+ { 3, N_("Natural") },
+ { 4, N_("Monochrome") },
+ { 5, N_("Scenery") },
+ { 6, N_("Portrait") }
+ };
+
+ //! Shading compensation, tag 0x008a
+ extern const TagDetails panasonicShadingCompensation[] = {
+ { 0, N_("Off") },
+ { 1, N_("On") }
+ };
+
+ //! Camera orientation, tag 0x008f
+ extern const TagDetails panasonicCameraOrientation[] = {
+ { 0, N_("Normal") },
+ { 1, N_("Rotate CW") },
+ { 2, N_("Rotate 180") },
+ { 3, N_("Rotate CCW") },
+ { 4, N_("Tilt upwards") },
+ { 5, N_("Tilt downwards") }
+ };
+
+ //! Sweep panorama direction, tag 0x0093
+ extern const TagDetails panasonicSweepPanoramaDirection[] = {
+ { 0, N_("Off") },
+ { 1, N_("Left to Right") },
+ { 2, N_("Right to Left") },
+ { 3, N_("Top to Bottom") },
+ { 4, N_("Bottom to Top") }
+ };
+
+ //! Timer recording, tag 0x0096
+ extern const TagDetails panasonicTimerRecording[] = {
+ { 0, N_("Off") },
+ { 1, N_("Time Lapse") },
+ { 2, N_("Stop-Motion Animation") }
+ };
+
+ //! HDR, tag 0x009e
+ extern const TagDetails panasonicHDR[] = {
+ { 0, N_("Off") },
+ { 100, N_("1 EV") },
+ { 200, N_("2 EV") },
+ { 300, N_("3 EV") },
+ { 32868, N_("1 EV (Auto)") },
+ { 32968, N_("2 EV (Auto)") },
+ { 33068, N_("3 EV (Auto)") }
+ };
+
+ //! Shutter Type, tag 0x009f
+ extern const TagDetails panasonicShutterType[] = {
+ { 0, N_("Mechanical") },
+ { 1, N_("Electronic") },
+ { 2, N_("Hybrid") }
+ };
+
+ //! Touch AE, tag 0x00ab
+ extern const TagDetails panasonicTouchAE[] = {
+ { 0, N_("Off") },
+ { 1, N_("On") }
+ };
+
+ //! Flash Fired, tag 0x8007
+ extern const TagDetails panasonicFlashFired[] = {
+ { 1, N_("No") },
+ { 2, N_("Yes") }
};
// Panasonic MakerNote Tag Info
@@ -247,11 +450,11 @@ namespace Exiv2 {
TagInfo(0x0022, "0x0022", "0x0022", N_("Unknown"), panasonicId, makerTags, unsignedShort, -1, printValue),
TagInfo(0x0023, "WhiteBalanceBias", N_("White Balance Bias"), N_("White balance adjustment"), panasonicId, makerTags, signedShort, -1, print0x0023),
TagInfo(0x0024, "FlashBias", N_("FlashBias"), N_("Flash bias"), panasonicId, makerTags, signedShort, -1, printValue),
- TagInfo(0x0025, "InternalSerialNumber", N_("Internal Serial Number"), N_("This number is unique, and contains the date of manufacture, but is not the same as the number printed on the camera body."), panasonicId, makerTags, undefined, -1, printValue),
+ TagInfo(0x0025, "InternalSerialNumber", N_("Internal Serial Number"), N_("This number is unique, and contains the date of manufacture, but is not the same as the number printed on the camera body."), panasonicId, makerTags, undefined, -1, printPanasonicText),
TagInfo(0x0026, "ExifVersion", "Exif Version", N_("Exif version"), panasonicId, makerTags, undefined, -1, printExifVersion),
TagInfo(0x0027, "0x0027", "0x0027", N_("Unknown"), panasonicId, makerTags, unsignedShort, -1, printValue),
TagInfo(0x0028, "ColorEffect", N_("Color Effect"), N_("Color effect"), panasonicId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicColorEffect)),
- TagInfo(0x0029, "TimeSincePowerOn", "Time since Power On", N_("Time in 1/100 s from when the camera was powered on to when the image is written to memory card"), panasonicId, makerTags, unsignedLong, -1, printValue),
+ TagInfo(0x0029, "TimeSincePowerOn", "Time since Power On", N_("Time in 1/100 s from when the camera was powered on to when the image is written to memory card"), panasonicId, makerTags, unsignedLong, -1, print0x0029),
TagInfo(0x002a, "BurstMode", N_("Burst Mode"), N_("Burst mode"), panasonicId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicBurstMode)),
TagInfo(0x002b, "SequenceNumber", N_("Sequence Number"), N_("Sequence number"), panasonicId, makerTags, unsignedLong, -1, printValue),
TagInfo(0x002c, "Contrast", N_("Contrast"), N_("Contrast setting"), panasonicId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicContrast)),
@@ -259,23 +462,70 @@ namespace Exiv2 {
TagInfo(0x002e, "SelfTimer", N_("Self Timer"), N_("Self timer"), panasonicId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicSelfTimer)),
TagInfo(0x002f, "0x002f", "0x002f", N_("Unknown"), panasonicId, makerTags, unsignedShort, -1, printValue),
TagInfo(0x0030, "Rotation", N_("Rotation"), N_("Rotation"), panasonicId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicRotation)),
- TagInfo(0x0031, "0x0031", "0x0031", N_("Unknown"), panasonicId, makerTags, unsignedShort, -1, printValue),
+ TagInfo(0x0031, "AFAssistLamp", N_("AF Assist Lamp"), N_("AF Assist Lamp"), panasonicId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicAFAssistLamp)),
TagInfo(0x0032, "ColorMode", N_("Color Mode"), N_("Color mode"), panasonicId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicColorMode)),
- TagInfo(0x0033, "BabyAge", N_("Baby Age"), N_("Baby (or pet) age"), panasonicId, makerTags, asciiString, -1, printValue),
+ TagInfo(0x0033, "BabyAge1", N_("Baby Age 1"), N_("Baby (or pet) age 1"), panasonicId, makerTags, asciiString, -1, print0x0033),
TagInfo(0x0034, "OpticalZoomMode", N_("Optical Zoom Mode"), N_("Optical zoom mode"), panasonicId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicOpticalZoomMode)),
TagInfo(0x0035, "ConversionLens", N_("Conversion Lens"), N_("Conversion lens"), panasonicId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicConversionLens)),
- TagInfo(0x0036, "TravelDay", N_("Travel Day"), N_("Travel day"), panasonicId, makerTags, unsignedShort, -1, printValue),
+ TagInfo(0x0036, "TravelDay", N_("Travel Day"), N_("Travel day"), panasonicId, makerTags, unsignedShort, -1, print0x0036),
TagInfo(0x0039, "Contrast", N_("Contrast"), N_("Contrast"), panasonicId, makerTags, unsignedShort, -1, printValue),
TagInfo(0x003a, "WorldTimeLocation", N_("World Time Location"), N_("World time location"), panasonicId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicWorldTimeLocation)),
- TagInfo(0x003c, "ProgramISO", N_("Program ISO"), N_("Program ISO"), panasonicId, makerTags, unsignedShort, -1, printValue),
+ TagInfo(0x003b, "TextStamp1", N_("Text Stamp 1"), N_("Text Stamp 1"), panasonicId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicTextStamp)),
+ TagInfo(0x003c, "ProgramISO", N_("Program ISO"), N_("Program ISO"), panasonicId, makerTags, unsignedShort, -1, print0x003c),
+ TagInfo(0x003d, "AdvancedSceneType", N_("Advanced Scene Type"), N_("Advanced Scene Type"), panasonicId, makerTags, unsignedShort, -1, printValue),
+ TagInfo(0x003e, "TextStamp2", N_("Text Stamp 2"), N_("Text Stamp 2"), panasonicId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicTextStamp)),
+ TagInfo(0x003f, "FacesDetected", N_("Faces detected"), N_("Faces detected"), panasonicId, makerTags, unsignedShort, -1, printValue),
TagInfo(0x0040, "Saturation", N_("Saturation"), N_("Saturation"), panasonicId, makerTags, unsignedShort, -1, printValue),
TagInfo(0x0041, "Sharpness", N_("Sharpness"), N_("Sharpness"), panasonicId, makerTags, unsignedShort, -1, printValue),
TagInfo(0x0042, "FilmMode", N_("Film Mode"), N_("Film mode"), panasonicId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicFilmMode)),
+ TagInfo(0x0044, "ColorTempKelvin", N_("Color Temp Kelvin"), N_("Color Temperatur in Kelvin"), panasonicId, makerTags, unsignedShort, -1, printValue),
+ TagInfo(0x0045, "BracketSettings", N_("Bracket Settings"), N_("Bracket Settings"), panasonicId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicBracketSettings)),
TagInfo(0x0046, "WBAdjustAB", N_("WB Adjust AB"), N_("WB adjust AB. Positive is a shift toward blue."), panasonicId, makerTags, unsignedShort, -1, printValue),
TagInfo(0x0047, "WBAdjustGM", N_("WB Adjust GM"), N_("WBAdjustGM. Positive is a shift toward green."), panasonicId, makerTags, unsignedShort, -1, printValue),
+ TagInfo(0x0048, "FlashCurtain", N_("Flash Curtain"), N_("Flash Curtain"), panasonicId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicFlashCurtain)),
+ TagInfo(0x0049, "LongShutterNoiseReduction", N_("Long Shutter Noise Reduction"), N_("Long Shutter Noise Reduction"), panasonicId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicLongShutterNoiseReduction)),
+ TagInfo(0x004b, "ImageWidth", N_("Image width"), N_("Image width"), panasonicId, makerTags, unsignedLong, -1, printValue),
+ TagInfo(0x004c, "ImageHeight", N_("Image height"), N_("Image height"), panasonicId, makerTags, unsignedLong, -1, printValue),
+ TagInfo(0x004d, "AFPointPosition", N_("AF Point Position"), N_("AF Point Position"), panasonicId, makerTags, unsignedRational, -1, printValue),
+ TagInfo(0x004e, "FaceDetInfo", N_("Face detection info"), N_("Face detection info"), panasonicId, makerTags, undefined, -1, printValue),
TagInfo(0x0051, "LensType", N_("Lens Type"), N_("Lens type"), panasonicId, makerTags, asciiString, -1, printValue),
TagInfo(0x0052, "LensSerialNumber", N_("Lens Serial Number"), N_("Lens serial number"), panasonicId, makerTags, asciiString, -1, printValue),
TagInfo(0x0053, "AccessoryType", N_("Accessory Type"), N_("Accessory type"), panasonicId, makerTags, asciiString, -1, printValue),
+ TagInfo(0x0054, "AccessorySerialNumber", N_("Accessory Serial Number"), N_("Accessory Serial Number"), panasonicId, makerTags, asciiString, -1, printValue),
+ TagInfo(0x0059, "Transform1", N_("Transform 1"), N_("Transform 1"), panasonicId, makerTags, undefined, -1, printValue),
+ TagInfo(0x005d, "IntelligentExposure", N_("Intelligent Exposure"), N_("Intelligent Exposure"), panasonicId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicIntelligentExposure)),
+ TagInfo(0x0060, "LensFirmwareVersion", N_("Firmware Version of the Lens"), N_("Firmware Version of the Lens"), panasonicId, makerTags, undefined, -1, printValue),
+ TagInfo(0x0061, "FaceRecInfo", N_("Face recognation info"), N_("Face recognation info"), panasonicId, makerTags, undefined, -1, printValue),
+ TagInfo(0x0062, "FlashWarning", N_("Flash Warning"), N_("Flash warning"), panasonicId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicFlashWarning)),
+ TagInfo(0x0065, "Title", N_("Title"), N_("Title"), panasonicId, makerTags, undefined, -1, printPanasonicText),
+ TagInfo(0x0066, "BabyName", N_("Baby Name"), N_("Baby name (or pet name)"), panasonicId, makerTags, undefined, -1, printPanasonicText),
+ TagInfo(0x0067, "Location", N_("Location"), N_("Location"), panasonicId, makerTags, undefined, -1, printPanasonicText),
+ TagInfo(0x0069, "Country", N_("Country"), N_("Country"), panasonicId, makerTags, undefined, -1, printPanasonicText),
+ TagInfo(0x006b, "State", N_("State"), N_("State"), panasonicId, makerTags, undefined, -1, printPanasonicText),
+ TagInfo(0x006d, "City", N_("City"), N_("City"), panasonicId, makerTags, undefined, -1, printPanasonicText),
+ TagInfo(0x006f, "Landmark", N_("Landmark"), N_("Landmark"), panasonicId, makerTags, undefined, -1, printPanasonicText),
+ TagInfo(0x0070, "IntelligentResolution", N_("Intelligent resolution"), N_("Intelligent resolution"), panasonicId, makerTags, unsignedByte, -1, EXV_PRINT_TAG(panasonicIntelligentResolution)),
+ TagInfo(0x0077, "BurstSheed", N_("Burst Speed"), N_("Burst Speed in pictures per second"), panasonicId, makerTags, unsignedShort, -1, printValue),
+ TagInfo(0x0079, "IntelligentDRange", N_("Intelligent Dynamic Range"), N_("Intelligent Dynamic Range"), panasonicId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicIntelligentDRange)),
+ TagInfo(0x007c, "ClearRetouch", N_("Clear Retouch"), N_("Clear Retouch"), panasonicId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicClearRetouch)),
+ TagInfo(0x0080, "City2", N_("City2"), N_("City2"), panasonicId, makerTags, undefined, -1, printPanasonicText),
+ TagInfo(0x0086, "ManometerPressure", N_("Manometer Pressure"), N_("Manometer pressure"), panasonicId, makerTags, unsignedShort, -1, printValue),
+ TagInfo(0x0089, "PhotoStyle", N_("Photo style"), N_("Photo style"), panasonicId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicPhotoStyle)),
+ TagInfo(0x008a, "ShadingCompensation", N_("Shading Compensation"), N_("Shading Compensation"), panasonicId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicShadingCompensation)),
+ TagInfo(0x008c, "AccelerometerZ", N_("Accelerometer Z"), N_("positive is acceleration upwards"), panasonicId, makerTags, unsignedShort, -1, printAccelerometer),
+ TagInfo(0x008d, "AccelerometerX", N_("Accelerometer X"), N_("positive is acceleration to the left"), panasonicId, makerTags, unsignedShort, -1, printAccelerometer),
+ TagInfo(0x008e, "AccelerometerY", N_("Accelerometer Y"), N_("positive is acceleration backwards"), panasonicId, makerTags, unsignedShort, -1, printAccelerometer),
+ TagInfo(0x008f, "CameraOrientation", N_("Camera Orientation"), N_("Camera Orientation"), panasonicId, makerTags, unsignedByte, -1, EXV_PRINT_TAG(panasonicCameraOrientation)),
+ TagInfo(0x0090, "RollAngle", N_("Roll Angle"), N_("degress of clockwise camera rotation"), panasonicId, makerTags, unsignedShort, -1, printRollAngle),
+ TagInfo(0x0091, "PitchAngle", N_("Pitch Angle"), N_("degress of upwards camera tilt"), panasonicId, makerTags, unsignedShort, -1, printPitchAngle),
+ TagInfo(0x0093, "SweepPanoramaDirection", N_("Sweep Panorama Direction"), N_("Sweep Panorama Direction"), panasonicId, makerTags, unsignedByte, -1, EXV_PRINT_TAG(panasonicSweepPanoramaDirection)),
+ TagInfo(0x0094, "PanoramaFieldOfView", N_("Field of View of Panorama"), N_("Field of View of Panorama"), panasonicId, makerTags, unsignedShort, -1, printValue),
+ TagInfo(0x0096, "TimerRecording", N_("Timer Recording"), N_("Timer Recording"), panasonicId, makerTags, unsignedByte, -1, EXV_PRINT_TAG(panasonicTimerRecording)),
+ TagInfo(0x009d, "InternalNDFilter", N_("Internal ND Filter"), N_("Internal ND Filter"), panasonicId, makerTags, unsignedRational, -1, printValue),
+ TagInfo(0x009e, "HDR", N_("HDR"), N_("HDR"), panasonicId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicHDR)),
+ TagInfo(0x009f, "ShutterType", N_("Shutter Type"), N_("Shutter Type"), panasonicId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicShutterType)),
+ TagInfo(0x00a3, "ClearRetouchValue", N_("Clear Retouch Value"), N_("Clear Retouch Value"), panasonicId, makerTags, unsignedRational, -1, printValue),
+ TagInfo(0x00ab, "TouchAE", N_("TouchAE"), N_("TouchAE"), panasonicId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicTouchAE)),
TagInfo(0x0e00, "PrintIM", N_("Print IM"), N_("PrintIM information"), panasonicId, makerTags, undefined, -1, printValue),
TagInfo(0x4449, "0x4449", "0x4449", N_("Unknown"), panasonicId, makerTags, undefined, -1, printValue),
TagInfo(0x8000, "MakerNoteVersion", N_("MakerNote Version"), N_("MakerNote version"), panasonicId, makerTags, undefined, -1, printExifVersion),
@@ -283,7 +533,11 @@ namespace Exiv2 {
TagInfo(0x8004, "WBRedLevel", N_("WB Red Level"), N_("WB red level"), panasonicId, makerTags, unsignedShort, -1, printValue),
TagInfo(0x8005, "WBGreenLevel", N_("WB Green Level"), N_("WB green level"), panasonicId, makerTags, unsignedShort, -1, printValue),
TagInfo(0x8006, "WBBlueLevel", N_("WB Blue Level"), N_("WB blue level"), panasonicId, makerTags, unsignedShort, -1, printValue),
- TagInfo(0x8010, "BabyAge", N_("Baby Age"), N_("Baby (or pet) age"), panasonicId, makerTags, asciiString, -1, printValue),
+ TagInfo(0x8007, "FlashFired", N_("Flash Fired"), N_("Flash Fired"), panasonicId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicFlashFired)),
+ TagInfo(0x8008, "TextStamp3", N_("Text Stamp 3"), N_("Text Stamp 3"), panasonicId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicTextStamp)),
+ TagInfo(0x8009, "TextStamp4", N_("Text Stamp 4"), N_("Text Stamp 4"), panasonicId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicTextStamp)),
+ TagInfo(0x8010, "BabyAge2", N_("Baby Age 2"), N_("Baby (or pet) age 2"), panasonicId, makerTags, asciiString, -1, print0x0033),
+ TagInfo(0x8012, "Transform2", N_("Transform 2"), N_("Transform 2"), panasonicId, makerTags, undefined, -1, printValue),
// End of list marker
TagInfo(0xffff, "(UnknownPanasonicMakerNoteTag)", "(UnknownPanasonicMakerNoteTag)", N_("Unknown PanasonicMakerNote tag"), panasonicId, makerTags, asciiString, -1, printValue)
};
@@ -293,6 +547,7 @@ namespace Exiv2 {
return tagInfo_;
}
+ // tag Focus Mode
std::ostream& PanasonicMakerNote::print0x000f(std::ostream& os,
const Value& value,
const ExifData*)
@@ -302,20 +557,24 @@ namespace Exiv2 {
}
long l0 = value.toLong(0);
long l1 = value.toLong(1);
- if (l0 == 0 && l1 == 1) os << _("Spot mode on");
- else if (l0 == 0 && l1 == 16) os << _("Spot mode off or 3-area (high speed)");
- else if (l0 == 1 && l1 == 0) os << _("Spot focussing");
- else if (l0 == 1 && l1 == 1) os << _("5-area");
- else if (l0 == 16 && l1 == 0) os << _("1-area");
- else if (l0 == 16 && l1 == 16) os << _("1-area (high speed)");
- else if (l0 == 32 && l1 == 0) os << _("3-area (auto)");
- else if (l0 == 32 && l1 == 1) os << _("3-area (left)");
- else if (l0 == 32 && l1 == 2) os << _("3-area (center)");
- else if (l0 == 32 && l1 == 3) os << _("3-area (right)");
+ if (l0 == 0 && l1 == 1) os << _("Spot mode on or 9 area");
+ else if (l0 == 0 && l1 == 16) os << _("Spot mode off or 3-area (high speed)");
+ else if (l0 == 0 && l1 == 23) os << _("23-area");
+ else if (l0 == 1 && l1 == 0) os << _("Spot focussing");
+ else if (l0 == 1 && l1 == 1) os << _("5-area");
+ else if (l0 == 16 && l1 == 0) os << _("1-area");
+ else if (l0 == 16 && l1 == 16) os << _("1-area (high speed)");
+ else if (l0 == 32 && l1 == 0) os << _("3-area (auto)");
+ else if (l0 == 32 && l1 == 1) os << _("3-area (left)");
+ else if (l0 == 32 && l1 == 2) os << _("3-area (center)");
+ else if (l0 == 32 && l1 == 3) os << _("3-area (right)");
+ else if (l0 == 64 && l1 == 0) os << _("Face Detect");
+ else if (l0 == 128 && l1 == 0) os << _("Spot Focusing 2");
else os << value;
return os;
} // PanasonicMakerNote::print0x000f
+ // tag White balance bias
std::ostream& PanasonicMakerNote::print0x0023(std::ostream& os,
const Value& value,
const ExifData*)
@@ -332,6 +591,133 @@ namespace Exiv2 {
} // PanasonicMakerNote::print0x0023
+ // Time since power on
+ std::ostream& PanasonicMakerNote::print0x0029(std::ostream& os,
+ const Value& value,
+ const ExifData*)
+ {
+ std::ostringstream oss;
+ oss.copyfmt(os);
+ long time=value.toLong();
+ os << std::setw(2) << std::setfill('0') << time / 360000 << ":"
+ << std::setw(2) << std::setfill('0') << (time % 360000) / 6000 << ":"
+ << std::setw(2) << std::setfill('0') << (time % 6000) / 100 << "."
+ << std::setw(2) << std::setfill('0') << time % 100;
+ os.copyfmt(oss);
+
+ return os;
+
+ } // PanasonicMakerNote::print0x0029
+
+ // bage age
+ std::ostream& PanasonicMakerNote::print0x0033(std::ostream& os,
+ const Value& value,
+ const ExifData*)
+ {
+ if(value.toString()=="9999:99:99 00:00:00")
+ {
+ os << N_("not set");
+ }
+ else
+ {
+ os << value;
+ };
+ return os;
+ } // PanasonicMakerNote::print0x0033
+
+ // Travel days
+ std::ostream& PanasonicMakerNote::print0x0036(std::ostream& os,
+ const Value& value,
+ const ExifData*)
+ {
+ if(value.toLong()==65535)
+ {
+ os << N_("not set");
+ }
+ else
+ {
+ os << value;
+ };
+ return os;
+ } // PanasonicMakerNote::print0x0036
+
+ // Program ISO
+ std::ostream& PanasonicMakerNote::print0x003c(std::ostream& os,
+ const Value& value,
+ const ExifData*)
+ {
+ switch(value.toLong())
+ {
+ case 65534:
+ os << N_("Intelligent ISO");
+ break;
+ case 65535:
+ os << N_("n/a");
+ break;
+ default:
+ os << value;
+ break;
+ };
+ return os;
+ } // PanasonicMakerNote::print0x003c
+
+ std::ostream& PanasonicMakerNote::printPanasonicText(std::ostream& os,
+ const Value& value,
+ const ExifData*)
+ {
+ if(value.size()>0 && value.typeId() == undefined)
+ {
+ for(long i=0; i< value.size(); i++)
+ {
+ if(value.toLong(i)==0)
+ {
+ break;
+ };
+ os << static_cast<char>(value.toLong(i));
+ };
+ return os;
+ }
+ else
+ {
+ return os << value;
+ };
+ } // PanasonicMakerNote::printPanasonicText
+
+ std::ostream& PanasonicMakerNote::printAccelerometer(std::ostream& os, const Value& value, const ExifData*)
+ {
+ // value is stored as unsigned int, but should be readed as signed int, so manually convert it
+ int i = value.toLong();
+ i = i - ((i & 0x8000) >> 15) * 0xffff;
+ return os << i;
+ } // PanasonicMakerNote::printAccelerometer
+
+ std::ostream& PanasonicMakerNote::printRollAngle(std::ostream& os, const Value& value, const ExifData*)
+ {
+ // roll angle is stored as signed int, but tag states to be unsigned int
+ int i = value.toLong();
+ i = i - ((i & 0x8000) >> 15) * 0xffff;
+ std::ostringstream oss;
+ oss.copyfmt(os);
+ os << std::fixed << std::setprecision(1) << i / 10.0;
+ os.copyfmt(oss);
+
+ return os;
+ } // PanasonicMakerNote::printRollAngle
+
+ std::ostream& PanasonicMakerNote::printPitchAngle(std::ostream& os, const Value& value, const ExifData*)
+ {
+ // pitch angle is stored as signed int, but tag states to be unsigned int
+ // change sign to be compatible with ExifTool: positive is upwards
+ int i = value.toLong();
+ i = i - ((i & 0x8000) >> 15) * 0xffff;
+ std::ostringstream oss;
+ oss.copyfmt(os);
+ os << std::fixed << std::setprecision(1) << -i / 10.0;
+ os.copyfmt(oss);
+
+ return os;
+ } // PanasonicMakerNote::printPitchAngle
+
// Panasonic MakerNote Tag Info
const TagInfo PanasonicMakerNote::tagInfoRaw_[] = {
TagInfo(0x0001, "Version", N_("Version"), N_("Panasonic raw version"), panaRawId, panaRaw, undefined, -1, printExifVersion),
diff --git a/src/panasonicmn_int.hpp b/src/panasonicmn_int.hpp
index 853292f..5b5baaf 100644
--- a/src/panasonicmn_int.hpp
+++ b/src/panasonicmn_int.hpp
@@ -65,6 +65,22 @@ namespace Exiv2 {
static std::ostream& print0x000f(std::ostream& os, const Value& value, const ExifData*);
//! Print WhiteBalanceBias
static std::ostream& print0x0023(std::ostream& os, const Value& value, const ExifData*);
+ //! Print TimeSincePowerOn
+ static std::ostream& print0x0029(std::ostream& os, const Value& value, const ExifData*);
+ //! Print Baby age
+ static std::ostream& print0x0033(std::ostream& os, const Value& value, const ExifData*);
+ //! Print Travel days
+ static std::ostream& print0x0036(std::ostream& os, const Value& value, const ExifData*);
+ //! Print ISO
+ static std::ostream& print0x003c(std::ostream& os, const Value& value, const ExifData*);
+ //! Print special text values: title, landmark, county and so on
+ static std::ostream& printPanasonicText(std::ostream& os, const Value& value, const ExifData*);
+ //! Print accerometer readings
+ static std::ostream& printAccelerometer(std::ostream& os, const Value& value, const ExifData*);
+ //! Print roll angle
+ static std::ostream& printRollAngle(std::ostream& os, const Value& value, const ExifData*);
+ //! Print pitch angle
+ static std::ostream& printPitchAngle(std::ostream& os, const Value& value, const ExifData*);
//@}
private:
diff --git a/test/data/exiv2-test.out b/test/data/exiv2-test.out
index eaa87e1..03e0766 100644
--- a/test/data/exiv2-test.out
+++ b/test/data/exiv2-test.out
@@ -21,7 +21,7 @@ Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301 USA
Exiv2 help ---------------------------------------------------------------
-Usage: exiv2 [ options ] [ action ] file ...
+Usage: lt-exiv2 [ options ] [ action ] file ...
Manipulate the Exif metadata of images.
@@ -1505,11 +1505,11 @@ File 11/15: 20050218_212016.jpg
20050218_212016.jpg Exif.Panasonic.0x0022 Short 1 0
20050218_212016.jpg Exif.Panasonic.WhiteBalanceBias Short 1 0 EV
20050218_212016.jpg Exif.Panasonic.FlashBias Short 1 0
-20050218_212016.jpg Exif.Panasonic.InternalSerialNumber Undefined 16 83 48 48 48 53 48 49 49 49 48 50 50 51 0 0 0
+20050218_212016.jpg Exif.Panasonic.InternalSerialNumber Undefined 16 S000501110223
20050218_212016.jpg Exif.Panasonic.ExifVersion Undefined 4 1.00
20050218_212016.jpg Exif.Panasonic.0x0027 Short 1 0
20050218_212016.jpg Exif.Panasonic.ColorEffect Short 1 Off
-20050218_212016.jpg Exif.Panasonic.TimeSincePowerOn Long 1 1450
+20050218_212016.jpg Exif.Panasonic.TimeSincePowerOn Long 1 00:00:14.50
20050218_212016.jpg Exif.Panasonic.BurstMode Short 1 Off
20050218_212016.jpg Exif.Panasonic.SequenceNumber Long 1 0
20050218_212016.jpg Exif.Panasonic.Contrast Short 1 Normal
@@ -1517,7 +1517,7 @@ File 11/15: 20050218_212016.jpg
20050218_212016.jpg Exif.Panasonic.SelfTimer Short 1 Off
20050218_212016.jpg Exif.Panasonic.0x002f Short 1 1
20050218_212016.jpg Exif.Panasonic.Rotation Short 1 Horizontal (normal)
-20050218_212016.jpg Exif.Panasonic.0x0031 Short 1 2
+20050218_212016.jpg Exif.Panasonic.AFAssistLamp Short 1 Enabled but Not Used
20050218_212016.jpg Exif.Panasonic.ColorMode Short 1 Normal
20050218_212016.jpg Exif.Photo.FlashpixVersion Undefined 4 1.00
20050218_212016.jpg Exif.Photo.ColorSpace Short 1 sRGB
@@ -3118,11 +3118,11 @@ Compare image data and extracted data ------------------------------------
< 20050218_212016.jpg Exif.Panasonic.0x0022 Short 1 0
< 20050218_212016.jpg Exif.Panasonic.WhiteBalanceBias Short 1 0 EV
< 20050218_212016.jpg Exif.Panasonic.FlashBias Short 1 0
-< 20050218_212016.jpg Exif.Panasonic.InternalSerialNumber Undefined 16 83 48 48 48 53 48 49 49 49 48 50 50 51 0 0 0
+< 20050218_212016.jpg Exif.Panasonic.InternalSerialNumber Undefined 16 S000501110223
< 20050218_212016.jpg Exif.Panasonic.ExifVersion Undefined 4 1.00
< 20050218_212016.jpg Exif.Panasonic.0x0027 Short 1 0
< 20050218_212016.jpg Exif.Panasonic.ColorEffect Short 1 Off
-< 20050218_212016.jpg Exif.Panasonic.TimeSincePowerOn Long 1 1450
+< 20050218_212016.jpg Exif.Panasonic.TimeSincePowerOn Long 1 00:00:14.50
< 20050218_212016.jpg Exif.Panasonic.BurstMode Short 1 Off
< 20050218_212016.jpg Exif.Panasonic.SequenceNumber Long 1 0
< 20050218_212016.jpg Exif.Panasonic.Contrast Short 1 Normal
@@ -3130,7 +3130,7 @@ Compare image data and extracted data ------------------------------------
< 20050218_212016.jpg Exif.Panasonic.SelfTimer Short 1 Off
< 20050218_212016.jpg Exif.Panasonic.0x002f Short 1 1
< 20050218_212016.jpg Exif.Panasonic.Rotation Short 1 Horizontal (normal)
-< 20050218_212016.jpg Exif.Panasonic.0x0031 Short 1 2
+< 20050218_212016.jpg Exif.Panasonic.AFAssistLamp Short 1 Enabled but Not Used
< 20050218_212016.jpg Exif.Panasonic.ColorMode Short 1 Normal
< 20050218_212016.jpg Exif.Photo.FlashpixVersion Undefined 4 1.00
< 20050218_212016.jpg Exif.Photo.ColorSpace Short 1 sRGB
@@ -4659,11 +4659,11 @@ Compare image data and extracted data ------------------------------------
> 20050218_212016.exv Exif.Panasonic.0x0022 Short 1 0
> 20050218_212016.exv Exif.Panasonic.WhiteBalanceBias Short 1 0 EV
> 20050218_212016.exv Exif.Panasonic.FlashBias Short 1 0
-> 20050218_212016.exv Exif.Panasonic.InternalSerialNumber Undefined 16 83 48 48 48 53 48 49 49 49 48 50 50 51 0 0 0
+> 20050218_212016.exv Exif.Panasonic.InternalSerialNumber Undefined 16 S000501110223
> 20050218_212016.exv Exif.Panasonic.ExifVersion Undefined 4 1.00
> 20050218_212016.exv Exif.Panasonic.0x0027 Short 1 0
> 20050218_212016.exv Exif.Panasonic.ColorEffect Short 1 Off
-> 20050218_212016.exv Exif.Panasonic.TimeSincePowerOn Long 1 1450
+> 20050218_212016.exv Exif.Panasonic.TimeSincePowerOn Long 1 00:00:14.50
> 20050218_212016.exv Exif.Panasonic.BurstMode Short 1 Off
> 20050218_212016.exv Exif.Panasonic.SequenceNumber Long 1 0
> 20050218_212016.exv Exif.Panasonic.Contrast Short 1 Normal
@@ -4671,7 +4671,7 @@ Compare image data and extracted data ------------------------------------
> 20050218_212016.exv Exif.Panasonic.SelfTimer Short 1 Off
> 20050218_212016.exv Exif.Panasonic.0x002f Short 1 1
> 20050218_212016.exv Exif.Panasonic.Rotation Short 1 Horizontal (normal)
-> 20050218_212016.exv Exif.Panasonic.0x0031 Short 1 2
+> 20050218_212016.exv Exif.Panasonic.AFAssistLamp Short 1 Enabled but Not Used
> 20050218_212016.exv Exif.Panasonic.ColorMode Short 1 Normal
> 20050218_212016.exv Exif.Photo.FlashpixVersion Undefined 4 1.00
> 20050218_212016.exv Exif.Photo.ColorSpace Short 1 sRGB
@@ -6420,11 +6420,11 @@ Compare original and inserted image data ---------------------------------
< 20050218_212016.jpg Exif.Panasonic.0x0022 Short 1 0
< 20050218_212016.jpg Exif.Panasonic.WhiteBalanceBias Short 1 0 EV
< 20050218_212016.jpg Exif.Panasonic.FlashBias Short 1 0
-< 20050218_212016.jpg Exif.Panasonic.InternalSerialNumber Undefined 16 83 48 48 48 53 48 49 49 49 48 50 50 51 0 0 0
+< 20050218_212016.jpg Exif.Panasonic.InternalSerialNumber Undefined 16 S000501110223
< 20050218_212016.jpg Exif.Panasonic.ExifVersion Undefined 4 1.00
< 20050218_212016.jpg Exif.Panasonic.0x0027 Short 1 0
< 20050218_212016.jpg Exif.Panasonic.ColorEffect Short 1 Off
-< 20050218_212016.jpg Exif.Panasonic.TimeSincePowerOn Long 1 1450
+< 20050218_212016.jpg Exif.Panasonic.TimeSincePowerOn Long 1 00:00:14.50
< 20050218_212016.jpg Exif.Panasonic.BurstMode Short 1 Off
< 20050218_212016.jpg Exif.Panasonic.SequenceNumber Long 1 0
< 20050218_212016.jpg Exif.Panasonic.Contrast Short 1 Normal
@@ -6432,7 +6432,7 @@ Compare original and inserted image data ---------------------------------
< 20050218_212016.jpg Exif.Panasonic.SelfTimer Short 1 Off
< 20050218_212016.jpg Exif.Panasonic.0x002f Short 1 1
< 20050218_212016.jpg Exif.Panasonic.Rotation Short 1 Horizontal (normal)
-< 20050218_212016.jpg Exif.Panasonic.0x0031 Short 1 2
+< 20050218_212016.jpg Exif.Panasonic.AFAssistLamp Short 1 Enabled but Not Used
< 20050218_212016.jpg Exif.Panasonic.ColorMode Short 1 Normal
< 20050218_212016.jpg Exif.Photo.FlashpixVersion Undefined 4 1.00
< 20050218_212016.jpg Exif.Photo.ColorSpace Short 1 sRGB
@@ -7961,11 +7961,11 @@ Compare original and inserted image data ---------------------------------
> 20050218_212016.exv Exif.Panasonic.0x0022 Short 1 0
> 20050218_212016.exv Exif.Panasonic.WhiteBalanceBias Short 1 0 EV
> 20050218_212016.exv Exif.Panasonic.FlashBias Short 1 0
-> 20050218_212016.exv Exif.Panasonic.InternalSerialNumber Undefined 16 83 48 48 48 53 48 49 49 49 48 50 50 51 0 0 0
+> 20050218_212016.exv Exif.Panasonic.InternalSerialNumber Undefined 16 S000501110223
> 20050218_212016.exv Exif.Panasonic.ExifVersion Undefined 4 1.00
> 20050218_212016.exv Exif.Panasonic.0x0027 Short 1 0
> 20050218_212016.exv Exif.Panasonic.ColorEffect Short 1 Off
-> 20050218_212016.exv Exif.Panasonic.TimeSincePowerOn Long 1 1450
+> 20050218_212016.exv Exif.Panasonic.TimeSincePowerOn Long 1 00:00:14.50
> 20050218_212016.exv Exif.Panasonic.BurstMode Short 1 Off
> 20050218_212016.exv Exif.Panasonic.SequenceNumber Long 1 0
> 20050218_212016.exv Exif.Panasonic.Contrast Short 1 Normal
@@ -7973,7 +7973,7 @@ Compare original and inserted image data ---------------------------------
> 20050218_212016.exv Exif.Panasonic.SelfTimer Short 1 Off
> 20050218_212016.exv Exif.Panasonic.0x002f Short 1 1
> 20050218_212016.exv Exif.Panasonic.Rotation Short 1 Horizontal (normal)
-> 20050218_212016.exv Exif.Panasonic.0x0031 Short 1 2
+> 20050218_212016.exv Exif.Panasonic.AFAssistLamp Short 1 Enabled but Not Used
> 20050218_212016.exv Exif.Panasonic.ColorMode Short 1 Normal
> 20050218_212016.exv Exif.Photo.FlashpixVersion Undefined 4 1.00
> 20050218_212016.exv Exif.Photo.ColorSpace Short 1 sRGB
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list