diff --git a/src/canonmn.cpp b/src/canonmn.cpp index e975a394..6673a58b 100644 --- a/src/canonmn.cpp +++ b/src/canonmn.cpp @@ -196,42 +196,42 @@ namespace Exiv2 { // Canon MakerNote Tag Info const TagInfo CanonMakerNote::tagInfo_[] = { - TagInfo(0x0000, "0x0000", "0x0000", N_("Unknown"), canonIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0001, "CameraSettings", N_("Camera Settings"), N_("Various camera settings"), canonIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0002, "FocalLength", N_("Focal Length"), N_("Focal length"), canonIfdId, makerTags, unsignedShort, printFocalLength), - TagInfo(0x0003, "0x0003", "0x0003", N_("Unknown"), canonIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0004, "ShotInfo", N_("Shot Info"), N_("Shot information"), canonIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0005, "Panorama", N_("Panorama"), N_("Panorama"), canonIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0006, "ImageType", N_("Image Type"), N_("Image type"), canonIfdId, makerTags, asciiString, printValue), - TagInfo(0x0007, "FirmwareVersion", N_("Firmware Version"), N_("Firmware version"), canonIfdId, makerTags, asciiString, printValue), - TagInfo(0x0008, "FileNumber", N_("File Number"), N_("File number"), canonIfdId, makerTags, unsignedLong, print0x0008), - TagInfo(0x0009, "OwnerName", N_("Owner Name"), N_("Owner Name"), canonIfdId, makerTags, asciiString, printValue), - TagInfo(0x000c, "SerialNumber", N_("Serial Number"), N_("Camera serial number"), canonIfdId, makerTags, unsignedLong, print0x000c), - TagInfo(0x000d, "CameraInfo", N_("Camera Info"), N_("Camera info"), canonIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x000f, "CustomFunctions", N_("Custom Functions"), N_("Custom Functions"), canonIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0010, "ModelID", N_("ModelID"), N_("Model ID"), canonIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(canonModelId)), - TagInfo(0x0012, "PictureInfo", N_("Picture Info"), N_("Picture info"), canonIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0013, "ThumbnailImageValidArea", N_("Thumbnail Image Valid Area"), N_("Thumbnail image valid area"), canonIfdId, makerTags, signedShort, printValue), - TagInfo(0x0015, "SerialNumberFormat", N_("Serial Number Format"), N_("Serial number format"), canonIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(canonSerialNumberFormat)), - TagInfo(0x001a, "SuperMacro", N_("Super Macro"), N_("Super macro"), canonIfdId, makerTags, signedShort, EXV_PRINT_TAG(canonSuperMacro)), - TagInfo(0x0026, "AFInfo", N_("AF Info"), N_("AF info"), canonIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0083, "OriginalDecisionDataOffset", N_("Original Decision Data Offset"), N_("Original decision data offset"), canonIfdId, makerTags, signedLong, printValue), - TagInfo(0x00a4, "WhiteBalanceTable", N_("White Balance Table"), N_("White balance table"), canonIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0095, "LensModel", N_("LensModel"), N_("LensModel"), canonIfdId, makerTags, asciiString, printValue), - TagInfo(0x0096, "InternalSerialNumber", N_("Internal Serial Number"), N_("Internal serial number"), canonIfdId, makerTags, asciiString, printValue), - TagInfo(0x0097, "DustRemovalData", N_("Dust Removal Data"), N_("Dust removal data"), canonIfdId, makerTags, asciiString, printValue), - TagInfo(0x0099, "CustomFunctions", N_("Custom Functions"), N_("Custom functions"), canonIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x00a0, "ProcessingInfo", N_("Processing Info"), N_("Processing info"), canonIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x00aa, "MeasuredColor", N_("Measured Color"), N_("Measured color"), canonIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x00b4, "ColorSpace", N_("ColorSpace"), N_("ColorSpace"), canonIfdId, makerTags, signedShort, EXV_PRINT_TAG(canonColorSpace)), - TagInfo(0x00b5, "0x00b5", "0x00b5", N_("Unknown"), canonIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x00c0, "0x00c0", "0x00c0", N_("Unknown"), canonIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x00c1, "0x00c1", "0x00c1", N_("Unknown"), canonIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x00d0, "VRDOffset", N_("VRD Offset"), N_("VRD offset"), canonIfdId, makerTags, unsignedLong, printValue), - TagInfo(0x00e0, "SensorInfo", N_("Sensor Info"), N_("Sensor info"), canonIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x4001, "ColorData", N_("Color Data"), N_("Color data"), canonIfdId, makerTags, unsignedShort, printValue), + TagInfo(0x0000, "0x0000", "0x0000", N_("Unknown"), canonIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0001, "CameraSettings", N_("Camera Settings"), N_("Various camera settings"), canonIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0002, "FocalLength", N_("Focal Length"), N_("Focal length"), canonIfdId, makerTags, unsignedShort, -1, printFocalLength), + TagInfo(0x0003, "0x0003", "0x0003", N_("Unknown"), canonIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0004, "ShotInfo", N_("Shot Info"), N_("Shot information"), canonIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0005, "Panorama", N_("Panorama"), N_("Panorama"), canonIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0006, "ImageType", N_("Image Type"), N_("Image type"), canonIfdId, makerTags, asciiString, -1, printValue), + TagInfo(0x0007, "FirmwareVersion", N_("Firmware Version"), N_("Firmware version"), canonIfdId, makerTags, asciiString, -1, printValue), + TagInfo(0x0008, "FileNumber", N_("File Number"), N_("File number"), canonIfdId, makerTags, unsignedLong, -1, print0x0008), + TagInfo(0x0009, "OwnerName", N_("Owner Name"), N_("Owner Name"), canonIfdId, makerTags, asciiString, -1, printValue), + TagInfo(0x000c, "SerialNumber", N_("Serial Number"), N_("Camera serial number"), canonIfdId, makerTags, unsignedLong, -1, print0x000c), + TagInfo(0x000d, "CameraInfo", N_("Camera Info"), N_("Camera info"), canonIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x000f, "CustomFunctions", N_("Custom Functions"), N_("Custom Functions"), canonIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0010, "ModelID", N_("ModelID"), N_("Model ID"), canonIfdId, makerTags, unsignedLong, -1, EXV_PRINT_TAG(canonModelId)), + TagInfo(0x0012, "PictureInfo", N_("Picture Info"), N_("Picture info"), canonIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0013, "ThumbnailImageValidArea", N_("Thumbnail Image Valid Area"), N_("Thumbnail image valid area"), canonIfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x0015, "SerialNumberFormat", N_("Serial Number Format"), N_("Serial number format"), canonIfdId, makerTags, unsignedLong, -1, EXV_PRINT_TAG(canonSerialNumberFormat)), + TagInfo(0x001a, "SuperMacro", N_("Super Macro"), N_("Super macro"), canonIfdId, makerTags, signedShort, -1, EXV_PRINT_TAG(canonSuperMacro)), + TagInfo(0x0026, "AFInfo", N_("AF Info"), N_("AF info"), canonIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0083, "OriginalDecisionDataOffset", N_("Original Decision Data Offset"), N_("Original decision data offset"), canonIfdId, makerTags, signedLong, -1, printValue), + TagInfo(0x00a4, "WhiteBalanceTable", N_("White Balance Table"), N_("White balance table"), canonIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0095, "LensModel", N_("LensModel"), N_("LensModel"), canonIfdId, makerTags, asciiString, -1, printValue), + TagInfo(0x0096, "InternalSerialNumber", N_("Internal Serial Number"), N_("Internal serial number"), canonIfdId, makerTags, asciiString, -1, printValue), + TagInfo(0x0097, "DustRemovalData", N_("Dust Removal Data"), N_("Dust removal data"), canonIfdId, makerTags, asciiString, -1, printValue), + TagInfo(0x0099, "CustomFunctions", N_("Custom Functions"), N_("Custom functions"), canonIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x00a0, "ProcessingInfo", N_("Processing Info"), N_("Processing info"), canonIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x00aa, "MeasuredColor", N_("Measured Color"), N_("Measured color"), canonIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x00b4, "ColorSpace", N_("ColorSpace"), N_("ColorSpace"), canonIfdId, makerTags, signedShort, -1, EXV_PRINT_TAG(canonColorSpace)), + TagInfo(0x00b5, "0x00b5", "0x00b5", N_("Unknown"), canonIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x00c0, "0x00c0", "0x00c0", N_("Unknown"), canonIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x00c1, "0x00c1", "0x00c1", N_("Unknown"), canonIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x00d0, "VRDOffset", N_("VRD Offset"), N_("VRD offset"), canonIfdId, makerTags, unsignedLong, -1, printValue), + TagInfo(0x00e0, "SensorInfo", N_("Sensor Info"), N_("Sensor info"), canonIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x4001, "ColorData", N_("Color Data"), N_("Color data"), canonIfdId, makerTags, unsignedShort, -1, printValue), // End of list marker - TagInfo(0xffff, "(UnknownCanonMakerNoteTag)", "(UnknownCanonMakerNoteTag)", N_("Unknown CanonMakerNote tag"), canonIfdId, makerTags, invalidTypeId, printValue) + TagInfo(0xffff, "(UnknownCanonMakerNoteTag)", "(UnknownCanonMakerNoteTag)", N_("Unknown CanonMakerNote tag"), canonIfdId, makerTags, invalidTypeId, -1, printValue) }; const TagInfo* CanonMakerNote::tagList() @@ -730,51 +730,51 @@ namespace Exiv2 { // Canon Camera Settings Tag Info const TagInfo CanonMakerNote::tagInfoCs_[] = { - TagInfo(0x0001, "Macro", N_("Macro"), N_("Macro mode"), canonCsIfdId, makerTags, signedShort, EXV_PRINT_TAG(canonCsMacro)), - TagInfo(0x0002, "Selftimer", N_("Selftimer"), N_("Self timer"), canonCsIfdId, makerTags, signedShort, printCs0x0002), - TagInfo(0x0003, "Quality", N_("Quality"), N_("Quality"), canonCsIfdId, makerTags, signedShort, EXV_PRINT_TAG(canonCsQuality)), - TagInfo(0x0004, "FlashMode", N_("Flash Mode"), N_("Flash mode setting"), canonCsIfdId, makerTags, signedShort, EXV_PRINT_TAG(canonCsFlashMode)), - TagInfo(0x0005, "DriveMode", N_("Drive Mode"), N_("Drive mode setting"), canonCsIfdId, makerTags, signedShort, EXV_PRINT_TAG(canonCsDriveMode)), - TagInfo(0x0006, "0x0006", "0x0006", N_("Unknown"), canonCsIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0007, "FocusMode", N_("Focus Mode"), N_("Focus mode setting"), canonCsIfdId, makerTags, signedShort, EXV_PRINT_TAG(canonCsFocusMode)), - TagInfo(0x0008, "0x0008", "0x0008", N_("Unknown"), canonCsIfdId, makerTags, signedShort, printValue), - TagInfo(0x0009, "0x0009", "0x0009", N_("Unknown"), canonCsIfdId, makerTags, signedShort, printValue), - TagInfo(0x000a, "ImageSize", N_("Image Size"), N_("Image size"), canonCsIfdId, makerTags, signedShort, EXV_PRINT_TAG(canonCsImageSize)), - TagInfo(0x000b, "EasyMode", N_("Easy Mode"), N_("Easy shooting mode"), canonCsIfdId, makerTags, signedShort, EXV_PRINT_TAG(canonCsEasyMode)), - TagInfo(0x000c, "DigitalZoom", N_("Digital Zoom"), N_("Digital zoom"), canonCsIfdId, makerTags, signedShort, EXV_PRINT_TAG(canonCsDigitalZoom)), - TagInfo(0x000d, "Contrast", N_("Contrast"), N_("Contrast setting"), canonCsIfdId, makerTags, signedShort, EXV_PRINT_TAG(canonCsLnh)), - TagInfo(0x000e, "Saturation", N_("Saturation"), N_("Saturation setting"), canonCsIfdId, makerTags, signedShort, EXV_PRINT_TAG(canonCsLnh)), - TagInfo(0x000f, "Sharpness", N_("Sharpness"), N_("Sharpness setting"), canonCsIfdId, makerTags, signedShort, EXV_PRINT_TAG(canonCsLnh)), - TagInfo(0x0010, "ISOSpeed", N_("ISO Speed Mode"), N_("ISO speed setting"), canonCsIfdId, makerTags, signedShort, EXV_PRINT_TAG(canonCsISOSpeed)), - TagInfo(0x0011, "MeteringMode", N_("Metering Mode"), N_("Metering mode setting"), canonCsIfdId, makerTags, signedShort, EXV_PRINT_TAG(canonCsMeteringMode)), - TagInfo(0x0012, "FocusType", N_("Focus Type"), N_("Focus type setting"), canonCsIfdId, makerTags, signedShort, EXV_PRINT_TAG(canonCsFocusType)), - TagInfo(0x0013, "AFPoint", N_("AF Point"), N_("AF point selected"), canonCsIfdId, makerTags, signedShort, EXV_PRINT_TAG(canonCsAfPoint)), - TagInfo(0x0014, "ExposureProgram", N_("Exposure Program"), N_("Exposure mode setting"), canonCsIfdId, makerTags, signedShort, EXV_PRINT_TAG(canonCsExposureProgram)), - TagInfo(0x0015, "0x0015", "0x0015", N_("Unknown"), canonCsIfdId, makerTags, signedShort, printValue), - TagInfo(0x0016, "LensType", N_("Lens Type"), N_("Lens type"), canonCsIfdId, makerTags, signedShort, printCsLensType), - TagInfo(0x0017, "Lens", N_("Lens"), N_("'long' and 'short' focal length of lens (in 'focal units') and 'focal units' per mm"), canonCsIfdId, makerTags, unsignedShort, printCsLens), - TagInfo(0x0018, "ShortFocal", N_("Short Focal"), N_("Short focal"), canonCsIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0019, "FocalUnits", N_("Focal Units"), N_("Focal units"), canonCsIfdId, makerTags, signedShort, printValue), - TagInfo(0x001a, "MaxAperture", N_("Max Aperture"), N_("Max aperture"), canonCsIfdId, makerTags, signedShort, printSi0x0015), - TagInfo(0x001b, "MinAperture", N_("Min Aperture"), N_("Min aperture"), canonCsIfdId, makerTags, signedShort, printSi0x0015), - TagInfo(0x001c, "FlashActivity", N_("Flash Activity"), N_("Flash activity"), canonCsIfdId, makerTags, signedShort, EXV_PRINT_TAG(canonCsFlashActivity)), - TagInfo(0x001d, "FlashDetails", N_("Flash Details"), N_("Flash details"), canonCsIfdId, makerTags, signedShort, EXV_PRINT_TAG_BITMASK(canonCsFlashDetails)), - TagInfo(0x001e, "0x001e", "0x001e", N_("Unknown"), canonCsIfdId, makerTags, signedShort, printValue), - TagInfo(0x001f, "0x001f", "0x001f", N_("Unknown"), canonCsIfdId, makerTags, signedShort, printValue), - TagInfo(0x0020, "FocusContinuous", N_("Focus Continuous"), N_("Focus continuous setting"), canonCsIfdId, makerTags, signedShort, EXV_PRINT_TAG(canonCsFocusContinuous)), - TagInfo(0x0021, "AESetting", N_("AESetting"), N_("AE setting"), canonCsIfdId, makerTags, signedShort, EXV_PRINT_TAG(canonCsAESetting)), - TagInfo(0x0022, "ImageStabilization", N_("Image Stabilization"), N_("Image stabilization"), canonCsIfdId, makerTags, signedShort, EXV_PRINT_TAG(canonCsImageStabilization)), - TagInfo(0x0023, "DisplayAperture", N_("Display Aperture"), N_("Display aperture"), canonCsIfdId, makerTags, signedShort, printValue), - TagInfo(0x0024, "ZoomSourceWidth", N_("Zoom Source Width"), N_("Zoom source width"), canonCsIfdId, makerTags, signedShort, printValue), - TagInfo(0x0025, "ZoomTargetWidth", N_("Zoom Target Width"), N_("Zoom target width"), canonCsIfdId, makerTags, signedShort, printValue), - TagInfo(0x0026, "0x0026", "0x0026", N_("Unknown"), canonCsIfdId, makerTags, signedShort, printValue), - TagInfo(0x0027, "SpotMeteringMode", N_("Spot Metering Mode"), N_("Spot metering mode"), canonCsIfdId, makerTags, signedShort, EXV_PRINT_TAG(canonCsSpotMeteringMode)), - TagInfo(0x0028, "PhotoEffect", N_("Photo Effect"), N_("Photo effect"), canonCsIfdId, makerTags, signedShort, EXV_PRINT_TAG(canonCsPhotoEffect)), - TagInfo(0x0029, "ManualFlashOutput", N_("Manual Flash Output"), N_("Manual flash output"), canonCsIfdId, makerTags, signedShort, EXV_PRINT_TAG(canonCsSRAWQuality)), - TagInfo(0x002a, "ColorTone", N_("Color Tone"), N_("Color tone"), canonCsIfdId, makerTags, signedShort, printValue), - TagInfo(0x002e, "SRAWQuality", N_("SRAW Quality Tone"), N_("SRAW quality"), canonCsIfdId, makerTags, signedShort, EXV_PRINT_TAG(canonCsSRAWQuality)), + TagInfo(0x0001, "Macro", N_("Macro"), N_("Macro mode"), canonCsIfdId, makerTags, signedShort, -1, EXV_PRINT_TAG(canonCsMacro)), + TagInfo(0x0002, "Selftimer", N_("Selftimer"), N_("Self timer"), canonCsIfdId, makerTags, signedShort, -1, printCs0x0002), + TagInfo(0x0003, "Quality", N_("Quality"), N_("Quality"), canonCsIfdId, makerTags, signedShort, -1, EXV_PRINT_TAG(canonCsQuality)), + TagInfo(0x0004, "FlashMode", N_("Flash Mode"), N_("Flash mode setting"), canonCsIfdId, makerTags, signedShort, -1, EXV_PRINT_TAG(canonCsFlashMode)), + TagInfo(0x0005, "DriveMode", N_("Drive Mode"), N_("Drive mode setting"), canonCsIfdId, makerTags, signedShort, -1, EXV_PRINT_TAG(canonCsDriveMode)), + TagInfo(0x0006, "0x0006", "0x0006", N_("Unknown"), canonCsIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0007, "FocusMode", N_("Focus Mode"), N_("Focus mode setting"), canonCsIfdId, makerTags, signedShort, -1, EXV_PRINT_TAG(canonCsFocusMode)), + TagInfo(0x0008, "0x0008", "0x0008", N_("Unknown"), canonCsIfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x0009, "0x0009", "0x0009", N_("Unknown"), canonCsIfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x000a, "ImageSize", N_("Image Size"), N_("Image size"), canonCsIfdId, makerTags, signedShort, -1, EXV_PRINT_TAG(canonCsImageSize)), + TagInfo(0x000b, "EasyMode", N_("Easy Mode"), N_("Easy shooting mode"), canonCsIfdId, makerTags, signedShort, -1, EXV_PRINT_TAG(canonCsEasyMode)), + TagInfo(0x000c, "DigitalZoom", N_("Digital Zoom"), N_("Digital zoom"), canonCsIfdId, makerTags, signedShort, -1, EXV_PRINT_TAG(canonCsDigitalZoom)), + TagInfo(0x000d, "Contrast", N_("Contrast"), N_("Contrast setting"), canonCsIfdId, makerTags, signedShort, -1, EXV_PRINT_TAG(canonCsLnh)), + TagInfo(0x000e, "Saturation", N_("Saturation"), N_("Saturation setting"), canonCsIfdId, makerTags, signedShort, -1, EXV_PRINT_TAG(canonCsLnh)), + TagInfo(0x000f, "Sharpness", N_("Sharpness"), N_("Sharpness setting"), canonCsIfdId, makerTags, signedShort, -1, EXV_PRINT_TAG(canonCsLnh)), + TagInfo(0x0010, "ISOSpeed", N_("ISO Speed Mode"), N_("ISO speed setting"), canonCsIfdId, makerTags, signedShort, -1, EXV_PRINT_TAG(canonCsISOSpeed)), + TagInfo(0x0011, "MeteringMode", N_("Metering Mode"), N_("Metering mode setting"), canonCsIfdId, makerTags, signedShort, -1, EXV_PRINT_TAG(canonCsMeteringMode)), + TagInfo(0x0012, "FocusType", N_("Focus Type"), N_("Focus type setting"), canonCsIfdId, makerTags, signedShort, -1, EXV_PRINT_TAG(canonCsFocusType)), + TagInfo(0x0013, "AFPoint", N_("AF Point"), N_("AF point selected"), canonCsIfdId, makerTags, signedShort, -1, EXV_PRINT_TAG(canonCsAfPoint)), + TagInfo(0x0014, "ExposureProgram", N_("Exposure Program"), N_("Exposure mode setting"), canonCsIfdId, makerTags, signedShort, -1, EXV_PRINT_TAG(canonCsExposureProgram)), + TagInfo(0x0015, "0x0015", "0x0015", N_("Unknown"), canonCsIfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x0016, "LensType", N_("Lens Type"), N_("Lens type"), canonCsIfdId, makerTags, signedShort, -1, printCsLensType), + TagInfo(0x0017, "Lens", N_("Lens"), N_("'long' and 'short' focal length of lens (in 'focal units') and 'focal units' per mm"), canonCsIfdId, makerTags, unsignedShort, -1, printCsLens), + TagInfo(0x0018, "ShortFocal", N_("Short Focal"), N_("Short focal"), canonCsIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0019, "FocalUnits", N_("Focal Units"), N_("Focal units"), canonCsIfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x001a, "MaxAperture", N_("Max Aperture"), N_("Max aperture"), canonCsIfdId, makerTags, signedShort, -1, printSi0x0015), + TagInfo(0x001b, "MinAperture", N_("Min Aperture"), N_("Min aperture"), canonCsIfdId, makerTags, signedShort, -1, printSi0x0015), + TagInfo(0x001c, "FlashActivity", N_("Flash Activity"), N_("Flash activity"), canonCsIfdId, makerTags, signedShort, -1, EXV_PRINT_TAG(canonCsFlashActivity)), + TagInfo(0x001d, "FlashDetails", N_("Flash Details"), N_("Flash details"), canonCsIfdId, makerTags, signedShort, -1, EXV_PRINT_TAG_BITMASK(canonCsFlashDetails)), + TagInfo(0x001e, "0x001e", "0x001e", N_("Unknown"), canonCsIfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x001f, "0x001f", "0x001f", N_("Unknown"), canonCsIfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x0020, "FocusContinuous", N_("Focus Continuous"), N_("Focus continuous setting"), canonCsIfdId, makerTags, signedShort, -1, EXV_PRINT_TAG(canonCsFocusContinuous)), + TagInfo(0x0021, "AESetting", N_("AESetting"), N_("AE setting"), canonCsIfdId, makerTags, signedShort, -1, EXV_PRINT_TAG(canonCsAESetting)), + TagInfo(0x0022, "ImageStabilization", N_("Image Stabilization"), N_("Image stabilization"), canonCsIfdId, makerTags, signedShort, -1, EXV_PRINT_TAG(canonCsImageStabilization)), + TagInfo(0x0023, "DisplayAperture", N_("Display Aperture"), N_("Display aperture"), canonCsIfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x0024, "ZoomSourceWidth", N_("Zoom Source Width"), N_("Zoom source width"), canonCsIfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x0025, "ZoomTargetWidth", N_("Zoom Target Width"), N_("Zoom target width"), canonCsIfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x0026, "0x0026", "0x0026", N_("Unknown"), canonCsIfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x0027, "SpotMeteringMode", N_("Spot Metering Mode"), N_("Spot metering mode"), canonCsIfdId, makerTags, signedShort, -1, EXV_PRINT_TAG(canonCsSpotMeteringMode)), + TagInfo(0x0028, "PhotoEffect", N_("Photo Effect"), N_("Photo effect"), canonCsIfdId, makerTags, signedShort, -1, EXV_PRINT_TAG(canonCsPhotoEffect)), + TagInfo(0x0029, "ManualFlashOutput", N_("Manual Flash Output"), N_("Manual flash output"), canonCsIfdId, makerTags, signedShort, -1, EXV_PRINT_TAG(canonCsSRAWQuality)), + TagInfo(0x002a, "ColorTone", N_("Color Tone"), N_("Color tone"), canonCsIfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x002e, "SRAWQuality", N_("SRAW Quality Tone"), N_("SRAW quality"), canonCsIfdId, makerTags, signedShort, -1, EXV_PRINT_TAG(canonCsSRAWQuality)), // End of list marker - TagInfo(0xffff, "(UnknownCanonCsTag)", "(UnknownCanonCsTag)", N_("Unknown Canon Camera Settings 1 tag"), canonCsIfdId, makerTags, invalidTypeId, printValue) + TagInfo(0xffff, "(UnknownCanonCsTag)", "(UnknownCanonCsTag)", N_("Unknown Canon Camera Settings 1 tag"), canonCsIfdId, makerTags, invalidTypeId, -1, printValue) }; const TagInfo* CanonMakerNote::tagListCs() @@ -837,34 +837,34 @@ namespace Exiv2 { // Canon Shot Info Tag const TagInfo CanonMakerNote::tagInfoSi_[] = { - TagInfo(0x0001, "0x0001", "0x0001", N_("Unknown"), canonSiIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0002, "ISOSpeed", N_("ISO Speed Used"), N_("ISO speed used"), canonSiIfdId, makerTags, unsignedShort, printSi0x0002), - TagInfo(0x0003, "MeasuredEV", N_("Measured EV"), N_("Measured EV"), canonSiIfdId, makerTags, unsignedShort, printSi0x0003), - TagInfo(0x0004, "TargetAperture", N_("Target Aperture"), N_("Target Aperture"), canonSiIfdId, makerTags, unsignedShort, printSi0x0015), - TagInfo(0x0005, "TargetShutterSpeed", N_("Target Shutter Speed"), N_("Target shutter speed"), canonSiIfdId, makerTags, unsignedShort, printSi0x0016), - TagInfo(0x0006, "0x0006", "0x0006", N_("Unknown"), canonSiIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0007, "WhiteBalance", N_("White Balance"), N_("White balance setting"), canonSiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(canonSiWhiteBalance)), - TagInfo(0x0008, "0x0008", "0x0008", N_("Unknown"), canonSiIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0009, "Sequence", N_("Sequence"), N_("Sequence number (if in a continuous burst)"), canonSiIfdId, makerTags, unsignedShort, printSi0x0009), - TagInfo(0x000a, "0x000a", "0x000a", N_("Unknown"), canonSiIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x000b, "0x000b", "0x000b", N_("Unknown"), canonSiIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x000c, "0x000c", "0x000c", N_("Unknown"), canonSiIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x000d, "0x000d", "0x000d", N_("Unknown"), canonSiIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x000e, "AFPointUsed", N_("AF Point Used"), N_("AF point used"), canonSiIfdId, makerTags, unsignedShort, printSi0x000e), - TagInfo(0x000f, "FlashBias", N_("Flash Bias"), N_("Flash bias"), canonSiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(canonSiFlashBias)), - TagInfo(0x0010, "0x0010", "0x0010", N_("Unknown"), canonSiIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0011, "0x0011", "0x0011", N_("Unknown"), canonSiIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0012, "0x0012", "0x0012", N_("Unknown"), canonSiIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0013, "SubjectDistance", N_("Subject Distance"), N_("Subject distance (units are not clear)"), canonSiIfdId, makerTags, unsignedShort, printSi0x0013), - TagInfo(0x0014, "0x0014", "0x0014", N_("Unknown"), canonSiIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0015, "ApertureValue", N_("Aperture Value"), N_("Aperture"), canonSiIfdId, makerTags, unsignedShort, printSi0x0015), - TagInfo(0x0016, "ShutterSpeedValue", N_("Shutter Speed Value"), N_("Shutter speed"), canonSiIfdId, makerTags, unsignedShort, printSi0x0016), - TagInfo(0x0017, "MeasuredEV2", N_("Measured EV 2"), N_("Measured EV 2"), canonSiIfdId, makerTags, unsignedShort, printSi0x0017), - TagInfo(0x0018, "0x0018", "0x0018", N_("Unknown"), canonSiIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0019, "0x0019", "0x0019", N_("Unknown"), canonSiIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x001a, "0x001a", "0x001a", N_("Unknown"), canonSiIfdId, makerTags, unsignedShort, printValue), + TagInfo(0x0001, "0x0001", "0x0001", N_("Unknown"), canonSiIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0002, "ISOSpeed", N_("ISO Speed Used"), N_("ISO speed used"), canonSiIfdId, makerTags, unsignedShort, -1, printSi0x0002), + TagInfo(0x0003, "MeasuredEV", N_("Measured EV"), N_("Measured EV"), canonSiIfdId, makerTags, unsignedShort, -1, printSi0x0003), + TagInfo(0x0004, "TargetAperture", N_("Target Aperture"), N_("Target Aperture"), canonSiIfdId, makerTags, unsignedShort, -1, printSi0x0015), + TagInfo(0x0005, "TargetShutterSpeed", N_("Target Shutter Speed"), N_("Target shutter speed"), canonSiIfdId, makerTags, unsignedShort, -1, printSi0x0016), + TagInfo(0x0006, "0x0006", "0x0006", N_("Unknown"), canonSiIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0007, "WhiteBalance", N_("White Balance"), N_("White balance setting"), canonSiIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(canonSiWhiteBalance)), + TagInfo(0x0008, "0x0008", "0x0008", N_("Unknown"), canonSiIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0009, "Sequence", N_("Sequence"), N_("Sequence number (if in a continuous burst)"), canonSiIfdId, makerTags, unsignedShort, -1, printSi0x0009), + TagInfo(0x000a, "0x000a", "0x000a", N_("Unknown"), canonSiIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x000b, "0x000b", "0x000b", N_("Unknown"), canonSiIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x000c, "0x000c", "0x000c", N_("Unknown"), canonSiIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x000d, "0x000d", "0x000d", N_("Unknown"), canonSiIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x000e, "AFPointUsed", N_("AF Point Used"), N_("AF point used"), canonSiIfdId, makerTags, unsignedShort, -1, printSi0x000e), + TagInfo(0x000f, "FlashBias", N_("Flash Bias"), N_("Flash bias"), canonSiIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(canonSiFlashBias)), + TagInfo(0x0010, "0x0010", "0x0010", N_("Unknown"), canonSiIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0011, "0x0011", "0x0011", N_("Unknown"), canonSiIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0012, "0x0012", "0x0012", N_("Unknown"), canonSiIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0013, "SubjectDistance", N_("Subject Distance"), N_("Subject distance (units are not clear)"), canonSiIfdId, makerTags, unsignedShort, -1, printSi0x0013), + TagInfo(0x0014, "0x0014", "0x0014", N_("Unknown"), canonSiIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0015, "ApertureValue", N_("Aperture Value"), N_("Aperture"), canonSiIfdId, makerTags, unsignedShort, -1, printSi0x0015), + TagInfo(0x0016, "ShutterSpeedValue", N_("Shutter Speed Value"), N_("Shutter speed"), canonSiIfdId, makerTags, unsignedShort, -1, printSi0x0016), + TagInfo(0x0017, "MeasuredEV2", N_("Measured EV 2"), N_("Measured EV 2"), canonSiIfdId, makerTags, unsignedShort, -1, printSi0x0017), + TagInfo(0x0018, "0x0018", "0x0018", N_("Unknown"), canonSiIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0019, "0x0019", "0x0019", N_("Unknown"), canonSiIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x001a, "0x001a", "0x001a", N_("Unknown"), canonSiIfdId, makerTags, unsignedShort, -1, printValue), // End of list marker - TagInfo(0xffff, "(UnknownCanonSiTag)", "(UnknownCanonSiTag)", N_("Unknown Canon Camera Settings 2 tag"), canonSiIfdId, makerTags, invalidTypeId, printValue) + TagInfo(0xffff, "(UnknownCanonSiTag)", "(UnknownCanonSiTag)", N_("Unknown Canon Camera Settings 2 tag"), canonSiIfdId, makerTags, invalidTypeId, -1, printValue) }; const TagInfo* CanonMakerNote::tagListSi() @@ -883,10 +883,10 @@ namespace Exiv2 { // Canon Panorama Info const TagInfo CanonMakerNote::tagInfoPa_[] = { - TagInfo(0x0002, "PanoramaFrame", N_("Panorama Frame"), N_("Panorama frame number"), canonPaIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0005, "PanoramaDirection", N_("Panorama Direction"), N_("Panorama direction"), canonPaIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(canonPaDirection)), + TagInfo(0x0002, "PanoramaFrame", N_("Panorama Frame"), N_("Panorama frame number"), canonPaIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0005, "PanoramaDirection", N_("Panorama Direction"), N_("Panorama direction"), canonPaIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(canonPaDirection)), // End of list marker - TagInfo(0xffff, "(UnknownCanonCs2Tag)", "(UnknownCanonCs2Tag)", N_("Unknown Canon Panorama tag"), canonPaIfdId, makerTags, invalidTypeId, printValue) + TagInfo(0xffff, "(UnknownCanonCs2Tag)", "(UnknownCanonCs2Tag)", N_("Unknown Canon Panorama tag"), canonPaIfdId, makerTags, invalidTypeId, -1, printValue) }; const TagInfo* CanonMakerNote::tagListPa() @@ -896,23 +896,23 @@ namespace Exiv2 { // Canon Custom Function Tag Info const TagInfo CanonMakerNote::tagInfoCf_[] = { - TagInfo(0x0001, "NoiseReduction", N_("Noise Reduction"), N_("Long exposure noise reduction"), canonCfIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0002, "ShutterAeLock", N_("Shutter Ae Lock"), N_("Shutter/AE lock buttons"), canonCfIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0003, "MirrorLockup", N_("Mirror Lockup"), N_("Mirror lockup"), canonCfIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0004, "ExposureLevelIncrements", N_("Exposure Level Increments"), N_("Tv/Av and exposure level"), canonCfIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0005, "AFAssist", N_("AF Assist"), N_("AF assist light"), canonCfIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0006, "FlashSyncSpeedAv", N_("Flash Sync Speed Av"), N_("Shutter speed in Av mode"), canonCfIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0007, "AEBSequence", N_("AEB Sequence"), N_("AEB sequence/auto cancellation"), canonCfIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0008, "ShutterCurtainSync", N_("Shutter Curtain Sync"), N_("Shutter curtain sync"), canonCfIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0009, "LensAFStopButton", N_("Lens AF Stop Button"), N_("Lens AF stop button Fn. Switch"), canonCfIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x000a, "FillFlashAutoReduction", N_("Fill Flash Auto Reduction"), N_("Auto reduction of fill flash"), canonCfIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x000b, "MenuButtonReturn", N_("Menu Button Return"), N_("Menu button return position"), canonCfIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x000c, "SetButtonFunction", N_("Set Button Function"), N_("SET button func. when shooting"), canonCfIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x000d, "SensorCleaning", N_("Sensor Cleaning"), N_("Sensor cleaning"), canonCfIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x000e, "SuperimposedDisplay", N_("Superimposed Display"), N_("Superimposed display"), canonCfIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x000f, "ShutterReleaseNoCFCard", N_("Shutter Release No CF Card"), N_("Shutter Release W/O CF Card"), canonCfIfdId, makerTags, unsignedShort, printValue), + TagInfo(0x0001, "NoiseReduction", N_("Noise Reduction"), N_("Long exposure noise reduction"), canonCfIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0002, "ShutterAeLock", N_("Shutter Ae Lock"), N_("Shutter/AE lock buttons"), canonCfIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0003, "MirrorLockup", N_("Mirror Lockup"), N_("Mirror lockup"), canonCfIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0004, "ExposureLevelIncrements", N_("Exposure Level Increments"), N_("Tv/Av and exposure level"), canonCfIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0005, "AFAssist", N_("AF Assist"), N_("AF assist light"), canonCfIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0006, "FlashSyncSpeedAv", N_("Flash Sync Speed Av"), N_("Shutter speed in Av mode"), canonCfIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0007, "AEBSequence", N_("AEB Sequence"), N_("AEB sequence/auto cancellation"), canonCfIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0008, "ShutterCurtainSync", N_("Shutter Curtain Sync"), N_("Shutter curtain sync"), canonCfIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0009, "LensAFStopButton", N_("Lens AF Stop Button"), N_("Lens AF stop button Fn. Switch"), canonCfIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x000a, "FillFlashAutoReduction", N_("Fill Flash Auto Reduction"), N_("Auto reduction of fill flash"), canonCfIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x000b, "MenuButtonReturn", N_("Menu Button Return"), N_("Menu button return position"), canonCfIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x000c, "SetButtonFunction", N_("Set Button Function"), N_("SET button func. when shooting"), canonCfIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x000d, "SensorCleaning", N_("Sensor Cleaning"), N_("Sensor cleaning"), canonCfIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x000e, "SuperimposedDisplay", N_("Superimposed Display"), N_("Superimposed display"), canonCfIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x000f, "ShutterReleaseNoCFCard", N_("Shutter Release No CF Card"), N_("Shutter Release W/O CF Card"), canonCfIfdId, makerTags, unsignedShort, -1, printValue), // End of list marker - TagInfo(0xffff, "(UnknownCanonCfTag)", "(UnknownCanonCfTag)", N_("Unknown Canon Custom Function tag"), canonCfIfdId, makerTags, invalidTypeId, printValue) + TagInfo(0xffff, "(UnknownCanonCfTag)", "(UnknownCanonCfTag)", N_("Unknown Canon Custom Function tag"), canonCfIfdId, makerTags, invalidTypeId, -1, printValue) }; const TagInfo* CanonMakerNote::tagListCf() @@ -946,14 +946,14 @@ namespace Exiv2 { // Canon Picture Info Tag const TagInfo CanonMakerNote::tagInfoPi_[] = { - TagInfo(0x0002, "ImageWidth", N_("Image Width"), N_("Image width"), canonPiIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0003, "ImageHeight", N_("Image Height"), N_("Image height"), canonPiIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0004, "ImageWidthAsShot", N_("Image Width As Shot"), N_("Image width (as shot)"), canonPiIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0005, "ImageHeightAsShot", N_("Image Height As Shot"), N_("Image height (as shot)"), canonPiIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0016, "AFPointsUsed", N_("AF Points Used"), N_("AF points used"), canonPiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG_BITMASK(canonPiAFPointsUsed)), - TagInfo(0x001a, "AFPointsUsed20D", N_("AF Points Used 20D"), N_("AF points used (20D)"), canonPiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG_BITMASK(canonPiAFPointsUsed20D)), + TagInfo(0x0002, "ImageWidth", N_("Image Width"), N_("Image width"), canonPiIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0003, "ImageHeight", N_("Image Height"), N_("Image height"), canonPiIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0004, "ImageWidthAsShot", N_("Image Width As Shot"), N_("Image width (as shot)"), canonPiIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0005, "ImageHeightAsShot", N_("Image Height As Shot"), N_("Image height (as shot)"), canonPiIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0016, "AFPointsUsed", N_("AF Points Used"), N_("AF points used"), canonPiIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG_BITMASK(canonPiAFPointsUsed)), + TagInfo(0x001a, "AFPointsUsed20D", N_("AF Points Used 20D"), N_("AF points used (20D)"), canonPiIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG_BITMASK(canonPiAFPointsUsed20D)), // End of list marker - TagInfo(0xffff, "(UnknownCanonPiTag)", "(UnknownCanonPiTag)", N_("Unknown Canon Picture Info tag"), canonPiIfdId, makerTags, invalidTypeId, printValue) + TagInfo(0xffff, "(UnknownCanonPiTag)", "(UnknownCanonPiTag)", N_("Unknown Canon Picture Info tag"), canonPiIfdId, makerTags, invalidTypeId, -1, printValue) }; const TagInfo* CanonMakerNote::tagListPi() @@ -1020,23 +1020,23 @@ namespace Exiv2 { // Canon File Info Tag const TagInfo CanonMakerNote::tagInfoFi_[] = { - TagInfo(0x0001, "FileNumber", N_("File Number"), N_("File Number"), canonFiIfdId, makerTags, unsignedLong, printFiFileNumber), - TagInfo(0x0003, "BracketMode", N_("Bracket Mode"), N_("Bracket Mode"), canonFiIfdId, makerTags, signedShort, EXV_PRINT_TAG(canonBracketMode)), - TagInfo(0x0004, "BracketValue", N_("Bracket Value"), N_("Bracket Value"), canonFiIfdId, makerTags, signedShort, printValue), - TagInfo(0x0005, "BracketShotNumber", N_("Bracket Shot Number"), N_("Bracket Shot Number"), canonFiIfdId, makerTags, signedShort, printValue), - TagInfo(0x0006, "RawJpgQuality", N_("Raw Jpg Quality"), N_("Raw Jpg Quality"), canonFiIfdId, makerTags, signedShort, EXV_PRINT_TAG(canonCsQuality)), - TagInfo(0x0007, "RawJpgSize", N_("Raw Jpg Size"), N_("Raw Jpg Size"), canonFiIfdId, makerTags, signedShort, EXV_PRINT_TAG(canonRawJpgSize)), - TagInfo(0x0008, "NoiseReduction", N_("Noise Reduction"), N_("Noise Reduction"), canonFiIfdId, makerTags, signedShort, EXV_PRINT_TAG(canonNoiseReduction)), - TagInfo(0x0009, "WBBracketMode", N_("WB Bracket Mode"), N_("WB Bracket Mode"), canonFiIfdId, makerTags, signedShort, EXV_PRINT_TAG(canonWBBracketMode)), - TagInfo(0x000c, "WBBracketValueAB", N_("WB Bracket Value AB"), N_("WB Bracket Value AB"), canonFiIfdId, makerTags, signedShort, printValue), - TagInfo(0x000d, "WBBracketValueGM", N_("WB Bracket Value GM"), N_("WB Bracket Value GM"), canonFiIfdId, makerTags, signedShort, printValue), - TagInfo(0x000e, "FilterEffect", N_("Filter Effect"), N_("Filter Effect"), canonFiIfdId, makerTags, signedShort, EXV_PRINT_TAG(canonFilterEffect)), - TagInfo(0x000f, "ToningEffect", N_("Toning Effect"), N_("Toning Effect"), canonFiIfdId, makerTags, signedShort, EXV_PRINT_TAG(canonToningEffect)), - TagInfo(0x0010, "MacroMagnification", N_("Macro Magnification"), N_("Macro magnification"), canonFiIfdId, makerTags, signedShort, printValue), - TagInfo(0x0013, "LiveViewShooting", N_("Live View Shooting"), N_("Live view shooting"), canonFiIfdId, makerTags, signedShort, EXV_PRINT_TAG(canonOffOn)), - TagInfo(0x0019, "FlashExposureLock", N_("Flash Exposure Lock"), N_("Flash exposure lock"), canonFiIfdId, makerTags, signedShort, EXV_PRINT_TAG(canonOffOn)), + TagInfo(0x0001, "FileNumber", N_("File Number"), N_("File Number"), canonFiIfdId, makerTags, unsignedLong, -1, printFiFileNumber), + TagInfo(0x0003, "BracketMode", N_("Bracket Mode"), N_("Bracket Mode"), canonFiIfdId, makerTags, signedShort, -1, EXV_PRINT_TAG(canonBracketMode)), + TagInfo(0x0004, "BracketValue", N_("Bracket Value"), N_("Bracket Value"), canonFiIfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x0005, "BracketShotNumber", N_("Bracket Shot Number"), N_("Bracket Shot Number"), canonFiIfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x0006, "RawJpgQuality", N_("Raw Jpg Quality"), N_("Raw Jpg Quality"), canonFiIfdId, makerTags, signedShort, -1, EXV_PRINT_TAG(canonCsQuality)), + TagInfo(0x0007, "RawJpgSize", N_("Raw Jpg Size"), N_("Raw Jpg Size"), canonFiIfdId, makerTags, signedShort, -1, EXV_PRINT_TAG(canonRawJpgSize)), + TagInfo(0x0008, "NoiseReduction", N_("Noise Reduction"), N_("Noise Reduction"), canonFiIfdId, makerTags, signedShort, -1, EXV_PRINT_TAG(canonNoiseReduction)), + TagInfo(0x0009, "WBBracketMode", N_("WB Bracket Mode"), N_("WB Bracket Mode"), canonFiIfdId, makerTags, signedShort, -1, EXV_PRINT_TAG(canonWBBracketMode)), + TagInfo(0x000c, "WBBracketValueAB", N_("WB Bracket Value AB"), N_("WB Bracket Value AB"), canonFiIfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x000d, "WBBracketValueGM", N_("WB Bracket Value GM"), N_("WB Bracket Value GM"), canonFiIfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x000e, "FilterEffect", N_("Filter Effect"), N_("Filter Effect"), canonFiIfdId, makerTags, signedShort, -1, EXV_PRINT_TAG(canonFilterEffect)), + TagInfo(0x000f, "ToningEffect", N_("Toning Effect"), N_("Toning Effect"), canonFiIfdId, makerTags, signedShort, -1, EXV_PRINT_TAG(canonToningEffect)), + TagInfo(0x0010, "MacroMagnification", N_("Macro Magnification"), N_("Macro magnification"), canonFiIfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x0013, "LiveViewShooting", N_("Live View Shooting"), N_("Live view shooting"), canonFiIfdId, makerTags, signedShort, -1, EXV_PRINT_TAG(canonOffOn)), + TagInfo(0x0019, "FlashExposureLock", N_("Flash Exposure Lock"), N_("Flash exposure lock"), canonFiIfdId, makerTags, signedShort, -1, EXV_PRINT_TAG(canonOffOn)), // End of list marker - TagInfo(0xffff, "(UnknownCanonFiTag)", "(UnknownCanonFiTag)", N_("Unknown Canon File Info tag"), canonFiIfdId, makerTags, invalidTypeId, printValue) + TagInfo(0xffff, "(UnknownCanonFiTag)", "(UnknownCanonFiTag)", N_("Unknown Canon File Info tag"), canonFiIfdId, makerTags, invalidTypeId, -1, printValue) }; const TagInfo* CanonMakerNote::tagListFi() @@ -1087,20 +1087,20 @@ namespace Exiv2 { // Canon Processing Info Tag const TagInfo CanonMakerNote::tagInfoPr_[] = { - TagInfo(0x0001, "ToneCurve", N_("ToneCurve"), N_("Tone curve"), canonPrIfdId, makerTags, signedShort, EXV_PRINT_TAG(canonToneCurve)), - TagInfo(0x0002, "Sharpness", N_("Sharpness"), N_("Sharpness"), canonPrIfdId, makerTags, signedShort, printValue), - TagInfo(0x0003, "SharpnessFrequency", N_("SharpnessFrequency"), N_("Sharpness frequency"), canonPrIfdId, makerTags, signedShort, EXV_PRINT_TAG(canonSharpnessFrequency)), - TagInfo(0x0004, "SensorRedLevel", N_("SensorRedLevel"), N_("Sensor red level"), canonPrIfdId, makerTags, signedShort, printValue), - TagInfo(0x0005, "SensorBlueLevel", N_("SensorBlueLevel"), N_("Sensor blue level"), canonPrIfdId, makerTags, signedShort, printValue), - TagInfo(0x0006, "WhiteBalanceRed", N_("WhiteBalanceRed"), N_("White balance red"), canonPrIfdId, makerTags, signedShort, printValue), - TagInfo(0x0007, "WhiteBalanceBlue", N_("WhiteBalanceBlue"), N_("White balance blue"), canonPrIfdId, makerTags, signedShort, printValue), - TagInfo(0x0008, "WhiteBalance", N_("WhiteBalance"), N_("White balance"), canonPrIfdId, makerTags, signedShort, EXV_PRINT_TAG(canonSiWhiteBalance)), - TagInfo(0x0009, "ColorTemperature", N_("ColorTemperature"), N_("Color Temperature"), canonPrIfdId, makerTags, signedShort, printValue), - TagInfo(0x000a, "PictureStyle", N_("PictureStyle"), N_("Picture style"), canonPrIfdId, makerTags, signedShort, EXV_PRINT_TAG(canonPictureStyle)), - TagInfo(0x000b, "DigitalGain", N_("DigitalGain"), N_("Digital gain"), canonPrIfdId, makerTags, signedShort, printValue), - TagInfo(0x000c, "WBShiftAB", N_("WBShiftAB"), N_("WBShift AB"), canonPrIfdId, makerTags, signedShort, printValue), - TagInfo(0x000d, "WBShiftGM", N_("WBShiftGM"), N_("WB Shift GM"), canonPrIfdId, makerTags, signedShort, printValue), - TagInfo(0xffff, "(UnknownCanonPrTag)", "(UnknownCanonPrTag)", N_("Unknown Canon Processing Info tag"), canonPrIfdId, makerTags, invalidTypeId, printValue) + TagInfo(0x0001, "ToneCurve", N_("ToneCurve"), N_("Tone curve"), canonPrIfdId, makerTags, signedShort, -1, EXV_PRINT_TAG(canonToneCurve)), + TagInfo(0x0002, "Sharpness", N_("Sharpness"), N_("Sharpness"), canonPrIfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x0003, "SharpnessFrequency", N_("SharpnessFrequency"), N_("Sharpness frequency"), canonPrIfdId, makerTags, signedShort, -1, EXV_PRINT_TAG(canonSharpnessFrequency)), + TagInfo(0x0004, "SensorRedLevel", N_("SensorRedLevel"), N_("Sensor red level"), canonPrIfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x0005, "SensorBlueLevel", N_("SensorBlueLevel"), N_("Sensor blue level"), canonPrIfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x0006, "WhiteBalanceRed", N_("WhiteBalanceRed"), N_("White balance red"), canonPrIfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x0007, "WhiteBalanceBlue", N_("WhiteBalanceBlue"), N_("White balance blue"), canonPrIfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x0008, "WhiteBalance", N_("WhiteBalance"), N_("White balance"), canonPrIfdId, makerTags, signedShort, -1, EXV_PRINT_TAG(canonSiWhiteBalance)), + TagInfo(0x0009, "ColorTemperature", N_("ColorTemperature"), N_("Color Temperature"), canonPrIfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x000a, "PictureStyle", N_("PictureStyle"), N_("Picture style"), canonPrIfdId, makerTags, signedShort, -1, EXV_PRINT_TAG(canonPictureStyle)), + TagInfo(0x000b, "DigitalGain", N_("DigitalGain"), N_("Digital gain"), canonPrIfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x000c, "WBShiftAB", N_("WBShiftAB"), N_("WBShift AB"), canonPrIfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x000d, "WBShiftGM", N_("WBShiftGM"), N_("WB Shift GM"), canonPrIfdId, makerTags, signedShort, -1, printValue), + TagInfo(0xffff, "(UnknownCanonPrTag)", "(UnknownCanonPrTag)", N_("Unknown Canon Processing Info tag"), canonPrIfdId, makerTags, invalidTypeId, -1, printValue) }; const TagInfo* CanonMakerNote::tagListPr() diff --git a/src/fujimn.cpp b/src/fujimn.cpp index 80de14ae..b7fa7738 100644 --- a/src/fujimn.cpp +++ b/src/fujimn.cpp @@ -175,109 +175,109 @@ namespace Exiv2 { const TagInfo FujiMakerNote::tagInfo_[] = { TagInfo(0x0000, "Version", N_("Version"), N_("Fujifilm Makernote version"), - fujiIfdId, makerTags, undefined, printValue), + fujiIfdId, makerTags, undefined, -1, printValue), TagInfo(0x0010, "SerialNumber", N_("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."), - fujiIfdId, makerTags, asciiString, printValue), + fujiIfdId, makerTags, asciiString, -1, printValue), TagInfo(0x1000, "Quality", N_("Quality"), N_("Image quality setting"), - fujiIfdId, makerTags, asciiString, printValue), + fujiIfdId, makerTags, asciiString, -1, printValue), TagInfo(0x1001, N_("Sharpness"), N_("Sharpness"), N_("Sharpness setting"), - fujiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(fujiSharpness)), + fujiIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(fujiSharpness)), TagInfo(0x1002, "WhiteBalance", N_("White Balance"), N_("White balance setting"), - fujiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(fujiWhiteBalance)), + fujiIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(fujiWhiteBalance)), TagInfo(0x1003, "Color", N_("Color"), N_("Chroma saturation setting"), - fujiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(fujiColor)), + fujiIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(fujiColor)), TagInfo(0x1004, "Tone", N_("Tone"), N_("Contrast setting"), - fujiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(fujiTone)), + fujiIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(fujiTone)), TagInfo(0x1010, "FlashMode", N_("Flash Mode"), N_("Flash firing mode setting"), - fujiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(fujiFlashMode)), + fujiIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(fujiFlashMode)), TagInfo(0x1011, "FlashStrength", N_("Flash Strength"), N_("Flash firing strength compensation setting"), - fujiIfdId, makerTags, signedRational, printValue), + fujiIfdId, makerTags, signedRational, -1, printValue), TagInfo(0x1020, "Macro", N_("Macro"), N_("Macro mode setting"), - fujiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(fujiOffOn)), + fujiIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(fujiOffOn)), TagInfo(0x1021, "FocusMode", N_("Focus Mode"), N_("Focusing mode setting"), - fujiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(fujiFocusMode)), + fujiIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(fujiFocusMode)), TagInfo(0x1022, "0x1022", "0x1022", N_("Unknown"), - fujiIfdId, makerTags, unsignedShort, printValue), + fujiIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x1030, "SlowSync", N_("Slow Sync"), N_("Slow synchro mode setting"), - fujiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(fujiOffOn)), + fujiIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(fujiOffOn)), TagInfo(0x1031, "PictureMode", N_("Picture Mode"), N_("Picture mode setting"), - fujiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(fujiPictureMode)), + fujiIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(fujiPictureMode)), TagInfo(0x1032, "0x1032", "0x1032", N_("Unknown"), - fujiIfdId, makerTags, unsignedShort, printValue), + fujiIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x1100, "Continuous", N_("Continuous"), N_("Continuous shooting or auto bracketing setting"), - fujiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(fujiContinuous)), + fujiIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(fujiContinuous)), TagInfo(0x1101, "SequenceNumber", N_("Sequence Number"), N_("Sequence number"), - fujiIfdId, makerTags, unsignedShort, printValue), + fujiIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x1200, "0x1200", "0x1200", N_("Unknown"), - fujiIfdId, makerTags, unsignedShort, printValue), + fujiIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x1210, "FinePixColor", N_("FinePix Color"), N_("Fuji FinePix color setting"), - fujiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(fujiFinePixColor)), + fujiIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(fujiFinePixColor)), TagInfo(0x1300, "BlurWarning", N_("Blur Warning"), N_("Blur warning status"), - fujiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(fujiOffOn)), + fujiIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(fujiOffOn)), TagInfo(0x1301, "FocusWarning", N_("Focus Warning"), N_("Auto Focus warning status"), - fujiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(fujiOffOn)), + fujiIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(fujiOffOn)), TagInfo(0x1302, "ExposureWarning", N_("Exposure Warning"), N_("Auto exposure warning status"), - fujiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(fujiOffOn)), + fujiIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(fujiOffOn)), TagInfo(0x1400, "DynamicRange", N_("Dynamic Range"), N_("Dynamic range"), - fujiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(fujiDynamicRange)), + fujiIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(fujiDynamicRange)), TagInfo(0x1401, "FilmMode", N_("Film Mode"), N_("Film mode"), - fujiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(fujiFilmMode)), + fujiIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(fujiFilmMode)), TagInfo(0x1402, "DynamicRangeSetting", N_("Dynamic Range Setting"), N_("Dynamic range settings"), - fujiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(fujiDynamicRangeSetting)), + fujiIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(fujiDynamicRangeSetting)), TagInfo(0x1403, "DevelopmentDynamicRange", N_("Development Dynamic Range"), N_("Development dynamic range"), - fujiIfdId, makerTags, unsignedShort, printValue), + fujiIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x1404, "MinFocalLength", N_("Minimum Focal Length"), N_("Minimum focal length"), - fujiIfdId, makerTags, unsignedRational, printValue), + fujiIfdId, makerTags, unsignedRational, -1, printValue), TagInfo(0x1405, "MaxFocalLength", N_("Maximum Focal Length"), N_("Maximum focal length"), - fujiIfdId, makerTags, unsignedRational, printValue), + fujiIfdId, makerTags, unsignedRational, -1, printValue), TagInfo(0x1406, "MaxApertureAtMinFocal", N_("Maximum Aperture at Mininimum Focal"), N_("Maximum aperture at mininimum focal"), - fujiIfdId, makerTags, unsignedRational, printValue), + fujiIfdId, makerTags, unsignedRational, -1, printValue), TagInfo(0x1407, "MaxApertureAtMaxFocal", N_("Maximum Aperture at Maxinimum Focal"), N_("Maximum aperture at maxinimum focal"), - fujiIfdId, makerTags, unsignedRational, printValue), + fujiIfdId, makerTags, unsignedRational, -1, printValue), TagInfo(0x8000, "FileSource", N_("File Source"), N_("File source"), - fujiIfdId, makerTags, asciiString, printValue), + fujiIfdId, makerTags, asciiString, -1, printValue), TagInfo(0x8002, "OrderNumber", N_("Order Number"), N_("Order number"), - fujiIfdId, makerTags, unsignedLong, printValue), + fujiIfdId, makerTags, unsignedLong, -1, printValue), TagInfo(0x8003, "FrameNumber", N_("Frame Number"), N_("Frame number"), - fujiIfdId, makerTags, unsignedShort, printValue), + fujiIfdId, makerTags, unsignedShort, -1, printValue), // End of list marker TagInfo(0xffff, "(UnknownFujiMakerNoteTag)", "(UnknownFujiMakerNoteTag)", N_("Unknown FujiMakerNote tag"), - fujiIfdId, makerTags, invalidTypeId, printValue) + fujiIfdId, makerTags, invalidTypeId, -1, printValue) }; const TagInfo* FujiMakerNote::tagList() diff --git a/src/minoltamn.cpp b/src/minoltamn.cpp index e0ef1186..cda15dec 100644 --- a/src/minoltamn.cpp +++ b/src/minoltamn.cpp @@ -89,105 +89,105 @@ namespace Exiv2 { const TagInfo MinoltaMakerNote::tagInfo_[] = { TagInfo(0x0000, "Version", N_("Makernote Version"), N_("String 'MLT0' (not null terminated)"), - minoltaIfdId, makerTags, undefined, printValue), + minoltaIfdId, makerTags, undefined, -1, printValue), TagInfo(0x0001, "CameraSettingsStdOld", N_("Camera Settings (Std Old)"), N_("Standard Camera settings (Old Camera models like D5, D7, S304, and S404)"), - minoltaIfdId, makerTags, undefined, printValue), + minoltaIfdId, makerTags, undefined, -1, printValue), TagInfo(0x0003, "CameraSettingsStdNew", N_("Camera Settings (Std New)"), N_("Standard Camera settings (New Camera Models like D7u, D7i, and D7hi)"), - minoltaIfdId, makerTags, undefined, printValue), + minoltaIfdId, makerTags, undefined, -1, printValue), TagInfo(0x0004, "CameraSettings7D", N_("Camera Settings (7D)"), N_("Camera Settings (for Dynax 7D model)"), - minoltaIfdId, makerTags, undefined, printValue), + minoltaIfdId, makerTags, undefined, -1, printValue), TagInfo(0x0018, "ImageStabilizationData", N_("Image Stabilization Data"), N_("Image stabilization data"), - minoltaIfdId, makerTags, undefined, printValue), + minoltaIfdId, makerTags, undefined, -1, printValue), // TODO: Implement WB Info A100 tags decoding. TagInfo(0x0020, "WBInfoA100", N_("WB Info A100"), N_("White balance information for the Sony DSLR-A100"), - minoltaIfdId, makerTags, undefined, printValue), + minoltaIfdId, makerTags, undefined, -1, printValue), TagInfo(0x0040, "CompressedImageSize", N_("Compressed Image Size"), N_("Compressed image size"), - minoltaIfdId, makerTags, unsignedLong, printValue), + minoltaIfdId, makerTags, unsignedLong, -1, printValue), TagInfo(0x0081, "Thumbnail", N_("Thumbnail"), N_("Jpeg thumbnail 640x480 pixels"), - minoltaIfdId, makerTags, undefined, printValue), + minoltaIfdId, makerTags, undefined, -1, printValue), TagInfo(0x0088, "ThumbnailOffset", N_("Thumbnail Offset"), N_("Offset of the thumbnail"), - minoltaIfdId, makerTags, unsignedLong, printValue), + minoltaIfdId, makerTags, unsignedLong, -1, printValue), TagInfo(0x0089, "ThumbnailLength", N_("Thumbnail Length"), N_("Size of the thumbnail"), - minoltaIfdId, makerTags, unsignedLong, printValue), + minoltaIfdId, makerTags, unsignedLong, -1, printValue), TagInfo(0x0100, "SceneMode", N_("Scene Mode"), N_("Scene Mode"), - minoltaIfdId, makerTags, unsignedLong, printMinoltaSonySceneMode), + minoltaIfdId, makerTags, unsignedLong, -1, printMinoltaSonySceneMode), // TODO: for A100, use Sony table from printMinoltaSonyColorMode(). TagInfo(0x0101, "ColorMode", N_("Color Mode"), N_("Color mode"), - minoltaIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaColorMode)), + minoltaIfdId, makerTags, unsignedLong, -1, EXV_PRINT_TAG(minoltaColorMode)), TagInfo(0x0102, "Quality", N_("Image Quality"), N_("Image quality"), - minoltaIfdId, makerTags, unsignedLong, printMinoltaSonyImageQuality), + minoltaIfdId, makerTags, unsignedLong, -1, printMinoltaSonyImageQuality), // TODO: Tag 0x0103 : quality or image size (see ExifTool doc). TagInfo(0x0103, "0x0103", N_("0x0103"), N_("0x0103"), - minoltaIfdId, makerTags, unsignedLong, printValue), + minoltaIfdId, makerTags, unsignedLong, -1, printValue), TagInfo(0x0104, "FlashExposureComp", N_("Flash Exposure Compensation"), N_("Flash exposure compensation in EV"), - minoltaIfdId, makerTags, signedRational, print0x9204), + minoltaIfdId, makerTags, signedRational, -1, print0x9204), TagInfo(0x0105, "Teleconverter", N_("Teleconverter Model"), N_("Teleconverter Model"), - minoltaIfdId, makerTags, unsignedLong, printMinoltaSonyTeleconverterModel), + minoltaIfdId, makerTags, unsignedLong, -1, printMinoltaSonyTeleconverterModel), TagInfo(0x0107, "ImageStabilization", N_("Image Stabilization"), N_("Image stabilization"), - minoltaIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaImageStabilization)), + minoltaIfdId, makerTags, unsignedLong, -1, EXV_PRINT_TAG(minoltaImageStabilization)), TagInfo(0x0109, "RawAndJpgRecording", N_("RAW+JPG Recording"), N_("RAW and JPG files recording"), - minoltaIfdId, makerTags, unsignedLong, printMinoltaSonyBoolValue), + minoltaIfdId, makerTags, unsignedLong, -1, printMinoltaSonyBoolValue), TagInfo(0x010a, "ZoneMatching", N_("Zone Matching"), N_("Zone matching"), - minoltaIfdId, makerTags, unsignedLong, printMinoltaSonyZoneMatching), + minoltaIfdId, makerTags, unsignedLong, -1, printMinoltaSonyZoneMatching), TagInfo(0x010b, "ColorTemperature", N_("Color Temperature"), N_("Color temperature"), - minoltaIfdId, makerTags, unsignedLong, printValue), + minoltaIfdId, makerTags, unsignedLong, -1, printValue), TagInfo(0x010c, "LensID", N_("Lens ID"), N_("Lens identifier"), - minoltaIfdId, makerTags, unsignedLong, printMinoltaSonyLensID), + minoltaIfdId, makerTags, unsignedLong, -1, printMinoltaSonyLensID), TagInfo(0x0111, "ColorCompensationFilter", N_("Color Compensation Filter"), N_("Color Compensation Filter: negative is green, positive is magenta"), - minoltaIfdId, makerTags, unsignedLong, printValue), + minoltaIfdId, makerTags, unsignedLong, -1, printValue), TagInfo(0x0112, "WhiteBalanceFineTune", N_("White Balance Fine Tune"), N_("White Balance Fine Tune Value"), - minoltaIfdId, makerTags, unsignedLong, printValue), + minoltaIfdId, makerTags, unsignedLong, -1, printValue), TagInfo(0x0113, "ImageStabilizationA100", N_("Image Stabilization A100"), N_("Image Stabilization for the Sony DSLR-A100"), - minoltaIfdId, makerTags, unsignedLong, printMinoltaSonyBoolValue), + minoltaIfdId, makerTags, unsignedLong, -1, printMinoltaSonyBoolValue), // TODO: implement CameraSettingsA100 tags decoding. TagInfo(0x0114, "CameraSettings5D", N_("Camera Settings (5D)"), N_("Camera Settings (for Dynax 5D model)"), - minoltaIfdId, makerTags, undefined, printValue), + minoltaIfdId, makerTags, undefined, -1, printValue), TagInfo(0x0115, "WhiteBalance", N_("White Balance"), N_("White balance"), - minoltaIfdId, makerTags, unsignedLong, printMinoltaSonyWhiteBalanceStd), + minoltaIfdId, makerTags, unsignedLong, -1, printMinoltaSonyWhiteBalanceStd), TagInfo(0x0e00, "PrintIM", N_("Print IM"), N_("PrintIM information"), - minoltaIfdId, makerTags, undefined, printValue), + minoltaIfdId, makerTags, undefined, -1, printValue), TagInfo(0x0f00, "CameraSettingsZ1", N_("Camera Settings (Z1)"), N_("Camera Settings (for Z1, DImage X, and F100 models)"), - minoltaIfdId, makerTags, undefined, printValue), + minoltaIfdId, makerTags, undefined, -1, printValue), // End of list marker TagInfo(0xffff, "(UnknownMinoltaMakerNoteTag)", "(UnknownMinoltaMakerNoteTag)", N_("Unknown Minolta MakerNote tag"), - minoltaIfdId, makerTags, invalidTypeId, printValue) + minoltaIfdId, makerTags, invalidTypeId, -1, printValue) }; const TagInfo* MinoltaMakerNote::tagList() @@ -489,159 +489,159 @@ namespace Exiv2 { const TagInfo MinoltaMakerNote::tagInfoCsStd_[] = { TagInfo(0x0001, "ExposureMode", N_("Exposure Mode"), N_("Exposure mode"), - minoltaCsNewIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaExposureModeStd)), + minoltaCsNewIfdId, makerTags, unsignedLong, -1, EXV_PRINT_TAG(minoltaExposureModeStd)), TagInfo(0x0002, "FlashMode", N_("Flash Mode"), N_("Flash mode"), - minoltaCsNewIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaFlashModeStd)), + minoltaCsNewIfdId, makerTags, unsignedLong, -1, EXV_PRINT_TAG(minoltaFlashModeStd)), TagInfo(0x0003, "WhiteBalance", N_("White Balance"), N_("White balance"), - minoltaCsNewIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaWhiteBalanceStd)), + minoltaCsNewIfdId, makerTags, unsignedLong, -1, EXV_PRINT_TAG(minoltaWhiteBalanceStd)), TagInfo(0x0004, "ImageSize", N_("Image Size"), N_("Image size"), - minoltaCsNewIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaImageSizeStd)), + minoltaCsNewIfdId, makerTags, unsignedLong, -1, EXV_PRINT_TAG(minoltaImageSizeStd)), TagInfo(0x0005, "Quality", N_("Image Quality"), N_("Image quality"), - minoltaCsNewIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaImageQualityStd)), + minoltaCsNewIfdId, makerTags, unsignedLong, -1, EXV_PRINT_TAG(minoltaImageQualityStd)), TagInfo(0x0006, "DriveMode", N_("Drive Mode"), N_("Drive mode"), - minoltaCsNewIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaDriveModeStd)), + minoltaCsNewIfdId, makerTags, unsignedLong, -1, EXV_PRINT_TAG(minoltaDriveModeStd)), TagInfo(0x0007, "MeteringMode", N_("Metering Mode"), N_("Metering mode"), - minoltaCsNewIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaMeteringModeStd)), + minoltaCsNewIfdId, makerTags, unsignedLong, -1, EXV_PRINT_TAG(minoltaMeteringModeStd)), TagInfo(0x0008, "ISO", N_("ISO"), N_("ISO Value"), - minoltaCsNewIfdId, makerTags, unsignedLong, printMinoltaExposureSpeedStd), + minoltaCsNewIfdId, makerTags, unsignedLong, -1, printMinoltaExposureSpeedStd), TagInfo(0x0009, "ExposureTime", N_("Exposure Time"), N_("Exposure time"), - minoltaCsNewIfdId, makerTags, unsignedLong, printMinoltaExposureTimeStd), + minoltaCsNewIfdId, makerTags, unsignedLong, -1, printMinoltaExposureTimeStd), TagInfo(0x000A, "FNumber", N_("FNumber"), N_("The F-Number"), - minoltaCsNewIfdId, makerTags, unsignedLong, printMinoltaFNumberStd), + minoltaCsNewIfdId, makerTags, unsignedLong, -1, printMinoltaFNumberStd), TagInfo(0x000B, "MacroMode", N_("Macro Mode"), N_("Macro mode"), - minoltaCsNewIfdId, makerTags, unsignedLong, printMinoltaSonyBoolValue), + minoltaCsNewIfdId, makerTags, unsignedLong, -1, printMinoltaSonyBoolValue), TagInfo(0x000C, "DigitalZoom", N_("Digital Zoom"), N_("Digital zoom"), - minoltaCsNewIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaDigitalZoomStd)), + minoltaCsNewIfdId, makerTags, unsignedLong, -1, EXV_PRINT_TAG(minoltaDigitalZoomStd)), TagInfo(0x000D, "ExposureCompensation", N_("Exposure Compensation"), N_("Exposure compensation"), - minoltaCsNewIfdId, makerTags, unsignedLong, printMinoltaExposureCompensationStd), + minoltaCsNewIfdId, makerTags, unsignedLong, -1, printMinoltaExposureCompensationStd), TagInfo(0x000E, "BracketStep", N_("Bracket Step"), N_("Bracket step"), - minoltaCsNewIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaBracketStepStd)), + minoltaCsNewIfdId, makerTags, unsignedLong, -1, EXV_PRINT_TAG(minoltaBracketStepStd)), TagInfo(0x0010, "IntervalLength", N_("Interval Length"), N_("Interval length"), - minoltaCsNewIfdId, makerTags, unsignedLong, printValue), + minoltaCsNewIfdId, makerTags, unsignedLong, -1, printValue), TagInfo(0x0011, "IntervalNumber", N_("Interval Number"), N_("Interval number"), - minoltaCsNewIfdId, makerTags, unsignedLong, printValue), + minoltaCsNewIfdId, makerTags, unsignedLong, -1, printValue), TagInfo(0x0012, "FocalLength", N_("Focal Length"), N_("Focal length"), - minoltaCsNewIfdId, makerTags, unsignedLong, printMinoltaFocalLengthStd), + minoltaCsNewIfdId, makerTags, unsignedLong, -1, printMinoltaFocalLengthStd), TagInfo(0x0013, "FocusDistance", N_("Focus Distance"), N_("Focus distance"), - minoltaCsNewIfdId, makerTags, unsignedLong, printValue), + minoltaCsNewIfdId, makerTags, unsignedLong, -1, printValue), TagInfo(0x0014, "FlashFired", N_("Flash Fired"), N_("Flash fired"), - minoltaCsNewIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaFlashFired)), + minoltaCsNewIfdId, makerTags, unsignedLong, -1, EXV_PRINT_TAG(minoltaFlashFired)), TagInfo(0x0015, "MinoltaDate", N_("Minolta Date"), N_("Minolta date"), - minoltaCsNewIfdId, makerTags, unsignedLong, printMinoltaDateStd), + minoltaCsNewIfdId, makerTags, unsignedLong, -1, printMinoltaDateStd), TagInfo(0x0016, "MinoltaTime", N_("Minolta Time"), N_("Minolta time"), - minoltaCsNewIfdId, makerTags, unsignedLong, printMinoltaTimeStd), + minoltaCsNewIfdId, makerTags, unsignedLong, -1, printMinoltaTimeStd), TagInfo(0x0017, "MaxAperture", N_("Max Aperture"), N_("Max aperture"), - minoltaCsNewIfdId, makerTags, unsignedLong, printValue), + minoltaCsNewIfdId, makerTags, unsignedLong, -1, printValue), TagInfo(0x001A, "FileNumberMemory", N_("File Number Memory"), N_("File number memory"), - minoltaCsNewIfdId, makerTags, unsignedLong, printMinoltaSonyBoolValue), + minoltaCsNewIfdId, makerTags, unsignedLong, -1, printMinoltaSonyBoolValue), TagInfo(0x001B, "LastFileNumber", N_("Last Image Number"), N_("Last image number"), - minoltaCsNewIfdId, makerTags, unsignedLong, printValue), + minoltaCsNewIfdId, makerTags, unsignedLong, -1, printValue), TagInfo(0x001C, "ColorBalanceRed", N_("Color Balance Red"), N_("Color balance red"), - minoltaCsNewIfdId, makerTags, unsignedLong, printMinoltaWhiteBalanceStd), + minoltaCsNewIfdId, makerTags, unsignedLong, -1, printMinoltaWhiteBalanceStd), TagInfo(0x001D, "ColorBalanceGreen", N_("Color Balance Green"), N_("Color balance green"), - minoltaCsNewIfdId, makerTags, unsignedLong, printMinoltaWhiteBalanceStd), + minoltaCsNewIfdId, makerTags, unsignedLong, -1, printMinoltaWhiteBalanceStd), TagInfo(0x001E, "ColorBalanceBlue", N_("Color Balance Blue"), N_("Color balance blue"), - minoltaCsNewIfdId, makerTags, unsignedLong, printMinoltaWhiteBalanceStd), + minoltaCsNewIfdId, makerTags, unsignedLong, -1, printMinoltaWhiteBalanceStd), TagInfo(0x001F, "Saturation", N_("Saturation"), N_("Saturation"), - minoltaCsNewIfdId, makerTags, unsignedLong, printValue), + minoltaCsNewIfdId, makerTags, unsignedLong, -1, printValue), TagInfo(0x0020, "Contrast", N_("Contrast"), N_("Contrast"), - minoltaCsNewIfdId, makerTags, unsignedLong, printValue), + minoltaCsNewIfdId, makerTags, unsignedLong, -1, printValue), TagInfo(0x0021, "Sharpness", N_("Sharpness"), N_("Sharpness"), - minoltaCsNewIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaSharpnessStd)), + minoltaCsNewIfdId, makerTags, unsignedLong, -1, EXV_PRINT_TAG(minoltaSharpnessStd)), TagInfo(0x0022, "SubjectProgram", N_("Subject Program"), N_("Subject program"), - minoltaCsNewIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaSubjectProgramStd)), + minoltaCsNewIfdId, makerTags, unsignedLong, -1, EXV_PRINT_TAG(minoltaSubjectProgramStd)), TagInfo(0x0023, "FlashExposureComp", N_("Flash Exposure Compensation"), N_("Flash exposure compensation in EV"), - minoltaCsNewIfdId, makerTags, unsignedLong, printMinoltaFlashExposureCompStd), + minoltaCsNewIfdId, makerTags, unsignedLong, -1, printMinoltaFlashExposureCompStd), TagInfo(0x0024, "ISOSetting", N_("ISO Settings"), N_("ISO setting"), - minoltaCsNewIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaISOSettingStd)), + minoltaCsNewIfdId, makerTags, unsignedLong, -1, EXV_PRINT_TAG(minoltaISOSettingStd)), TagInfo(0x0025, "MinoltaModel", N_("Minolta Model"), N_("Minolta model"), - minoltaCsNewIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaModelStd)), + minoltaCsNewIfdId, makerTags, unsignedLong, -1, EXV_PRINT_TAG(minoltaModelStd)), TagInfo(0x0026, "IntervalMode", N_("Interval Mode"), N_("Interval mode"), - minoltaCsNewIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaIntervalModeStd)), + minoltaCsNewIfdId, makerTags, unsignedLong, -1, EXV_PRINT_TAG(minoltaIntervalModeStd)), TagInfo(0x0027, "FolderName", N_("Folder Name"), N_("Folder name"), - minoltaCsNewIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaFolderNameStd)), + minoltaCsNewIfdId, makerTags, unsignedLong, -1, EXV_PRINT_TAG(minoltaFolderNameStd)), TagInfo(0x0028, "ColorMode", N_("ColorMode"), N_("ColorMode"), - minoltaCsNewIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaColorModeStd)), + minoltaCsNewIfdId, makerTags, unsignedLong, -1, EXV_PRINT_TAG(minoltaColorModeStd)), TagInfo(0x0029, "ColorFilter", N_("Color Filter"), N_("Color filter"), - minoltaCsNewIfdId, makerTags, unsignedLong, printValue), + minoltaCsNewIfdId, makerTags, unsignedLong, -1, printValue), TagInfo(0x002A, "BWFilter", N_("Black and White Filter"), N_("Black and white filter"), - minoltaCsNewIfdId, makerTags, unsignedLong, printValue), + minoltaCsNewIfdId, makerTags, unsignedLong, -1, printValue), TagInfo(0x002B, "Internal Flash", N_("Internal Flash"), N_("Internal Flash"), - minoltaCsNewIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaFlashFired)), + minoltaCsNewIfdId, makerTags, unsignedLong, -1, EXV_PRINT_TAG(minoltaFlashFired)), TagInfo(0x002C, "Brightness", N_("Brightness"), N_("Brightness"), - minoltaCsNewIfdId, makerTags, unsignedLong, printMinoltaBrightnessStd), + minoltaCsNewIfdId, makerTags, unsignedLong, -1, printMinoltaBrightnessStd), TagInfo(0x002D, "SpotFocusPointX", N_("Spot Focus Point X"), N_("Spot focus point X"), - minoltaCsNewIfdId, makerTags, unsignedLong, printValue), + minoltaCsNewIfdId, makerTags, unsignedLong, -1, printValue), TagInfo(0x002E, "SpotFocusPointY", N_("Spot Focus Point Y"), N_("Spot focus point Y"), - minoltaCsNewIfdId, makerTags, unsignedLong, printValue), + minoltaCsNewIfdId, makerTags, unsignedLong, -1, printValue), TagInfo(0x002F, "WideFocusZone", N_("Wide Focus Zone"), N_("Wide focus zone"), - minoltaCsNewIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaWideFocusZoneStd)), + minoltaCsNewIfdId, makerTags, unsignedLong, -1, EXV_PRINT_TAG(minoltaWideFocusZoneStd)), TagInfo(0x0030, "FocusMode", N_("Focus Mode"), N_("Focus mode"), - minoltaCsNewIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaFocusModeStd)), + minoltaCsNewIfdId, makerTags, unsignedLong, -1, EXV_PRINT_TAG(minoltaFocusModeStd)), TagInfo(0x0031, "FocusArea", N_("Focus area"), N_("Focus area"), - minoltaCsNewIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaFocusAreaStd)), + minoltaCsNewIfdId, makerTags, unsignedLong, -1, EXV_PRINT_TAG(minoltaFocusAreaStd)), TagInfo(0x0032, "DECPosition", N_("DEC Switch Position"), N_("DEC switch position"), - minoltaCsNewIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaDECPositionStd)), + minoltaCsNewIfdId, makerTags, unsignedLong, -1, EXV_PRINT_TAG(minoltaDECPositionStd)), TagInfo(0x0033, "ColorProfile", N_("Color Profile"), N_("Color profile"), - minoltaCsNewIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaColorProfileStd)), + minoltaCsNewIfdId, makerTags, unsignedLong, -1, EXV_PRINT_TAG(minoltaColorProfileStd)), TagInfo(0x0034, "DataImprint", N_("Data Imprint"), N_("Data Imprint"), - minoltaCsNewIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaDataImprintStd)), + minoltaCsNewIfdId, makerTags, unsignedLong, -1, EXV_PRINT_TAG(minoltaDataImprintStd)), TagInfo(0x003F, "FlashMetering", N_("Flash Metering"), N_("Flash metering"), - minoltaCsNewIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaFlashMeteringStd)), + minoltaCsNewIfdId, makerTags, unsignedLong, -1, EXV_PRINT_TAG(minoltaFlashMeteringStd)), // End of list marker TagInfo(0xffff, "(UnknownMinoltaCsStdTag)", "(UnknownMinoltaCsStdTag)", N_("Unknown Minolta Camera Settings tag"), - minoltaCsNewIfdId, makerTags, invalidTypeId, printValue) + minoltaCsNewIfdId, makerTags, invalidTypeId, -1, printValue) }; const TagInfo* MinoltaMakerNote::tagListCsStd() @@ -740,88 +740,88 @@ namespace Exiv2 { const TagInfo MinoltaMakerNote::tagInfoCs7D_[] = { TagInfo(0x0000, "ExposureMode", N_("Exposure Mode"), N_("Exposure mode"), - minoltaCs7DIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(minoltaExposureMode7D)), + minoltaCs7DIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(minoltaExposureMode7D)), TagInfo(0x0002, "ImageSize", N_("Image Size"), N_("Image size"), - minoltaCs7DIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(minoltaImageSize7D)), + minoltaCs7DIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(minoltaImageSize7D)), TagInfo(0x0003, "Quality", N_("Image Quality"), N_("Image quality"), - minoltaCs7DIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(minoltaImageQuality7D)), + minoltaCs7DIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(minoltaImageQuality7D)), TagInfo(0x0004, "WhiteBalance", N_("White Balance"), N_("White balance"), - minoltaCs7DIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(minoltaWhiteBalance7D)), + minoltaCs7DIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(minoltaWhiteBalance7D)), TagInfo(0x000E, "FocusMode", N_("Focus Mode"), N_("Focus mode"), - minoltaCs7DIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(minoltaFocusMode7D)), + minoltaCs7DIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(minoltaFocusMode7D)), TagInfo(0x0010, "AFPoints", N_("AF Points"), N_("AF points"), - minoltaCs7DIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(minoltaAFPoints7D)), + minoltaCs7DIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(minoltaAFPoints7D)), TagInfo(0x0015, "FlashFired", N_("Flash Fired"), N_("Flash fired"), - minoltaCs7DIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaFlashFired)), + minoltaCs7DIfdId, makerTags, unsignedLong, -1, EXV_PRINT_TAG(minoltaFlashFired)), TagInfo(0x0016, "FlashMode", N_("Flash Mode"), N_("Flash mode"), - minoltaCs7DIfdId, makerTags, unsignedShort, printValue), + minoltaCs7DIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x001C, "ISOSpeed", N_("ISO Speed Mode"), N_("ISO speed setting"), - minoltaCs7DIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(minoltaISOSetting7D)), + minoltaCs7DIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(minoltaISOSetting7D)), TagInfo(0x001E, "ExposureCompensation", N_("Exposure Compensation"), N_("Exposure compensation"), - minoltaCs7DIfdId, makerTags, signedShort, printValue), + minoltaCs7DIfdId, makerTags, signedShort, -1, printValue), TagInfo(0x0025, "ColorSpace", N_("Color Space"), N_("Color space"), - minoltaCs7DIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(minoltaColorSpace7D)), + minoltaCs7DIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(minoltaColorSpace7D)), TagInfo(0x0026, "Sharpness", N_("Sharpness"), N_("Sharpness"), - minoltaCs7DIfdId, makerTags, unsignedShort, printValue), + minoltaCs7DIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x0027, "Contrast", N_("Contrast"), N_("Contrast"), - minoltaCs7DIfdId, makerTags, unsignedShort, printValue), + minoltaCs7DIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x0028, "Saturation", N_("Saturation"), N_("Saturation"), - minoltaCs7DIfdId, makerTags, unsignedShort, printValue), + minoltaCs7DIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x002D, "FreeMemoryCardImages", N_("Free Memory Card Images"), N_("Free memory card images"), - minoltaCs7DIfdId, makerTags, unsignedShort, printValue), + minoltaCs7DIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x003F, "ColorTemperature", N_("Color Temperature"), N_("Color temperature"), - minoltaCs7DIfdId, makerTags, signedShort, printValue), + minoltaCs7DIfdId, makerTags, signedShort, -1, printValue), TagInfo(0x0040, "Hue", N_("Hue"), N_("Hue"), - minoltaCs7DIfdId, makerTags, unsignedShort, printValue), + minoltaCs7DIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x0046, "Rotation", N_("Rotation"), N_("Rotation"), - minoltaCs7DIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(minoltaRotation7D)), + minoltaCs7DIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(minoltaRotation7D)), TagInfo(0x0047, "FNumber", N_("FNumber"), N_("The F-Number"), - minoltaCs7DIfdId, makerTags, unsignedShort, printValue), + minoltaCs7DIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x0048, "ExposureTime", N_("Exposure Time"), N_("Exposure time"), - minoltaCs7DIfdId, makerTags, unsignedShort, printValue), + minoltaCs7DIfdId, makerTags, unsignedShort, -1, printValue), // 0x004A is a dupplicate than 0x002D. TagInfo(0x004A, "FreeMemoryCardImages", N_("Free Memory Card Images"), N_("Free memory card images"), - minoltaCs7DIfdId, makerTags, unsignedShort, printValue), + minoltaCs7DIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x005E, "ImageNumber", N_("Image Number"), N_("Image number"), - minoltaCs7DIfdId, makerTags, unsignedShort, printValue), + minoltaCs7DIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x0060, "NoiseReduction", N_("Noise Reduction"), N_("Noise reduction"), - minoltaCs7DIfdId, makerTags, unsignedShort, printMinoltaSonyBoolValue), + minoltaCs7DIfdId, makerTags, unsignedShort, -1, printMinoltaSonyBoolValue), // 0x0062 is a dupplicate than 0x005E. TagInfo(0x0062, "ImageNumber", N_("Image Number"), N_("Image number"), - minoltaCs7DIfdId, makerTags, unsignedShort, printValue), + minoltaCs7DIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x0071, "ImageStabilization", N_("Image Stabilization"), N_("Image stabilization"), - minoltaCs7DIfdId, makerTags, unsignedShort, printMinoltaSonyBoolValue), + minoltaCs7DIfdId, makerTags, unsignedShort, -1, printMinoltaSonyBoolValue), TagInfo(0x0075, "ZoneMatchingOn", N_("Zone Matching On"), N_("Zone matching on"), - minoltaCs7DIfdId, makerTags, unsignedShort, printMinoltaSonyBoolValue), + minoltaCs7DIfdId, makerTags, unsignedShort, -1, printMinoltaSonyBoolValue), // End of list marker TagInfo(0xffff, "(UnknownMinoltaCs7DTag)", "(UnknownMinoltaCs7DTag)", N_("Unknown Minolta Camera Settings 7D tag"), - minoltaCs7DIfdId, makerTags, invalidTypeId, printValue) + minoltaCs7DIfdId, makerTags, invalidTypeId, -1, printValue) }; const TagInfo* MinoltaMakerNote::tagListCs7D() @@ -984,94 +984,94 @@ namespace Exiv2 { const TagInfo MinoltaMakerNote::tagInfoCs5D_[] = { TagInfo(0x000A, "ExposureMode", N_("Exposure Mode"), N_("Exposure mode"), - minoltaCs5DIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(minoltaExposureMode5D)), + minoltaCs5DIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(minoltaExposureMode5D)), TagInfo(0x000C, "ImageSize", N_("Image Size"), N_("Image size"), - minoltaCs5DIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(minoltaImageSize5D)), + minoltaCs5DIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(minoltaImageSize5D)), TagInfo(0x000D, "Quality", N_("Image Quality"), N_("Image quality"), - minoltaCs5DIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(minoltaImageQuality5D)), + minoltaCs5DIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(minoltaImageQuality5D)), TagInfo(0x000E, "WhiteBalance", N_("White Balance"), N_("White balance"), - minoltaCs5DIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(minoltaWhiteBalance5D)), + minoltaCs5DIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(minoltaWhiteBalance5D)), TagInfo(0x001A, "FocusPosition", N_("Focus Position"), N_("Focus position"), - minoltaCs5DIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(minoltaFocusPosition5D)), + minoltaCs5DIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(minoltaFocusPosition5D)), TagInfo(0x001B, "FocusArea", N_("Focus Area"), N_("Focus area"), - minoltaCs5DIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(minoltaFocusArea5D)), + minoltaCs5DIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(minoltaFocusArea5D)), TagInfo(0x001F, "FlashFired", N_("Flash Fired"), N_("Flash fired"), - minoltaCs5DIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(minoltaFlashFired)), + minoltaCs5DIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(minoltaFlashFired)), TagInfo(0x0025, "MeteringMode", N_("Metering Mode"), N_("Metering mode"), - minoltaCs5DIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(minoltaMeteringMode5D)), + minoltaCs5DIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(minoltaMeteringMode5D)), TagInfo(0x0026, "ISOSpeed", N_("ISO Speed Mode"), N_("ISO speed setting"), - minoltaCs5DIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(minoltaISOSetting5D)), + minoltaCs5DIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(minoltaISOSetting5D)), TagInfo(0x002F, "ColorSpace", N_("Color Space"), N_("Color space"), - minoltaCs5DIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(minoltaColorSpace5D)), + minoltaCs5DIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(minoltaColorSpace5D)), TagInfo(0x0030, "Sharpness", N_("Sharpness"), N_("Sharpness"), - minoltaCs5DIfdId, makerTags, unsignedShort, printValue), + minoltaCs5DIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x0031, "Contrast", N_("Contrast"), N_("Contrast"), - minoltaCs5DIfdId, makerTags, unsignedShort, printValue), + minoltaCs5DIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x0032, "Saturation", N_("Saturation"), N_("Saturation"), - minoltaCs5DIfdId, makerTags, unsignedShort, printValue), + minoltaCs5DIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x0035, "ExposureTime", N_("Exposure Time"), N_("Exposure time"), - minoltaCs5DIfdId, makerTags, unsignedShort, printValue), + minoltaCs5DIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x0036, "FNumber", N_("FNumber"), N_("The F-Number"), - minoltaCs5DIfdId, makerTags, unsignedShort, printValue), + minoltaCs5DIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x0037, "FreeMemoryCardImages", N_("Free Memory Card Images"), N_("Free memory card images"), - minoltaCs5DIfdId, makerTags, unsignedShort, printValue), + minoltaCs5DIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x0038, "ExposureRevision", N_("Exposure Revision"), N_("Exposure revision"), - minoltaCs5DIfdId, makerTags, unsignedShort, printValue), + minoltaCs5DIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x0048, "FocusMode", N_("Focus Mode"), N_("Focus mode"), - minoltaCs5DIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(minoltaFocusModeStd)), + minoltaCs5DIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(minoltaFocusModeStd)), TagInfo(0x0049, "ColorTemperature", N_("Color Temperature"), N_("Color temperature"), - minoltaCs5DIfdId, makerTags, signedShort, printValue), + minoltaCs5DIfdId, makerTags, signedShort, -1, printValue), TagInfo(0x0050, "Rotation", N_("Rotation"), N_("Rotation"), - minoltaCs5DIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(minoltaRotation5D)), + minoltaCs5DIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(minoltaRotation5D)), TagInfo(0x0053, "ExposureCompensation", N_("Exposure Compensation"), N_("Exposure compensation"), - minoltaCs5DIfdId, makerTags, unsignedShort, printMinoltaExposureCompensation5D), + minoltaCs5DIfdId, makerTags, unsignedShort, -1, printMinoltaExposureCompensation5D), TagInfo(0x0054, "FreeMemoryCardImages", N_("Free Memory Card Images"), N_("Free memory card images"), - minoltaCs5DIfdId, makerTags, unsignedShort, printValue), + minoltaCs5DIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x0065, "Rotation2", N_("Rotation2"), N_("Rotation2"), - minoltaCs5DIfdId, makerTags, unsignedShort, printMinoltaSonyRotation), + minoltaCs5DIfdId, makerTags, unsignedShort, -1, printMinoltaSonyRotation), TagInfo(0x006E, "Color Temperature", N_("Color Temperature"), N_("Color Temperature"), - minoltaCs5DIfdId, makerTags, signedShort, printValue), + minoltaCs5DIfdId, makerTags, signedShort, -1, printValue), TagInfo(0x0071, "PictureFinish", N_("Picture Finish"), N_("Picture Finish"), - minoltaCs5DIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(minoltaPictureFinish5D)), + minoltaCs5DIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(minoltaPictureFinish5D)), TagInfo(0x0091, "ExposureManualBias", N_("Exposure Manual Bias"), N_("Exposure manual bias"), - minoltaCs5DIfdId, makerTags, unsignedShort, printMinoltaExposureManualBias5D), + minoltaCs5DIfdId, makerTags, unsignedShort, -1, printMinoltaExposureManualBias5D), TagInfo(0x009E, "AFMode", N_("AF Mode"), N_("AF mode"), - minoltaCs5DIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(minoltaAFMode5D)), + minoltaCs5DIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(minoltaAFMode5D)), TagInfo(0x00AE, "ImageNumber", N_("Image Number"), N_("Image number"), - minoltaCs5DIfdId, makerTags, unsignedShort, printValue), + minoltaCs5DIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x00B0, "NoiseReduction", N_("Noise Reduction"), N_("Noise reduction"), - minoltaCs5DIfdId, makerTags, unsignedShort, printMinoltaSonyBoolValue), + minoltaCs5DIfdId, makerTags, unsignedShort, -1, printMinoltaSonyBoolValue), TagInfo(0x00BD, "ImageStabilization", N_("Image Stabilization"), N_("Image stabilization"), - minoltaCs5DIfdId, makerTags, unsignedShort, printMinoltaSonyBoolValue), + minoltaCs5DIfdId, makerTags, unsignedShort, -1, printMinoltaSonyBoolValue), // From Xavier Raynaud: some notes on missing tags. // 0x0051 seems to be identical to FNumber (0x0036). An approx. relation between Tag value @@ -1082,7 +1082,7 @@ namespace Exiv2 { // End of list marker TagInfo(0xFFFF, "(UnknownMinoltaCs5DTag)", "(UnknownMinoltaCs5DTag)", N_("Unknown Minolta Camera Settings 5D tag"), - minoltaCs5DIfdId, makerTags, invalidTypeId, printValue) + minoltaCs5DIfdId, makerTags, invalidTypeId, -1, printValue) }; const TagInfo* MinoltaMakerNote::tagListCs5D() @@ -1352,243 +1352,243 @@ namespace Exiv2 { const TagInfo MinoltaMakerNote::tagInfoCsA100_[] = { TagInfo(0x0000, "ExposureMode", N_("Exposure Mode"), N_("Exposure mode"), - sony1MltCsA100IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(minoltaExposureMode5D)), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(minoltaExposureMode5D)), TagInfo(0x0001, "ExposureCompensationSetting", N_("Exposure Compensation Setting"), N_("Exposure compensation setting"), - sony1MltCsA100IfdId, makerTags, unsignedShort, printValue), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x0005, "HighSpeedSync", N_("High Speed Sync"), N_("High speed sync"), - sony1MltCsA100IfdId, makerTags, unsignedShort, printMinoltaSonyBoolValue), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, printMinoltaSonyBoolValue), TagInfo(0x0006, "ManualExposureTime", N_("Manual Exposure Time"), N_("Manual exposure time"), - sony1MltCsA100IfdId, makerTags, unsignedShort, printValue), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x0007, "ManualFNumber", N_("Manual FNumber"), N_("Manual FNumber"), - sony1MltCsA100IfdId, makerTags, unsignedShort, printValue), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x0008, "ExposureTime", N_("Exposure Time"), N_("Exposure time"), - sony1MltCsA100IfdId, makerTags, unsignedShort, printValue), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x0009, "FNumber", N_("FNumber"), N_("FNumber"), - sony1MltCsA100IfdId, makerTags, unsignedShort, printValue), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x000A, "DriveMode2", N_("Drive Mode 2"), N_("Drive mode 2"), - sony1MltCsA100IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyDriveMode2A100)), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyDriveMode2A100)), TagInfo(0x000B, "WhiteBalance", N_("White Balance"), N_("White balance"), - sony1MltCsA100IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(minoltaWhiteBalance5D)), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(minoltaWhiteBalance5D)), TagInfo(0x000C, "FocusMode", N_("Focus Mode"), N_("Focus mode"), - sony1MltCsA100IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyFocusModeA100)), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyFocusModeA100)), TagInfo(0x000D, "LocalAFAreaPoint", N_("Local AF Area Point"), N_("Local AF Area Point"), - sony1MltCsA100IfdId, makerTags, unsignedShort, printMinoltaSonyLocalAFAreaPoint), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, printMinoltaSonyLocalAFAreaPoint), TagInfo(0x000E, "AFAreaMode", N_("AF Area Mode"), N_("AF Area Mode"), - sony1MltCsA100IfdId, makerTags, unsignedShort, printMinoltaSonyAFAreaMode), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, printMinoltaSonyAFAreaMode), TagInfo(0x000F, "FlashMode", N_("FlashMode"), N_("FlashMode"), - sony1MltCsA100IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyFlashModeA100)), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyFlashModeA100)), TagInfo(0x0010, "FlashExposureCompSetting", N_("Flash Exposure Comp Setting"), N_("Flash exposure compensation setting"), - sony1MltCsA100IfdId, makerTags, unsignedShort, printValue), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x0012, "MeteringMode", N_("Metering Mode"), N_("Metering mode"), - sony1MltCsA100IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyMeteringModeA100)), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyMeteringModeA100)), TagInfo(0x0013, "ISOSetting", N_("ISO Setting"), N_("ISO setting"), - sony1MltCsA100IfdId, makerTags, unsignedShort, printValue), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x0014, "ZoneMatchingMode", N_("Zone Matching Mode"), N_("Zone Matching Mode"), - sony1MltCsA100IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyZoneMatchingModeA100)), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyZoneMatchingModeA100)), TagInfo(0x0015, "DynamicRangeOptimizerMode", N_("Dynamic Range Optimizer Mode"), N_("Dynamic range optimizer mode"), - sony1MltCsA100IfdId, makerTags, unsignedShort, printMinoltaSonyDynamicRangeOptimizerMode), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, printMinoltaSonyDynamicRangeOptimizerMode), TagInfo(0x0016, "ColorMode", N_("Color Mode"), N_("Color mode"), - sony1MltCsA100IfdId, makerTags, unsignedShort, printMinoltaSonyColorMode), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, printMinoltaSonyColorMode), TagInfo(0x0017, "ColorSpace", N_("Color Space"), N_("Color space"), - sony1MltCsA100IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyColorSpaceA100)), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyColorSpaceA100)), TagInfo(0x0018, "Sharpness", N_("Sharpness"), N_("Sharpness"), - sony1MltCsA100IfdId, makerTags, unsignedShort, printValue), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x0019, "Contrast", N_("Contrast"), N_("Contrast"), - sony1MltCsA100IfdId, makerTags, unsignedShort, printValue), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x001A, "Saturation", N_("Saturation"), N_("Saturation"), - sony1MltCsA100IfdId, makerTags, unsignedShort, printValue), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x001C, "FlashMetering", N_("Flash Metering"), N_("Flash metering"), - sony1MltCsA100IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(minoltaFlashMeteringStd)), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(minoltaFlashMeteringStd)), TagInfo(0x001D, "PrioritySetupShutterRelease", N_("Priority Setup Shutter Release"), N_("Priority Setup Shutter Release"), - sony1MltCsA100IfdId, makerTags, unsignedShort, printMinoltaSonyPrioritySetupShutterRelease), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, printMinoltaSonyPrioritySetupShutterRelease), TagInfo(0x001E, "DriveMode", N_("Drive Mode"), N_("Drive mode"), - sony1MltCsA100IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyDriveModeA100)), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyDriveModeA100)), TagInfo(0x001F, "SelfTimerTime", N_("Self Timer Time"), N_("Self timer time"), - sony1MltCsA100IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonySelfTimerTimeA100)), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonySelfTimerTimeA100)), TagInfo(0x0020, "ContinuousBracketing", N_("Continuous Bracketing"), N_("Continuous bracketing"), - sony1MltCsA100IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyContinuousBracketingA100)), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyContinuousBracketingA100)), TagInfo(0x0021, "SingleFrameBracketing", N_("Single Frame Bracketing"), N_("Single frame bracketing"), - sony1MltCsA100IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonySingleFrameBracketingA100)), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonySingleFrameBracketingA100)), TagInfo(0x0022, "WhiteBalanceBracketing", N_("White Balance Bracketing"), N_("White balance bracketing"), - sony1MltCsA100IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyWhiteBalanceBracketingA100)), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyWhiteBalanceBracketingA100)), TagInfo(0x0023, "WhiteBalanceSetting", N_("White Balance Setting"), N_("White balance setting"), - sony1MltCsA100IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyWhiteBalanceSettingA100)), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyWhiteBalanceSettingA100)), TagInfo(0x0024, "PresetWhiteBalance", N_("Preset White Balance"), N_("Preset white balance"), - sony1MltCsA100IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyPresetWhiteBalanceA100)), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyPresetWhiteBalanceA100)), TagInfo(0x0025, "ColorTemperatureSetting", N_("Color Temperature Setting"), N_("Color temperature setting"), - sony1MltCsA100IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyColorTemperatureSettingA100)), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyColorTemperatureSettingA100)), TagInfo(0x0026, "CustomWBSetting", N_("Custom WB Setting"), N_("Custom WB setting"), - sony1MltCsA100IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyCustomWBSettingA100)), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyCustomWBSettingA100)), TagInfo(0x0027, "DynamicRangeOptimizerSettings", N_("Dynamic Range Optimizer Settings"), N_("Dynamic Range Optimizer Settings"), - sony1MltCsA100IfdId, makerTags, unsignedShort, printMinoltaSonyDynamicRangeOptimizerMode), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, printMinoltaSonyDynamicRangeOptimizerMode), TagInfo(0x0032, "FreeMemoryCardImages", N_("Free Memory Card Images"), N_("Free memory card images"), - sony1MltCsA100IfdId, makerTags, unsignedShort, printValue), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x0034, "CustomWBRedLevel", N_("Custom WB Red Level"), N_("Custom WB red level"), - sony1MltCsA100IfdId, makerTags, unsignedShort, printValue), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x0035, "CustomWBGreenLevel", N_("Custom WB Green Level"), N_("Custom WB green level"), - sony1MltCsA100IfdId, makerTags, unsignedShort, printValue), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x0036, "CustomWBBlueLevel", N_("Custom WB Blue Level"), N_("CustomWB blue level"), - sony1MltCsA100IfdId, makerTags, unsignedShort, printValue), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x0037, "CustomWBError", N_("Custom WB Error"), N_("Custom WB Error"), - sony1MltCsA100IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyCustomWBErrorA100)), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyCustomWBErrorA100)), TagInfo(0x0038, "WhiteBalanceFineTune", N_("White Balance Fine Tune"), N_("White balance fine tune"), - sony1MltCsA100IfdId, makerTags, signedShort, printValue), + sony1MltCsA100IfdId, makerTags, signedShort, -1, printValue), TagInfo(0x0039, "ColorTemperature", N_("Color Temperature"), N_("Color temperature"), - sony1MltCsA100IfdId, makerTags, unsignedShort, printValue), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x003A, "ColorCompensationFilter", N_("Color Compensation Filter"), N_("Color compensation filter"), - sony1MltCsA100IfdId, makerTags, signedShort, printValue), + sony1MltCsA100IfdId, makerTags, signedShort, -1, printValue), TagInfo(0x003B, "SonyImageSize", N_("Sony Image Size"), N_("Sony Image Size"), - sony1MltCsA100IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyImageSizeA100)), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyImageSizeA100)), TagInfo(0x003C, "Quality", N_("Quality"), N_("Quality"), - sony1MltCsA100IfdId, makerTags, unsignedShort, printMinoltaSonyQualityCs), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, printMinoltaSonyQualityCs), TagInfo(0x003D, "InstantPlaybackTime", N_("Instant Playback Time"), N_("Instant playback time"), - sony1MltCsA100IfdId, makerTags, unsignedShort, printValue), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x003E, "InstantPlaybackSetup", N_("Instant Playback Setup"), N_("Instant playback setup"), - sony1MltCsA100IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyInstantPlaybackSetupA100)), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyInstantPlaybackSetupA100)), TagInfo(0x003F, "NoiseReduction", N_("Noise Reduction"), N_("Noise reduction"), - sony1MltCsA100IfdId, makerTags, unsignedShort, printMinoltaSonyBoolValue), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, printMinoltaSonyBoolValue), TagInfo(0x0040, "EyeStartAF", N_("Eye Start AF"), N_("Eye start AF"), - sony1MltCsA100IfdId, makerTags, unsignedShort, printMinoltaSonyBoolInverseValue), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, printMinoltaSonyBoolInverseValue), TagInfo(0x0041, "RedEyeReduction", N_("Red Eye Reduction"), N_("Red eye reduction"), - sony1MltCsA100IfdId, makerTags, unsignedShort, printMinoltaSonyBoolValue), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, printMinoltaSonyBoolValue), TagInfo(0x0042, "FlashDefault", N_("Flash Default"), N_("Flash default"), - sony1MltCsA100IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyFlashDefaultA100)), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyFlashDefaultA100)), TagInfo(0x0043, "AutoBracketOrder", N_("Auto Bracket Order"), N_("Auto bracket order"), - sony1MltCsA100IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyAutoBracketOrderA100)), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyAutoBracketOrderA100)), TagInfo(0x0044, "FocusHoldButton", N_("Focus Hold Button"), N_("Focus hold button"), - sony1MltCsA100IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyFocusHoldButtonA100)), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyFocusHoldButtonA100)), TagInfo(0x0045, "AELButton", N_("AEL Button"), N_("AEL button"), - sony1MltCsA100IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyAELButtonA100)), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyAELButtonA100)), TagInfo(0x0046, "ControlDialSet", N_("Control Dial Set"), N_("Control dial set"), - sony1MltCsA100IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyControlDialSetA100)), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyControlDialSetA100)), TagInfo(0x0047, "ExposureCompensationMode", N_("Exposure Compensation Mode"), N_("Exposure compensation mode"), - sony1MltCsA100IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyExposureCompensationModeA100)), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyExposureCompensationModeA100)), TagInfo(0x0048, "AFAssist", N_("AF Assist"), N_("AF assist"), - sony1MltCsA100IfdId, makerTags, unsignedShort, printMinoltaSonyBoolInverseValue), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, printMinoltaSonyBoolInverseValue), TagInfo(0x0049, "CardShutterLock", N_("Card Shutter Lock"), N_("Card shutter lock"), - sony1MltCsA100IfdId, makerTags, unsignedShort, printMinoltaSonyBoolInverseValue), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, printMinoltaSonyBoolInverseValue), TagInfo(0x004A, "LensShutterLock", N_("Lens Shutter Lock"), N_("Lens shutter lock"), - sony1MltCsA100IfdId, makerTags, unsignedShort, printMinoltaSonyBoolInverseValue), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, printMinoltaSonyBoolInverseValue), TagInfo(0x004B, "AFAreaIllumination", N_("AF Area Illumination"), N_("AF area illumination"), - sony1MltCsA100IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyAFAreaIlluminationA100)), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyAFAreaIlluminationA100)), TagInfo(0x004C, "MonitorDisplayOff", N_("Monitor Display Off"), N_("Monitor display off"), - sony1MltCsA100IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyMonitorDisplayOffA100)), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyMonitorDisplayOffA100)), TagInfo(0x004D, "RecordDisplay", N_("Record Display"), N_("Record display"), - sony1MltCsA100IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyRecordDisplayA100)), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyRecordDisplayA100)), TagInfo(0x004E, "PlayDisplay", N_("Play Display"), N_("Play display"), - sony1MltCsA100IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyPlayDisplayA100)), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyPlayDisplayA100)), TagInfo(0x0050, "ExposureIndicator", N_("Exposure Indicator"), N_("Exposure indicator"), - sony1MltCsA100IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyExposureIndicatorA100)), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyExposureIndicatorA100)), TagInfo(0x0051, "AELExposureIndicator", N_("AEL Exposure Indicator"), N_("AEL exposure indicator (also indicates exposure for next shot when bracketing)"), - sony1MltCsA100IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyExposureIndicatorA100)), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyExposureIndicatorA100)), TagInfo(0x0052, "ExposureBracketingIndicatorLast", N_("Exposure Bracketing Indicator Last"), N_("Exposure bracketing indicator last (indicator for last shot when bracketing)"), - sony1MltCsA100IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyExposureIndicatorA100)), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyExposureIndicatorA100)), TagInfo(0x0053, "MeteringOffScaleIndicator", N_("Metering Off Scale Indicator"), N_("Metering off scale indicator (two flashing triangles when under or over metering scale)"), - sony1MltCsA100IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyMeteringOffScaleIndicatorA100)), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyMeteringOffScaleIndicatorA100)), TagInfo(0x0054, "FlashExposureIndicator", N_("Flash Exposure Indicator"), N_("Flash exposure indicator"), - sony1MltCsA100IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyExposureIndicatorA100)), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyExposureIndicatorA100)), TagInfo(0x0055, "FlashExposureIndicatorNext", N_("Flash Exposure Indicator Next"), N_("Flash exposure indicator next (indicator for next shot when bracketing)"), - sony1MltCsA100IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyExposureIndicatorA100)), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyExposureIndicatorA100)), TagInfo(0x0056, "FlashExposureIndicatorLast", N_("Flash Exposure Indicator Last"), N_("Flash exposure indicator last (indicator for last shot when bracketing)"), - sony1MltCsA100IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyExposureIndicatorA100)), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyExposureIndicatorA100)), TagInfo(0x0057, "ImageStabilization", N_("Image Stabilization"), N_("Image stabilization"), - sony1MltCsA100IfdId, makerTags, unsignedShort, printMinoltaSonyBoolValue), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, printMinoltaSonyBoolValue), TagInfo(0x0058, "FocusModeSwitch", N_("Focus Mode Switch"), N_("Focus mode switch"), - sony1MltCsA100IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyFocusModeSwitchA100)), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyFocusModeSwitchA100)), TagInfo(0x0059, "FlashType", N_("Flash Type"), N_("Flash type"), - sony1MltCsA100IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyFlashTypeA100)), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyFlashTypeA100)), TagInfo(0x005A, "Rotation", N_("Rotation"), N_("Rotation"), - sony1MltCsA100IfdId, makerTags, unsignedShort, printMinoltaSonyRotation), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, printMinoltaSonyRotation), TagInfo(0x004B, "AELock", N_("AE Lock"), N_("AE lock"), - sony1MltCsA100IfdId, makerTags, unsignedShort, printMinoltaSonyBoolValue), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, printMinoltaSonyBoolValue), TagInfo(0x005E, "ColorTemperature", N_("Color Temperature"), N_("Color temperature"), - sony1MltCsA100IfdId, makerTags, unsignedLong, printValue), + sony1MltCsA100IfdId, makerTags, unsignedLong, -1, printValue), TagInfo(0x005F, "ColorCompensationFilter", N_("Color Compensation Filter"), N_("Color compensation filter: negative is green, positive is magenta"), - sony1MltCsA100IfdId, makerTags, unsignedLong, printValue), + sony1MltCsA100IfdId, makerTags, unsignedLong, -1, printValue), TagInfo(0x0060, "BatteryLevel", N_("Battery Level"), N_("Battery level"), - sony1MltCsA100IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyBatteryLevelA100)), + sony1MltCsA100IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyBatteryLevelA100)), // End of list marker TagInfo(0xffff, "(UnknownSonyCsA100Tag)", "(UnknownSonyCsA100Tag)", N_("Unknown Sony Camera Settings A100 tag"), - sony1MltCsA100IfdId, makerTags, invalidTypeId, printValue) + sony1MltCsA100IfdId, makerTags, invalidTypeId, -1, printValue) }; const TagInfo* MinoltaMakerNote::tagListCsA100() diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp index 662a199a..a4bf53d9 100644 --- a/src/nikonmn.cpp +++ b/src/nikonmn.cpp @@ -212,57 +212,57 @@ namespace Exiv2 { const TagInfo Nikon1MakerNote::tagInfo_[] = { TagInfo(0x0001, "Version", N_("Version"), N_("Nikon Makernote version"), - nikon1IfdId, makerTags, undefined, printValue), + nikon1IfdId, makerTags, undefined, -1, printValue), TagInfo(0x0002, "ISOSpeed", N_("ISO Speed"), N_("ISO speed setting"), - nikon1IfdId, makerTags, unsignedShort, print0x0002), + nikon1IfdId, makerTags, unsignedShort, -1, print0x0002), TagInfo(0x0003, "ColorMode", N_("Color Mode"), N_("Color mode"), - nikon1IfdId, makerTags, asciiString, printValue), + nikon1IfdId, makerTags, asciiString, -1, printValue), TagInfo(0x0004, "Quality", N_("Quality"), N_("Image quality setting"), - nikon1IfdId, makerTags, asciiString, printValue), + nikon1IfdId, makerTags, asciiString, -1, printValue), TagInfo(0x0005, "WhiteBalance", N_("White Balance"), N_("White balance"), - nikon1IfdId, makerTags, asciiString, printValue), + nikon1IfdId, makerTags, asciiString, -1, printValue), TagInfo(0x0006, "Sharpening", N_("Sharpening"), N_("Image sharpening setting"), - nikon1IfdId, makerTags, asciiString, printValue), + nikon1IfdId, makerTags, asciiString, -1, printValue), TagInfo(0x0007, "Focus", N_("Focus"), N_("Focus mode"), - nikon1IfdId, makerTags, asciiString, print0x0007), + nikon1IfdId, makerTags, asciiString, -1, print0x0007), TagInfo(0x0008, "FlashSetting", N_("Flash Setting"), N_("Flash setting"), - nikon1IfdId, makerTags, asciiString, printValue), + nikon1IfdId, makerTags, asciiString, -1, printValue), TagInfo(0x000a, "0x000a", "0x000a", N_("Unknown"), - nikon1IfdId, makerTags, unsignedRational, printValue), + nikon1IfdId, makerTags, unsignedRational, -1, printValue), TagInfo(0x000f, "ISOSelection", N_("ISO Selection"), N_("ISO selection"), - nikon1IfdId, makerTags, asciiString, printValue), + nikon1IfdId, makerTags, asciiString, -1, printValue), TagInfo(0x0010, "DataDump", N_("Data Dump"), N_("Data dump"), - nikon1IfdId, makerTags, undefined, printValue), + nikon1IfdId, makerTags, undefined, -1, printValue), TagInfo(0x0080, "ImageAdjustment", N_("Image Adjustment"), N_("Image adjustment setting"), - nikon1IfdId, makerTags, asciiString, printValue), + nikon1IfdId, makerTags, asciiString, -1, printValue), TagInfo(0x0082, "AuxiliaryLens", N_("Auxiliary Lens"), N_("Auxiliary lens (adapter)"), - nikon1IfdId, makerTags, asciiString, printValue), + nikon1IfdId, makerTags, asciiString, -1, printValue), TagInfo(0x0085, "FocusDistance", N_("Focus Distance"), N_("Manual focus distance"), - nikon1IfdId, makerTags, unsignedRational, print0x0085), + nikon1IfdId, makerTags, unsignedRational, -1, print0x0085), TagInfo(0x0086, "DigitalZoom", N_("Digital Zoom"), N_("Digital zoom setting"), - nikon1IfdId, makerTags, unsignedRational, print0x0086), + nikon1IfdId, makerTags, unsignedRational, -1, print0x0086), TagInfo(0x0088, "AFFocusPos", N_("AF Focus Position"), N_("AF focus position information"), - nikon1IfdId, makerTags, undefined, print0x0088), + nikon1IfdId, makerTags, undefined, -1, print0x0088), // End of list marker TagInfo(0xffff, "(UnknownNikon1MnTag)", "(UnknownNikon1MnTag)", N_("Unknown Nikon1MakerNote tag"), - nikon1IfdId, makerTags, invalidTypeId, printValue) + nikon1IfdId, makerTags, invalidTypeId, -1, printValue) }; const TagInfo* Nikon1MakerNote::tagList() @@ -456,41 +456,41 @@ namespace Exiv2 { const TagInfo Nikon2MakerNote::tagInfo_[] = { TagInfo(0x0002, "0x0002", "0x0002", N_("Unknown"), - nikon2IfdId, makerTags, asciiString, printValue), + nikon2IfdId, makerTags, asciiString, -1, printValue), TagInfo(0x0003, "Quality", N_("Quality"), N_("Image quality setting"), - nikon2IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(nikon2Quality)), + nikon2IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(nikon2Quality)), TagInfo(0x0004, "ColorMode", N_("Color Mode"), N_("Color mode"), - nikon2IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(nikon2ColorMode)), + nikon2IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(nikon2ColorMode)), TagInfo(0x0005, "ImageAdjustment", N_("Image Adjustment"), N_("Image adjustment setting"), - nikon2IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(nikon2ImageAdjustment)), + nikon2IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(nikon2ImageAdjustment)), TagInfo(0x0006, "ISOSpeed", N_("ISO Speed"), N_("ISO speed setting"), - nikon2IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(nikon2IsoSpeed)), + nikon2IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(nikon2IsoSpeed)), TagInfo(0x0007, "WhiteBalance", N_("White Balance"), N_("White balance"), - nikon2IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(nikon2WhiteBalance)), + nikon2IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(nikon2WhiteBalance)), TagInfo(0x0008, "Focus", N_("Focus Mode"), N_("Focus mode"), - nikon2IfdId, makerTags, unsignedRational, printValue), + nikon2IfdId, makerTags, unsignedRational, -1, printValue), TagInfo(0x0009, "0x0009", "0x0009", N_("Unknown"), - nikon2IfdId, makerTags, asciiString, printValue), + nikon2IfdId, makerTags, asciiString, -1, printValue), TagInfo(0x000a, "DigitalZoom", N_("Digital Zoom"), N_("Digital zoom setting"), - nikon2IfdId, makerTags, unsignedRational, print0x000a), + nikon2IfdId, makerTags, unsignedRational, -1, print0x000a), TagInfo(0x000b, "AuxiliaryLens", N_("Auxiliary Lens"), N_("Auxiliary lens (adapter)"), - nikon2IfdId, makerTags, unsignedShort, printValue), + nikon2IfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x0f00, "0x0f00", "0x0f00", N_("Unknown"), - nikon2IfdId, makerTags, unsignedLong, printValue), + nikon2IfdId, makerTags, unsignedLong, -1, printValue), // End of list marker TagInfo(0xffff, "(UnknownNikon2MnTag)", "(UnknownNikon2MnTag)", N_("Unknown Nikon2MakerNote tag"), - nikon2IfdId, makerTags, invalidTypeId, printValue) + nikon2IfdId, makerTags, invalidTypeId, -1, printValue) }; const TagInfo* Nikon2MakerNote::tagList() @@ -522,99 +522,99 @@ namespace Exiv2 { // Nikon3 MakerNote Tag Info const TagInfo Nikon3MakerNote::tagInfo_[] = { - TagInfo(0x0001, "Version", N_("Version"), N_("Nikon Makernote version"), nikon3IfdId, makerTags, undefined, printExifVersion), - TagInfo(0x0002, "ISOSpeed", N_("ISO Speed"), N_("ISO speed setting"), nikon3IfdId, makerTags, unsignedShort, print0x0002), - TagInfo(0x0003, "ColorMode", N_("Color Mode"), N_("Color mode"), nikon3IfdId, makerTags, asciiString, printValue), - TagInfo(0x0004, "Quality", N_("Quality"), N_("Image quality setting"), nikon3IfdId, makerTags, asciiString, printValue), - TagInfo(0x0005, "WhiteBalance", N_("White Balance"), N_("White balance"), nikon3IfdId, makerTags, asciiString, printValue), - TagInfo(0x0006, "Sharpening", N_("Sharpening"), N_("Image sharpening setting"), nikon3IfdId, makerTags, asciiString, printValue), - TagInfo(0x0007, "Focus", N_("Focus"), N_("Focus mode"), nikon3IfdId, makerTags, asciiString, print0x0007), - TagInfo(0x0008, "FlashSetting", N_("Flash Setting"), N_("Flash setting"), nikon3IfdId, makerTags, asciiString, printValue), - TagInfo(0x0009, "FlashDevice", N_("Flash Device"), N_("Flash device"), nikon3IfdId, makerTags, asciiString, printValue), - TagInfo(0x000a, "0x000a", "0x000a", N_("Unknown"), nikon3IfdId, makerTags, unsignedRational, printValue), - TagInfo(0x000b, "WhiteBalanceBias", N_("White Balance Bias"), N_("White balance bias"), nikon3IfdId, makerTags, signedShort, printValue), - TagInfo(0x000c, "WB_RBLevels", N_("WB RB Levels"), N_("WB RB levels"), nikon3IfdId, makerTags, unsignedRational, printValue), - TagInfo(0x000d, "ProgramShift", N_("Program Shift"), N_("Program shift"), nikon3IfdId, makerTags, undefined, EXV_PRINT_TAG(nikonFlashComp)), - TagInfo(0x000e, "ExposureDiff", N_("Exposure Difference"), N_("Exposure difference"), nikon3IfdId, makerTags, undefined, EXV_PRINT_TAG(nikonFlashComp)), - TagInfo(0x000f, "ISOSelection", N_("ISO Selection"), N_("ISO selection"), nikon3IfdId, makerTags, asciiString, printValue), - TagInfo(0x0010, "DataDump", N_("Data Dump"), N_("Data dump"), nikon3IfdId, makerTags, undefined, printValue), - TagInfo(0x0011, "Preview", N_("Pointer to a preview image"), N_("Offset to an IFD containing a preview image"), nikon3IfdId, makerTags, undefined, printValue), - TagInfo(0x0012, "FlashComp", N_("Flash Comp"), N_("Flash compensation setting"), nikon3IfdId, makerTags, undefined, EXV_PRINT_TAG(nikonFlashComp)), - TagInfo(0x0013, "ISOSettings", N_("ISO Settings"), N_("ISO setting"), nikon3IfdId, makerTags, unsignedShort, print0x0002), // use 0x0002 print fct - TagInfo(0x0016, "ImageBoundary", N_("Image Boundary"), N_("Image boundary"), nikon3IfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0017, "FlashExposureComp", "Flash Exposure Comp", N_("Flash exposure comp"), nikon3IfdId, makerTags, undefined, EXV_PRINT_TAG(nikonFlashComp)), - TagInfo(0x0018, "FlashBracketComp", N_("Flash Bracket Comp"), N_("Flash bracket compensation applied"), nikon3IfdId, makerTags, undefined, EXV_PRINT_TAG(nikonFlashComp)), // use 0x0012 print fct - TagInfo(0x0019, "ExposureBracketComp", N_("Exposure Bracket Comp"), N_("AE bracket compensation applied"), nikon3IfdId, makerTags, signedRational, printValue), - TagInfo(0x001a, "ImageProcessing", N_("Image Processing"), N_("Image processing"), nikon3IfdId, makerTags, asciiString, printValue), - TagInfo(0x001b, "CropHiSpeed", N_("Crop High Speed"), N_("Crop high speed"), nikon3IfdId, makerTags, unsignedShort, printValue), - TagInfo(0x001c, "ExposureTuning", N_("Exposure Tuning"), N_("Exposure tuning"), nikon3IfdId, makerTags, unsignedShort, printValue), - TagInfo(0x001d, "SerialNumber", N_("Serial Number"), N_("Serial Number"), nikon3IfdId, makerTags, asciiString, printValue), - TagInfo(0x001e, "ColorSpace", N_("Color Space"), N_("Color space"), nikon3IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(nikonColorSpace)), - TagInfo(0x001f, "VRInfo", N_("VR Info"), N_("VR info"), nikon3IfdId, makerTags, undefined, printValue), - TagInfo(0x0020, "ImageAuthentication", N_("Image Authentication"), N_("Image authentication"), nikon3IfdId, makerTags, unsignedByte, EXV_PRINT_TAG(nikonOffOn)), - TagInfo(0x0022, "ActiveDLighting", N_("ActiveD-Lighting"), N_("ActiveD-lighting"), nikon3IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(nikonActiveDLighning)), - TagInfo(0x0023, "PictureControl", N_("Picture Control"), N_(" Picture control"), nikon3IfdId, makerTags, undefined, printValue), - TagInfo(0x0024, "WorldTime", N_("World Time"), N_("World time"), nikon3IfdId, makerTags, undefined, printValue), - TagInfo(0x0025, "ISOInfo", N_("ISO Info"), N_("ISO info"), nikon3IfdId, makerTags, undefined, printValue), - TagInfo(0x002a, "VignetteControl", N_("Vignette Control"), N_("Vignette control"), nikon3IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(nikonOlnh)), - TagInfo(0x0080, "ImageAdjustment", N_("Image Adjustment"), N_("Image adjustment setting"), nikon3IfdId, makerTags, asciiString, printValue), - TagInfo(0x0081, "ToneComp", N_("Tone Compensation"), N_("Tone compensation"), nikon3IfdId, makerTags, asciiString, printValue), - TagInfo(0x0082, "AuxiliaryLens", N_("Auxiliary Lens"), N_("Auxiliary lens (adapter)"), nikon3IfdId, makerTags, asciiString, printValue), - TagInfo(0x0083, "LensType", N_("Lens Type"), N_("Lens type"), nikon3IfdId, makerTags, unsignedByte, print0x0083), - TagInfo(0x0084, "Lens", N_("Lens"), N_("Lens"), nikon3IfdId, makerTags, unsignedRational, print0x0084), - 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, "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, "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), - TagInfo(0x0091, "ShotInfo", "Shot Info", N_("Shot info"), nikon3IfdId, makerTags, undefined, printValue), - TagInfo(0x0092, "HueAdjustment", N_("Hue Adjustment"), N_("Hue adjustment"), nikon3IfdId, makerTags, signedShort, printValue), - 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, "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), - TagInfo(0x009a, "SensorPixelSize", N_("Sensor Pixel Size"), N_("Sensor pixel size"), nikon3IfdId, makerTags, unsignedRational, print0x009a), - TagInfo(0x009b, "0x009b", "0x009b", N_("Unknown"), nikon3IfdId, makerTags, unsignedShort, printValue), - TagInfo(0x009c, "SceneAssist", N_("Scene Assist"), N_("Scene assist"), nikon3IfdId, makerTags, asciiString, printValue), - TagInfo(0x009e, "RetouchHistory", N_("Retouch History"), N_("Retouch history"), nikon3IfdId, makerTags, unsignedShort, print0x009e), - TagInfo(0x009f, "0x009f", "0x009f", N_("Unknown"), nikon3IfdId, makerTags, signedShort, printValue), - TagInfo(0x00a0, "SerialNO", N_("Serial NO"), N_("Camera serial number, usually starts with \"NO= \""), nikon3IfdId, makerTags, asciiString, printValue), - 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, "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), - TagInfo(0x00aa, "Saturation", N_("Saturation"), N_("Saturation"), nikon3IfdId, makerTags, asciiString, printValue), - TagInfo(0x00ab, "VariProgram", N_("Program Variation"), N_("Program variation"), nikon3IfdId, makerTags, asciiString, printValue), - TagInfo(0x00ac, "ImageStabilization", N_("Image Stabilization"), N_("Image stabilization"), nikon3IfdId, makerTags, asciiString, printValue), - TagInfo(0x00ad, "AFResponse", N_("AF Response"), N_("AF response"), nikon3IfdId, makerTags, asciiString, printValue), - 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, "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), + TagInfo(0x0001, "Version", N_("Version"), N_("Nikon Makernote version"), nikon3IfdId, makerTags, undefined, -1, printExifVersion), + TagInfo(0x0002, "ISOSpeed", N_("ISO Speed"), N_("ISO speed setting"), nikon3IfdId, makerTags, unsignedShort, -1, print0x0002), + TagInfo(0x0003, "ColorMode", N_("Color Mode"), N_("Color mode"), nikon3IfdId, makerTags, asciiString, -1, printValue), + TagInfo(0x0004, "Quality", N_("Quality"), N_("Image quality setting"), nikon3IfdId, makerTags, asciiString, -1, printValue), + TagInfo(0x0005, "WhiteBalance", N_("White Balance"), N_("White balance"), nikon3IfdId, makerTags, asciiString, -1, printValue), + TagInfo(0x0006, "Sharpening", N_("Sharpening"), N_("Image sharpening setting"), nikon3IfdId, makerTags, asciiString, -1, printValue), + TagInfo(0x0007, "Focus", N_("Focus"), N_("Focus mode"), nikon3IfdId, makerTags, asciiString, -1, print0x0007), + TagInfo(0x0008, "FlashSetting", N_("Flash Setting"), N_("Flash setting"), nikon3IfdId, makerTags, asciiString, -1, printValue), + TagInfo(0x0009, "FlashDevice", N_("Flash Device"), N_("Flash device"), nikon3IfdId, makerTags, asciiString, -1, printValue), + TagInfo(0x000a, "0x000a", "0x000a", N_("Unknown"), nikon3IfdId, makerTags, unsignedRational, -1, printValue), + TagInfo(0x000b, "WhiteBalanceBias", N_("White Balance Bias"), N_("White balance bias"), nikon3IfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x000c, "WB_RBLevels", N_("WB RB Levels"), N_("WB RB levels"), nikon3IfdId, makerTags, unsignedRational, -1, printValue), + TagInfo(0x000d, "ProgramShift", N_("Program Shift"), N_("Program shift"), nikon3IfdId, makerTags, undefined, -1, EXV_PRINT_TAG(nikonFlashComp)), + TagInfo(0x000e, "ExposureDiff", N_("Exposure Difference"), N_("Exposure difference"), nikon3IfdId, makerTags, undefined, -1, EXV_PRINT_TAG(nikonFlashComp)), + TagInfo(0x000f, "ISOSelection", N_("ISO Selection"), N_("ISO selection"), nikon3IfdId, makerTags, asciiString, -1, printValue), + TagInfo(0x0010, "DataDump", N_("Data Dump"), N_("Data dump"), nikon3IfdId, makerTags, undefined, -1, printValue), + TagInfo(0x0011, "Preview", N_("Pointer to a preview image"), N_("Offset to an IFD containing a preview image"), nikon3IfdId, makerTags, undefined, -1, printValue), + TagInfo(0x0012, "FlashComp", N_("Flash Comp"), N_("Flash compensation setting"), nikon3IfdId, makerTags, undefined, -1, EXV_PRINT_TAG(nikonFlashComp)), + TagInfo(0x0013, "ISOSettings", N_("ISO Settings"), N_("ISO setting"), nikon3IfdId, makerTags, unsignedShort, -1, print0x0002), // use 0x0002 print fct + TagInfo(0x0016, "ImageBoundary", N_("Image Boundary"), N_("Image boundary"), nikon3IfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0017, "FlashExposureComp", "Flash Exposure Comp", N_("Flash exposure comp"), nikon3IfdId, makerTags, undefined, -1, EXV_PRINT_TAG(nikonFlashComp)), + TagInfo(0x0018, "FlashBracketComp", N_("Flash Bracket Comp"), N_("Flash bracket compensation applied"), nikon3IfdId, makerTags, undefined, -1, EXV_PRINT_TAG(nikonFlashComp)), // use 0x0012 print fct + TagInfo(0x0019, "ExposureBracketComp", N_("Exposure Bracket Comp"), N_("AE bracket compensation applied"), nikon3IfdId, makerTags, signedRational, -1, printValue), + TagInfo(0x001a, "ImageProcessing", N_("Image Processing"), N_("Image processing"), nikon3IfdId, makerTags, asciiString, -1, printValue), + TagInfo(0x001b, "CropHiSpeed", N_("Crop High Speed"), N_("Crop high speed"), nikon3IfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x001c, "ExposureTuning", N_("Exposure Tuning"), N_("Exposure tuning"), nikon3IfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x001d, "SerialNumber", N_("Serial Number"), N_("Serial Number"), nikon3IfdId, makerTags, asciiString, -1, printValue), + TagInfo(0x001e, "ColorSpace", N_("Color Space"), N_("Color space"), nikon3IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(nikonColorSpace)), + TagInfo(0x001f, "VRInfo", N_("VR Info"), N_("VR info"), nikon3IfdId, makerTags, undefined, -1, printValue), + TagInfo(0x0020, "ImageAuthentication", N_("Image Authentication"), N_("Image authentication"), nikon3IfdId, makerTags, unsignedByte, -1, EXV_PRINT_TAG(nikonOffOn)), + TagInfo(0x0022, "ActiveDLighting", N_("ActiveD-Lighting"), N_("ActiveD-lighting"), nikon3IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(nikonActiveDLighning)), + TagInfo(0x0023, "PictureControl", N_("Picture Control"), N_(" Picture control"), nikon3IfdId, makerTags, undefined, -1, printValue), + TagInfo(0x0024, "WorldTime", N_("World Time"), N_("World time"), nikon3IfdId, makerTags, undefined, -1, printValue), + TagInfo(0x0025, "ISOInfo", N_("ISO Info"), N_("ISO info"), nikon3IfdId, makerTags, undefined, -1, printValue), + TagInfo(0x002a, "VignetteControl", N_("Vignette Control"), N_("Vignette control"), nikon3IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(nikonOlnh)), + TagInfo(0x0080, "ImageAdjustment", N_("Image Adjustment"), N_("Image adjustment setting"), nikon3IfdId, makerTags, asciiString, -1, printValue), + TagInfo(0x0081, "ToneComp", N_("Tone Compensation"), N_("Tone compensation"), nikon3IfdId, makerTags, asciiString, -1, printValue), + TagInfo(0x0082, "AuxiliaryLens", N_("Auxiliary Lens"), N_("Auxiliary lens (adapter)"), nikon3IfdId, makerTags, asciiString, -1, printValue), + TagInfo(0x0083, "LensType", N_("Lens Type"), N_("Lens type"), nikon3IfdId, makerTags, unsignedByte, -1, print0x0083), + TagInfo(0x0084, "Lens", N_("Lens"), N_("Lens"), nikon3IfdId, makerTags, unsignedRational, -1, print0x0084), + TagInfo(0x0085, "FocusDistance", N_("Focus Distance"), N_("Manual focus distance"), nikon3IfdId, makerTags, unsignedRational, -1, print0x0085), + TagInfo(0x0086, "DigitalZoom", N_("Digital Zoom"), N_("Digital zoom setting"), nikon3IfdId, makerTags, unsignedRational, -1, print0x0086), + TagInfo(0x0087, "FlashMode", N_("Flash Mode"), N_("Mode of flash used"), nikon3IfdId, makerTags, unsignedByte, -1, EXV_PRINT_TAG(nikonFlashMode)), + TagInfo(0x0088, "AFInfo", N_("AF Info"), N_("AF info"), nikon3IfdId, makerTags, undefined, -1, printValue), + TagInfo(0x0089, "ShootingMode", N_("Shooting Mode"), N_("Shooting mode"), nikon3IfdId, makerTags, unsignedShort, -1, print0x0089), + TagInfo(0x008a, "AutoBracketRelease", N_("Auto Bracket Release"), N_("Auto bracket release"), nikon3IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(nikonAutoBracketRelease)), + TagInfo(0x008b, "LensFStops", N_("Lens FStops"), N_("Lens FStops"), nikon3IfdId, makerTags, undefined, -1, print0x008b), + TagInfo(0x008c, "ContrastCurve", N_("Contrast Curve"), N_("Contrast curve"), nikon3IfdId, makerTags, undefined, -1, printValue), + TagInfo(0x008d, "ColorHue", N_("Color Hue"), N_("Color hue"), nikon3IfdId, makerTags, asciiString, -1, printValue), + TagInfo(0x008f, "SceneMode", N_("Scene Mode"), N_("Scene mode"), nikon3IfdId, makerTags, asciiString, -1, printValue), + TagInfo(0x0090, "LightSource", N_("Light Source"), N_("Light source"), nikon3IfdId, makerTags, asciiString, -1, printValue), + TagInfo(0x0091, "ShotInfo", "Shot Info", N_("Shot info"), nikon3IfdId, makerTags, undefined, -1, printValue), + TagInfo(0x0092, "HueAdjustment", N_("Hue Adjustment"), N_("Hue adjustment"), nikon3IfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x0093, "NEFCompression", N_("NEF Compression"), N_("NEF compression"), nikon3IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(nikonNefCompression)), + TagInfo(0x0094, "Saturation", N_("Saturation"), N_("Saturation"), nikon3IfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x0095, "NoiseReduction", N_("Noise Reduction"), N_("Noise reduction"), nikon3IfdId, makerTags, asciiString, -1, printValue), + TagInfo(0x0096, "LinearizationTable", N_("Linearization Table"), N_("Linearization table"), nikon3IfdId, makerTags, undefined, -1, printValue), + TagInfo(0x0097, "ColorBalance", N_("Color Balance"), N_("Color balance"), nikon3IfdId, makerTags, undefined, -1, printValue), + TagInfo(0x0098, "LensData", N_("Lens Data"), N_("Lens data settings"), nikon3IfdId, makerTags, undefined, -1, printValue), + TagInfo(0x0099, "RawImageCenter", N_("Raw Image Center"), N_("Raw image center"), nikon3IfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x009a, "SensorPixelSize", N_("Sensor Pixel Size"), N_("Sensor pixel size"), nikon3IfdId, makerTags, unsignedRational, -1, print0x009a), + TagInfo(0x009b, "0x009b", "0x009b", N_("Unknown"), nikon3IfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x009c, "SceneAssist", N_("Scene Assist"), N_("Scene assist"), nikon3IfdId, makerTags, asciiString, -1, printValue), + TagInfo(0x009e, "RetouchHistory", N_("Retouch History"), N_("Retouch history"), nikon3IfdId, makerTags, unsignedShort, -1, print0x009e), + TagInfo(0x009f, "0x009f", "0x009f", N_("Unknown"), nikon3IfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x00a0, "SerialNO", N_("Serial NO"), N_("Camera serial number, usually starts with \"NO= \""), nikon3IfdId, makerTags, asciiString, -1, printValue), + TagInfo(0x00a2, "ImageDataSize", N_("Image Data Size"), N_("Image data size"), nikon3IfdId, makerTags, unsignedLong, -1, printValue), + TagInfo(0x00a3, "0x00a3", "0x00a3", N_("Unknown"), nikon3IfdId, makerTags, unsignedByte, -1, printValue), + TagInfo(0x00a5, "ImageCount", N_("Image Count"), N_("Image count"), nikon3IfdId, makerTags, unsignedLong, -1, printValue), + TagInfo(0x00a6, "DeletedImageCount", N_("Deleted Image Count"), N_("Deleted image count"), nikon3IfdId, makerTags, unsignedLong, -1, printValue), + TagInfo(0x00a7, "ShutterCount", N_("Shutter Count"), N_("Number of shots taken by camera"), nikon3IfdId, makerTags, unsignedLong, -1, printValue), + TagInfo(0x00a8, "FlashInfo", "Flash Info", N_("Flash info"), nikon3IfdId, makerTags, undefined, -1, printValue), + TagInfo(0x00a9, "ImageOptimization", N_("Image Optimization"), N_("Image optimization"), nikon3IfdId, makerTags, asciiString, -1, printValue), + TagInfo(0x00aa, "Saturation", N_("Saturation"), N_("Saturation"), nikon3IfdId, makerTags, asciiString, -1, printValue), + TagInfo(0x00ab, "VariProgram", N_("Program Variation"), N_("Program variation"), nikon3IfdId, makerTags, asciiString, -1, printValue), + TagInfo(0x00ac, "ImageStabilization", N_("Image Stabilization"), N_("Image stabilization"), nikon3IfdId, makerTags, asciiString, -1, printValue), + TagInfo(0x00ad, "AFResponse", N_("AF Response"), N_("AF response"), nikon3IfdId, makerTags, asciiString, -1, printValue), + TagInfo(0x00b0, "MultiExposure", "Multi Exposure", N_("Multi exposure"), nikon3IfdId, makerTags, undefined, -1, printValue), + TagInfo(0x00b1, "HighISONoiseReduction", N_("High ISO Noise Reduction"), N_("High ISO Noise Reduction"), nikon3IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(nikonHighISONoiseReduction)), + TagInfo(0x00b3, "ToningEffect", "Toning Effect", N_("Toning effect"), nikon3IfdId, makerTags, asciiString, -1, printValue), + TagInfo(0x00b7, "AFInfo2", "AF Info 2", N_("AF info 2"), nikon3IfdId, makerTags, undefined, -1, printValue), + TagInfo(0x00b8, "FileInfo", "File Info", N_("File info"), nikon3IfdId, makerTags, undefined, -1, printValue), + TagInfo(0x0e00, "PrintIM", N_("Print IM"), N_("PrintIM information"), nikon3IfdId, makerTags, undefined, -1, printValue), // TODO: Add Capture Data decoding implementation. - TagInfo(0x0e01, "CaptureData", N_("Capture Data"), N_("Capture data"), nikon3IfdId, makerTags, undefined, printValue), - TagInfo(0x0e09, "CaptureVersion", N_("Capture Version"), N_("Capture version"), nikon3IfdId, makerTags, asciiString, printValue), + TagInfo(0x0e01, "CaptureData", N_("Capture Data"), N_("Capture data"), nikon3IfdId, makerTags, undefined, -1, printValue), + TagInfo(0x0e09, "CaptureVersion", N_("Capture Version"), N_("Capture version"), nikon3IfdId, makerTags, asciiString, -1, printValue), // 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, "ICCProfile", "ICC Profile", N_("ICC profile"), nikon3IfdId, makerTags, undefined, printValue), - TagInfo(0x0e1e, "CaptureOutput", "Capture Output", N_("Capture output"), nikon3IfdId, makerTags, undefined, printValue), + TagInfo(0x0e0e, "CaptureOffsets", N_("Capture Offsets"), N_("Capture offsets"), nikon3IfdId, makerTags, undefined, -1, printValue), + TagInfo(0x0e10, "ScanIFD", "Scan IFD", N_("Scan IFD"), nikon3IfdId, makerTags, undefined, -1, printValue), + TagInfo(0x0e1d, "ICCProfile", "ICC Profile", N_("ICC profile"), nikon3IfdId, makerTags, undefined, -1, printValue), + TagInfo(0x0e1e, "CaptureOutput", "Capture Output", N_("Capture output"), nikon3IfdId, makerTags, undefined, -1, printValue), // End of list marker - TagInfo(0xffff, "(UnknownNikon3MnTag)", "(UnknownNikon3MnTag)", N_("Unknown Nikon3MakerNote tag"), nikon3IfdId, makerTags, invalidTypeId, printValue) + TagInfo(0xffff, "(UnknownNikon3MnTag)", "(UnknownNikon3MnTag)", N_("Unknown Nikon3MakerNote tag"), nikon3IfdId, makerTags, invalidTypeId, -1, printValue) }; const TagInfo* Nikon3MakerNote::tagList() @@ -643,10 +643,10 @@ namespace Exiv2 { // Nikon3 Vibration Reduction Tag Info const TagInfo Nikon3MakerNote::tagInfoVr_[] = { - TagInfo(0, "Version", N_("Version"), N_("Version"), nikonVrIfdId, makerTags, undefined, printExifVersion), - TagInfo(4, "VibrationReduction", N_("Vibration Reduction"), N_("Vibration reduction"), nikonVrIfdId, makerTags, unsignedByte, EXV_PRINT_TAG(nikonOnOff)), + TagInfo(0, "Version", N_("Version"), N_("Version"), nikonVrIfdId, makerTags, undefined, -1, printExifVersion), + TagInfo(4, "VibrationReduction", N_("Vibration Reduction"), N_("Vibration reduction"), nikonVrIfdId, makerTags, unsignedByte, -1, EXV_PRINT_TAG(nikonOnOff)), // End of list marker - TagInfo(0xffff, "(UnknownNikonVrTag)", "(UnknownNikonVrTag)", N_("Unknown Nikon Vibration Reduction Tag"), nikonVrIfdId, makerTags, invalidTypeId, printValue) + TagInfo(0xffff, "(UnknownNikonVrTag)", "(UnknownNikonVrTag)", N_("Unknown Nikon Vibration Reduction Tag"), nikonVrIfdId, makerTags, invalidTypeId, -1, printValue) }; const TagInfo* Nikon3MakerNote::tagListVr() @@ -688,21 +688,21 @@ namespace Exiv2 { // Nikon3 Picture Control Tag Info const TagInfo Nikon3MakerNote::tagInfoPc_[] = { - TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonPcIfdId, makerTags, undefined, printExifVersion), - TagInfo( 4, "Name", N_("Name"), N_("Name"), nikonPcIfdId, makerTags, asciiString, printValue), - TagInfo(24, "Base", N_("Base"), N_("Base"), nikonPcIfdId, makerTags, asciiString, printValue), - TagInfo(48, "Adjust", N_("Adjust"), N_("Adjust"), nikonPcIfdId, makerTags, unsignedByte, EXV_PRINT_TAG(nikonAdjust)), - TagInfo(49, "QuickAdjust", N_("Quick Adjust"), N_("Quick adjust"), nikonPcIfdId, makerTags, unsignedByte, printPictureControl), - TagInfo(50, "Sharpness", N_("Sharpness"), N_("Sharpness"), nikonPcIfdId, makerTags, unsignedByte, printPictureControl), - TagInfo(51, "Contrast", N_("Contrast"), N_("Contrast"), nikonPcIfdId, makerTags, unsignedByte, printPictureControl), - TagInfo(52, "Brightness", N_("Brightness"), N_("Brightness"), nikonPcIfdId, makerTags, unsignedByte, printPictureControl), - TagInfo(53, "Saturation", N_("Saturation"), N_("Saturation"), nikonPcIfdId, makerTags, unsignedByte, printPictureControl), - TagInfo(54, "HueAdjustment", N_("Hue Adjustment"), N_("Hue adjustment"), nikonPcIfdId, makerTags, unsignedByte, printPictureControl), - TagInfo(55, "FilterEffect", N_("Filter Effect"), N_("Filter effect"), nikonPcIfdId, makerTags, unsignedByte, EXV_PRINT_TAG(nikonFilterEffect)), - TagInfo(56, "ToningEffect", N_("Toning Effect"), N_("Toning effect"), nikonPcIfdId, makerTags, unsignedByte, EXV_PRINT_TAG(nikonToningEffect)), - TagInfo(57, "ToningSaturation", N_("Toning Saturation"), N_("Toning saturation"), nikonPcIfdId, makerTags, unsignedByte, printPictureControl), + TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonPcIfdId, makerTags, undefined, -1, printExifVersion), + TagInfo( 4, "Name", N_("Name"), N_("Name"), nikonPcIfdId, makerTags, asciiString, -1, printValue), + TagInfo(24, "Base", N_("Base"), N_("Base"), nikonPcIfdId, makerTags, asciiString, -1, printValue), + TagInfo(48, "Adjust", N_("Adjust"), N_("Adjust"), nikonPcIfdId, makerTags, unsignedByte, -1, EXV_PRINT_TAG(nikonAdjust)), + TagInfo(49, "QuickAdjust", N_("Quick Adjust"), N_("Quick adjust"), nikonPcIfdId, makerTags, unsignedByte, -1, printPictureControl), + TagInfo(50, "Sharpness", N_("Sharpness"), N_("Sharpness"), nikonPcIfdId, makerTags, unsignedByte, -1, printPictureControl), + TagInfo(51, "Contrast", N_("Contrast"), N_("Contrast"), nikonPcIfdId, makerTags, unsignedByte, -1, printPictureControl), + TagInfo(52, "Brightness", N_("Brightness"), N_("Brightness"), nikonPcIfdId, makerTags, unsignedByte, -1, printPictureControl), + TagInfo(53, "Saturation", N_("Saturation"), N_("Saturation"), nikonPcIfdId, makerTags, unsignedByte, -1, printPictureControl), + TagInfo(54, "HueAdjustment", N_("Hue Adjustment"), N_("Hue adjustment"), nikonPcIfdId, makerTags, unsignedByte, -1, printPictureControl), + TagInfo(55, "FilterEffect", N_("Filter Effect"), N_("Filter effect"), nikonPcIfdId, makerTags, unsignedByte, -1, EXV_PRINT_TAG(nikonFilterEffect)), + TagInfo(56, "ToningEffect", N_("Toning Effect"), N_("Toning effect"), nikonPcIfdId, makerTags, unsignedByte, -1, EXV_PRINT_TAG(nikonToningEffect)), + TagInfo(57, "ToningSaturation", N_("Toning Saturation"), N_("Toning saturation"), nikonPcIfdId, makerTags, unsignedByte, -1, printPictureControl), // End of list marker - TagInfo(0xffff, "(UnknownNikonPcTag)", "(UnknownNikonPcTag)", N_("Unknown Nikon Picture Control Tag"), nikonPcIfdId, makerTags, invalidTypeId, printValue) + TagInfo(0xffff, "(UnknownNikonPcTag)", "(UnknownNikonPcTag)", N_("Unknown Nikon Picture Control Tag"), nikonPcIfdId, makerTags, invalidTypeId, -1, printValue) }; const TagInfo* Nikon3MakerNote::tagListPc() @@ -712,11 +712,11 @@ namespace Exiv2 { // Nikon3 World Time Tag Info const TagInfo Nikon3MakerNote::tagInfoWt_[] = { - TagInfo(0, "Timezone", N_("Timezone"), N_("Timezone"), nikonWtIfdId, makerTags, signedShort, printTimeZone), - TagInfo(2, "DaylightSavings", N_("Daylight Savings"), N_("Daylight savings"), nikonWtIfdId, makerTags, unsignedByte, EXV_PRINT_TAG(nikonYesNo)), - TagInfo(3, "DateDisplayFormat", N_("Date Display Format"), N_("Date display format"), nikonWtIfdId, makerTags, unsignedByte, EXV_PRINT_TAG(nikonDateDisplayFormat)), + TagInfo(0, "Timezone", N_("Timezone"), N_("Timezone"), nikonWtIfdId, makerTags, signedShort, -1, printTimeZone), + TagInfo(2, "DaylightSavings", N_("Daylight Savings"), N_("Daylight savings"), nikonWtIfdId, makerTags, unsignedByte, -1, EXV_PRINT_TAG(nikonYesNo)), + TagInfo(3, "DateDisplayFormat", N_("Date Display Format"), N_("Date display format"), nikonWtIfdId, makerTags, unsignedByte, -1, EXV_PRINT_TAG(nikonDateDisplayFormat)), // End of list marker - TagInfo(0xffff, "(UnknownNikonWtTag)", "(UnknownNikonWtTag)", N_("Unknown Nikon World Time Tag"), nikonWtIfdId, makerTags, invalidTypeId, printValue) + TagInfo(0xffff, "(UnknownNikonWtTag)", "(UnknownNikonWtTag)", N_("Unknown Nikon World Time Tag"), nikonWtIfdId, makerTags, invalidTypeId, -1, printValue) }; const TagInfo* Nikon3MakerNote::tagListWt() @@ -743,12 +743,12 @@ namespace Exiv2 { // Nikon3 ISO Info Tag Info const TagInfo Nikon3MakerNote::tagInfoIi_[] = { - TagInfo( 0, "ISO", N_("ISO"), N_("ISO"), nikonIiIfdId, makerTags, unsignedByte, printIiIso), - TagInfo( 4, "ISOExpansion", N_("ISO Expansion"), N_("ISO expansion"), nikonIiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(nikonIsoExpansion)), - TagInfo( 6, "ISO2", N_("ISO 2"), N_("ISO 2"), nikonIiIfdId, makerTags, unsignedByte, printIiIso), - TagInfo(10, "ISOExpansion2", N_("ISO Expansion 2"), N_("ISO expansion 2"), nikonIiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(nikonIsoExpansion)), + TagInfo( 0, "ISO", N_("ISO"), N_("ISO"), nikonIiIfdId, makerTags, unsignedByte, -1, printIiIso), + TagInfo( 4, "ISOExpansion", N_("ISO Expansion"), N_("ISO expansion"), nikonIiIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(nikonIsoExpansion)), + TagInfo( 6, "ISO2", N_("ISO 2"), N_("ISO 2"), nikonIiIfdId, makerTags, unsignedByte, -1, printIiIso), + TagInfo(10, "ISOExpansion2", N_("ISO Expansion 2"), N_("ISO expansion 2"), nikonIiIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(nikonIsoExpansion)), // End of list marker - TagInfo(0xffff, "(UnknownNikonIiTag)", "(UnknownNikonIiTag)", N_("Unknown Nikon Iso Info Tag"), nikonIiIfdId, makerTags, invalidTypeId, printValue) + TagInfo(0xffff, "(UnknownNikonIiTag)", "(UnknownNikonIiTag)", N_("Unknown Nikon Iso Info Tag"), nikonIiIfdId, makerTags, invalidTypeId, -1, printValue) }; const TagInfo* Nikon3MakerNote::tagListIi() @@ -798,11 +798,11 @@ namespace Exiv2 { // Nikon3 Auto Focus Tag Info const TagInfo Nikon3MakerNote::tagInfoAf_[] = { - TagInfo( 0, "AFAreaMode", N_("AF Area Mode"), N_("AF area mode"), nikonAfIfdId, makerTags, unsignedByte, EXV_PRINT_TAG(nikonAfAreaMode)), - TagInfo( 1, "AFPoint", N_("AF Point"), N_("AF point"), nikonAfIfdId, makerTags, unsignedByte, EXV_PRINT_TAG(nikonAfPoint)), - TagInfo( 2, "AFPointsInFocus", N_("AF Points In Focus"), N_("AF points in focus"), nikonAfIfdId, makerTags, unsignedShort, printAfPointsInFocus), + TagInfo( 0, "AFAreaMode", N_("AF Area Mode"), N_("AF area mode"), nikonAfIfdId, makerTags, unsignedByte, -1, EXV_PRINT_TAG(nikonAfAreaMode)), + TagInfo( 1, "AFPoint", N_("AF Point"), N_("AF point"), nikonAfIfdId, makerTags, unsignedByte, -1, EXV_PRINT_TAG(nikonAfPoint)), + TagInfo( 2, "AFPointsInFocus", N_("AF Points In Focus"), N_("AF points in focus"), nikonAfIfdId, makerTags, unsignedShort, -1, printAfPointsInFocus), // End of list marker - TagInfo(0xffff, "(UnknownNikonAfTag)", "(UnknownNikonAfTag)", N_("Unknown Nikon Auto Focus Tag"), nikonAfIfdId, makerTags, invalidTypeId, printValue) + TagInfo(0xffff, "(UnknownNikonAfTag)", "(UnknownNikonAfTag)", N_("Unknown Nikon Auto Focus Tag"), nikonAfIfdId, makerTags, invalidTypeId, -1, printValue) }; const TagInfo* Nikon3MakerNote::tagListAf() @@ -819,21 +819,21 @@ namespace Exiv2 { // Nikon3 Auto Focus Tag Info const TagInfo Nikon3MakerNote::tagInfoAf2_[] = { - TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonAf2IfdId, makerTags, undefined, printExifVersion), - TagInfo( 4, "ContrastDetectAF", N_("Contrast Detect AF"), N_("Contrast detect AF"), nikonAf2IfdId, makerTags, unsignedByte, EXV_PRINT_TAG(nikonOffOn)), - TagInfo( 5, "AFAreaMode", N_("AF Area Mode"), N_("AF area mode"), nikonAf2IfdId, makerTags, unsignedByte, printValue), - TagInfo( 6, "PhaseDetectAF", N_("Phase Detect AF"), N_("Phase detect AF"), nikonAf2IfdId, makerTags, unsignedByte, EXV_PRINT_TAG(nikonPhaseDetectAF)), - TagInfo( 7, "PrimaryAFPoint", N_("Primary AF Point"), N_("Primary AF point"), nikonAf2IfdId, makerTags, unsignedByte, printValue), - TagInfo( 8, "AFPointsUsed", N_("AF Points Used"), N_("AF points used"), nikonAf2IfdId, makerTags, unsignedByte, printValue), - TagInfo( 16, "AFImageWidth", N_("AF Image Width"), N_("AF image width"), nikonAf2IfdId, makerTags, unsignedShort, printValue), - TagInfo( 18, "AFImageHeight", N_("AF Image Height"), N_("AF image height"), nikonAf2IfdId, makerTags, unsignedShort, printValue), - TagInfo( 20, "AFAreaXPosition", N_("AF Area X Position"), N_("AF area x position"), nikonAf2IfdId, makerTags, unsignedShort, printValue), - TagInfo( 22, "AFAreaYPosition", N_("AF Area Y Position"), N_("AF area y position"), nikonAf2IfdId, makerTags, unsignedShort, printValue), - TagInfo( 24, "AFAreaWidth", N_("AF Area Width"), N_("AF area width"), nikonAf2IfdId, makerTags, unsignedShort, printValue), - TagInfo( 26, "AFAreaHeight", N_("AF Area Height"), N_("AF area height"), nikonAf2IfdId, makerTags, unsignedShort, printValue), - TagInfo( 28, "ContrastDetectAFInFocus", N_("Contrast Detect AF In Focus"), N_("Contrast detect AF in focus"), nikonAf2IfdId, makerTags, unsignedShort, printValue), + TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonAf2IfdId, makerTags, undefined, -1, printExifVersion), + TagInfo( 4, "ContrastDetectAF", N_("Contrast Detect AF"), N_("Contrast detect AF"), nikonAf2IfdId, makerTags, unsignedByte, -1, EXV_PRINT_TAG(nikonOffOn)), + TagInfo( 5, "AFAreaMode", N_("AF Area Mode"), N_("AF area mode"), nikonAf2IfdId, makerTags, unsignedByte, -1, printValue), + TagInfo( 6, "PhaseDetectAF", N_("Phase Detect AF"), N_("Phase detect AF"), nikonAf2IfdId, makerTags, unsignedByte, -1, EXV_PRINT_TAG(nikonPhaseDetectAF)), + TagInfo( 7, "PrimaryAFPoint", N_("Primary AF Point"), N_("Primary AF point"), nikonAf2IfdId, makerTags, unsignedByte, -1, printValue), + TagInfo( 8, "AFPointsUsed", N_("AF Points Used"), N_("AF points used"), nikonAf2IfdId, makerTags, unsignedByte, -1, printValue), + TagInfo( 16, "AFImageWidth", N_("AF Image Width"), N_("AF image width"), nikonAf2IfdId, makerTags, unsignedShort, -1, printValue), + TagInfo( 18, "AFImageHeight", N_("AF Image Height"), N_("AF image height"), nikonAf2IfdId, makerTags, unsignedShort, -1, printValue), + TagInfo( 20, "AFAreaXPosition", N_("AF Area X Position"), N_("AF area x position"), nikonAf2IfdId, makerTags, unsignedShort, -1, printValue), + TagInfo( 22, "AFAreaYPosition", N_("AF Area Y Position"), N_("AF area y position"), nikonAf2IfdId, makerTags, unsignedShort, -1, printValue), + TagInfo( 24, "AFAreaWidth", N_("AF Area Width"), N_("AF area width"), nikonAf2IfdId, makerTags, unsignedShort, -1, printValue), + TagInfo( 26, "AFAreaHeight", N_("AF Area Height"), N_("AF area height"), nikonAf2IfdId, makerTags, unsignedShort, -1, printValue), + TagInfo( 28, "ContrastDetectAFInFocus", N_("Contrast Detect AF In Focus"), N_("Contrast detect AF in focus"), nikonAf2IfdId, makerTags, unsignedShort, -1, printValue), // End of list marker - TagInfo(0xffff, "(UnknownNikonAf2Tag)", "(UnknownNikonAf2Tag)", N_("Unknown Nikon Auto Focus 2 Tag"), nikonAf2IfdId, makerTags, invalidTypeId, printValue) + TagInfo(0xffff, "(UnknownNikonAf2Tag)", "(UnknownNikonAf2Tag)", N_("Unknown Nikon Auto Focus 2 Tag"), nikonAf2IfdId, makerTags, invalidTypeId, -1, printValue) }; const TagInfo* Nikon3MakerNote::tagListAf2() @@ -843,11 +843,11 @@ namespace Exiv2 { // Nikon3 File Info Tag Info const TagInfo Nikon3MakerNote::tagInfoFi_[] = { - TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonFiIfdId, makerTags, undefined, printExifVersion), - TagInfo( 6, "DirectoryNumber", N_("Directory Number"), N_("Directory number"), nikonFiIfdId, makerTags, unsignedShort, printValue), - TagInfo( 8, "FileNumber", N_("File Number"), N_("File number"), nikonFiIfdId, makerTags, unsignedShort, printValue), + TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonFiIfdId, makerTags, undefined, -1, printExifVersion), + TagInfo( 6, "DirectoryNumber", N_("Directory Number"), N_("Directory number"), nikonFiIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo( 8, "FileNumber", N_("File Number"), N_("File number"), nikonFiIfdId, makerTags, unsignedShort, -1, printValue), // End of list marker - TagInfo(0xffff, "(UnknownNikonFiTag)", "(UnknownNikonFiTag)", N_("Unknown Nikon File Info Tag"), nikonFiIfdId, makerTags, invalidTypeId, printValue) + TagInfo(0xffff, "(UnknownNikonFiTag)", "(UnknownNikonFiTag)", N_("Unknown Nikon File Info Tag"), nikonFiIfdId, makerTags, invalidTypeId, -1, printValue) }; const TagInfo* Nikon3MakerNote::tagListFi() @@ -864,12 +864,12 @@ namespace Exiv2 { // Nikon3 Multi Exposure Tag Info const TagInfo Nikon3MakerNote::tagInfoMe_[] = { - TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonMeIfdId, makerTags, undefined, printExifVersion), - TagInfo( 4, "MultiExposureMode", N_("Multi Exposure Mode"), N_("Multi exposure mode"), nikonMeIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(nikonMultiExposureMode)), - TagInfo( 8, "MultiExposureShots", N_("Multi Exposure Shots"), N_("Multi exposure shots"), nikonMeIfdId, makerTags, unsignedLong, printValue), - TagInfo( 12, "MultiExposureAutoGain", N_("Multi Exposure Auto Gain"), N_("Multi exposure auto gain"), nikonMeIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(nikonOffOn)), + TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonMeIfdId, makerTags, undefined, -1, printExifVersion), + TagInfo( 4, "MultiExposureMode", N_("Multi Exposure Mode"), N_("Multi exposure mode"), nikonMeIfdId, makerTags, unsignedLong, -1, EXV_PRINT_TAG(nikonMultiExposureMode)), + TagInfo( 8, "MultiExposureShots", N_("Multi Exposure Shots"), N_("Multi exposure shots"), nikonMeIfdId, makerTags, unsignedLong, -1, printValue), + TagInfo( 12, "MultiExposureAutoGain", N_("Multi Exposure Auto Gain"), N_("Multi exposure auto gain"), nikonMeIfdId, makerTags, unsignedLong, -1, EXV_PRINT_TAG(nikonOffOn)), // End of list marker - TagInfo(0xffff, "(UnknownNikonMeTag)", "(UnknownNikonMeTag)", N_("Unknown Nikon Multi Exposure Tag"), nikonMeIfdId, makerTags, invalidTypeId, printValue) + TagInfo(0xffff, "(UnknownNikonMeTag)", "(UnknownNikonMeTag)", N_("Unknown Nikon Multi Exposure Tag"), nikonMeIfdId, makerTags, invalidTypeId, -1, printValue) }; const TagInfo* Nikon3MakerNote::tagListMe() @@ -976,19 +976,19 @@ namespace Exiv2 { // Nikon3 Flash Info 1 Tag Info const TagInfo Nikon3MakerNote::tagInfoFl1_[] = { - TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonFl1IfdId, makerTags, undefined, printExifVersion), - TagInfo( 4, "FlashSource", N_("Flash Source"), N_("Flash source"), nikonFl1IfdId, makerTags, unsignedByte, EXV_PRINT_TAG(nikonFlashSource)), - TagInfo( 5, "0x0005", N_("0x0005"), N_("Unknown"), nikonFl1IfdId, makerTags, unsignedByte, printValue), - TagInfo( 6, "ExternalFlashFirmware", N_("External Flash Firmware"), N_("External flash firmware"), nikonFl1IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(nikonFlashFirmware)), - TagInfo( 8, "ExternalFlashFlags", N_("External Flash Flags"), N_("External flash flags"), nikonFl1IfdId, makerTags, unsignedByte, EXV_PRINT_TAG(nikonExternalFlashFlags)), - TagInfo( 11, "FlashFocalLength", N_("Flash Focal Length"), N_("Flash focal length"), nikonFl1IfdId, makerTags, unsignedByte, printFlashFocalLength), - TagInfo( 12, "RepeatingFlashRate", N_("Repeating Flash Rate"), N_("Repeating flash rate"), nikonFl1IfdId, makerTags, unsignedByte, printRepeatingFlashRate), - TagInfo( 13, "RepeatingFlashCount", N_("Repeating Flash Count"), N_("Repeating flash count"), nikonFl1IfdId, makerTags, unsignedByte, printRepeatingFlashCount), - TagInfo( 14, "FlashGNDistance", N_("Flash GN Distance"), N_("Flash GN distance"), nikonFl1IfdId, makerTags, unsignedByte, EXV_PRINT_TAG(nikonFlashGNDistance)), - TagInfo( 15, "FlashGroupAControlMode", N_("Flash Group A Control Mode"), N_("Flash group a control mode"), nikonFl1IfdId, makerTags, unsignedByte, EXV_PRINT_TAG(nikonFlashControlMode)), - TagInfo( 16, "FlashGroupBControlMode", N_("Flash Group B Control Mode"), N_("Flash group b control mode"), nikonFl1IfdId, makerTags, unsignedByte, EXV_PRINT_TAG(nikonFlashControlMode)), + TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonFl1IfdId, makerTags, undefined, -1, printExifVersion), + TagInfo( 4, "FlashSource", N_("Flash Source"), N_("Flash source"), nikonFl1IfdId, makerTags, unsignedByte, -1, EXV_PRINT_TAG(nikonFlashSource)), + TagInfo( 5, "0x0005", N_("0x0005"), N_("Unknown"), nikonFl1IfdId, makerTags, unsignedByte, -1, printValue), + TagInfo( 6, "ExternalFlashFirmware", N_("External Flash Firmware"), N_("External flash firmware"), nikonFl1IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(nikonFlashFirmware)), + TagInfo( 8, "ExternalFlashFlags", N_("External Flash Flags"), N_("External flash flags"), nikonFl1IfdId, makerTags, unsignedByte, -1, EXV_PRINT_TAG(nikonExternalFlashFlags)), + TagInfo( 11, "FlashFocalLength", N_("Flash Focal Length"), N_("Flash focal length"), nikonFl1IfdId, makerTags, unsignedByte, -1, printFlashFocalLength), + TagInfo( 12, "RepeatingFlashRate", N_("Repeating Flash Rate"), N_("Repeating flash rate"), nikonFl1IfdId, makerTags, unsignedByte, -1, printRepeatingFlashRate), + TagInfo( 13, "RepeatingFlashCount", N_("Repeating Flash Count"), N_("Repeating flash count"), nikonFl1IfdId, makerTags, unsignedByte, -1, printRepeatingFlashCount), + TagInfo( 14, "FlashGNDistance", N_("Flash GN Distance"), N_("Flash GN distance"), nikonFl1IfdId, makerTags, unsignedByte, -1, EXV_PRINT_TAG(nikonFlashGNDistance)), + TagInfo( 15, "FlashGroupAControlMode", N_("Flash Group A Control Mode"), N_("Flash group a control mode"), nikonFl1IfdId, makerTags, unsignedByte, -1, EXV_PRINT_TAG(nikonFlashControlMode)), + TagInfo( 16, "FlashGroupBControlMode", N_("Flash Group B Control Mode"), N_("Flash group b control mode"), nikonFl1IfdId, makerTags, unsignedByte, -1, EXV_PRINT_TAG(nikonFlashControlMode)), // End of list marker - TagInfo(0xffff, "(UnknownNikonMeTag)", "(UnknownNikonMeTag)", N_("Unknown Nikon Multi Exposure Tag"), nikonFl1IfdId, makerTags, invalidTypeId, printValue) + TagInfo(0xffff, "(UnknownNikonMeTag)", "(UnknownNikonMeTag)", N_("Unknown Nikon Multi Exposure Tag"), nikonFl1IfdId, makerTags, invalidTypeId, -1, printValue) }; const TagInfo* Nikon3MakerNote::tagListFl1() @@ -998,17 +998,17 @@ namespace Exiv2 { // Nikon3 Flash Info 2 Tag Info const TagInfo Nikon3MakerNote::tagInfoFl2_[] = { - TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonFl2IfdId, makerTags, undefined, printExifVersion), - TagInfo( 4, "FlashSource", N_("Flash Source"), N_("Flash source"), nikonFl2IfdId, makerTags, unsignedByte, EXV_PRINT_TAG(nikonFlashSource)), - TagInfo( 5, "0x0005", N_("0x0005"), N_("Unknown"), nikonFl2IfdId, makerTags, unsignedByte, printValue), - TagInfo( 6, "ExternalFlashFirmware", N_("External Flash Firmware"), N_("External flash firmware"), nikonFl2IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(nikonFlashFirmware)), - TagInfo( 8, "ExternalFlashFlags", N_("External Flash Flags"), N_("External flash flags"), nikonFl2IfdId, makerTags, unsignedByte, EXV_PRINT_TAG(nikonExternalFlashFlags)), - TagInfo( 12, "FlashFocalLength", N_("Flash Focal Length"), N_("Flash focal length"), nikonFl2IfdId, makerTags, unsignedByte, printFlashFocalLength), - TagInfo( 13, "RepeatingFlashRate", N_("Repeating Flash Rate"), N_("Repeating flash rate"), nikonFl2IfdId, makerTags, unsignedByte, printRepeatingFlashRate), - TagInfo( 14, "RepeatingFlashCount", N_("Repeating Flash Count"), N_("Repeating flash count"), nikonFl2IfdId, makerTags, unsignedByte, printRepeatingFlashCount), - TagInfo( 15, "FlashGNDistance", N_("Flash GN Distance"), N_("Flash GN distance"), nikonFl2IfdId, makerTags, unsignedByte, EXV_PRINT_TAG(nikonFlashGNDistance)), + TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonFl2IfdId, makerTags, undefined, -1, printExifVersion), + TagInfo( 4, "FlashSource", N_("Flash Source"), N_("Flash source"), nikonFl2IfdId, makerTags, unsignedByte, -1, EXV_PRINT_TAG(nikonFlashSource)), + TagInfo( 5, "0x0005", N_("0x0005"), N_("Unknown"), nikonFl2IfdId, makerTags, unsignedByte, -1, printValue), + TagInfo( 6, "ExternalFlashFirmware", N_("External Flash Firmware"), N_("External flash firmware"), nikonFl2IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(nikonFlashFirmware)), + TagInfo( 8, "ExternalFlashFlags", N_("External Flash Flags"), N_("External flash flags"), nikonFl2IfdId, makerTags, unsignedByte, -1, EXV_PRINT_TAG(nikonExternalFlashFlags)), + TagInfo( 12, "FlashFocalLength", N_("Flash Focal Length"), N_("Flash focal length"), nikonFl2IfdId, makerTags, unsignedByte, -1, printFlashFocalLength), + TagInfo( 13, "RepeatingFlashRate", N_("Repeating Flash Rate"), N_("Repeating flash rate"), nikonFl2IfdId, makerTags, unsignedByte, -1, printRepeatingFlashRate), + TagInfo( 14, "RepeatingFlashCount", N_("Repeating Flash Count"), N_("Repeating flash count"), nikonFl2IfdId, makerTags, unsignedByte, -1, printRepeatingFlashCount), + TagInfo( 15, "FlashGNDistance", N_("Flash GN Distance"), N_("Flash GN distance"), nikonFl2IfdId, makerTags, unsignedByte, -1, EXV_PRINT_TAG(nikonFlashGNDistance)), // End of list marker - TagInfo(0xffff, "(UnknownNikonMeTag)", "(UnknownNikonMeTag)", N_("Unknown Nikon Multi Exposure Tag"), nikonFl2IfdId, makerTags, invalidTypeId, printValue) + TagInfo(0xffff, "(UnknownNikonMeTag)", "(UnknownNikonMeTag)", N_("Unknown Nikon Multi Exposure Tag"), nikonFl2IfdId, makerTags, invalidTypeId, -1, printValue) }; const TagInfo* Nikon3MakerNote::tagListFl2() @@ -1018,17 +1018,17 @@ namespace Exiv2 { // Nikon3 Flash Info 3 Tag Info const TagInfo Nikon3MakerNote::tagInfoFl3_[] = { - TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonFl3IfdId, makerTags, undefined, printExifVersion), - TagInfo( 4, "FlashSource", N_("Flash Source"), N_("Flash source"), nikonFl3IfdId, makerTags, unsignedByte, EXV_PRINT_TAG(nikonFlashSource)), - TagInfo( 6, "ExternalFlashFirmware", N_("External Flash Firmware"), N_("External flash firmware"), nikonFl3IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(nikonFlashFirmware)), - TagInfo( 8, "ExternalFlashFlags", N_("External Flash Flags"), N_("External flash flags"), nikonFl3IfdId, makerTags, unsignedByte, EXV_PRINT_TAG(nikonExternalFlashFlags)), - TagInfo( 12, "FlashFocalLength", N_("Flash Focal Length"), N_("Flash focal length"), nikonFl3IfdId, makerTags, unsignedByte, printFlashFocalLength), - TagInfo( 13, "RepeatingFlashRate", N_("Repeating Flash Rate"), N_("Repeating flash rate"), nikonFl3IfdId, makerTags, unsignedByte, printRepeatingFlashRate), - TagInfo( 14, "RepeatingFlashCount", N_("Repeating Flash Count"), N_("Repeating flash count"), nikonFl3IfdId, makerTags, unsignedByte, printRepeatingFlashCount), - TagInfo( 15, "FlashGNDistance", N_("Flash GN Distance"), N_("Flash GN distance"), nikonFl3IfdId, makerTags, unsignedByte, EXV_PRINT_TAG(nikonFlashGNDistance)), - TagInfo( 16, "FlashColorFilter", N_("Flash Color Filter"), N_("Flash color filter"), nikonFl3IfdId, makerTags, unsignedByte, EXV_PRINT_TAG(nikonFlashColorFilter)), + TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonFl3IfdId, makerTags, undefined, -1, printExifVersion), + TagInfo( 4, "FlashSource", N_("Flash Source"), N_("Flash source"), nikonFl3IfdId, makerTags, unsignedByte, -1, EXV_PRINT_TAG(nikonFlashSource)), + TagInfo( 6, "ExternalFlashFirmware", N_("External Flash Firmware"), N_("External flash firmware"), nikonFl3IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(nikonFlashFirmware)), + TagInfo( 8, "ExternalFlashFlags", N_("External Flash Flags"), N_("External flash flags"), nikonFl3IfdId, makerTags, unsignedByte, -1, EXV_PRINT_TAG(nikonExternalFlashFlags)), + TagInfo( 12, "FlashFocalLength", N_("Flash Focal Length"), N_("Flash focal length"), nikonFl3IfdId, makerTags, unsignedByte, -1, printFlashFocalLength), + TagInfo( 13, "RepeatingFlashRate", N_("Repeating Flash Rate"), N_("Repeating flash rate"), nikonFl3IfdId, makerTags, unsignedByte, -1, printRepeatingFlashRate), + TagInfo( 14, "RepeatingFlashCount", N_("Repeating Flash Count"), N_("Repeating flash count"), nikonFl3IfdId, makerTags, unsignedByte, -1, printRepeatingFlashCount), + TagInfo( 15, "FlashGNDistance", N_("Flash GN Distance"), N_("Flash GN distance"), nikonFl3IfdId, makerTags, unsignedByte, -1, EXV_PRINT_TAG(nikonFlashGNDistance)), + TagInfo( 16, "FlashColorFilter", N_("Flash Color Filter"), N_("Flash color filter"), nikonFl3IfdId, makerTags, unsignedByte, -1, EXV_PRINT_TAG(nikonFlashColorFilter)), // End of list marker - TagInfo(0xffff, "(UnknownNikonMeTag)", "(UnknownNikonMeTag)", N_("Unknown Nikon Multi Exposure Tag"), nikonFl3IfdId, makerTags, invalidTypeId, printValue) + TagInfo(0xffff, "(UnknownNikonMeTag)", "(UnknownNikonMeTag)", N_("Unknown Nikon Multi Exposure Tag"), nikonFl3IfdId, makerTags, invalidTypeId, -1, printValue) }; const TagInfo* Nikon3MakerNote::tagListFl3() @@ -1038,10 +1038,10 @@ namespace Exiv2 { // Nikon3 Shot Info D80 Tag Info const TagInfo Nikon3MakerNote::tagInfoSi1_[] = { - TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonSi1IfdId, makerTags, unsignedByte, printExifVersion), - TagInfo( 586, "ShutterCount", N_("Shutter Count"), N_("Shutter count"), nikonSi1IfdId, makerTags, unsignedLong, printValue), + TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonSi1IfdId, makerTags, unsignedByte, -1, printExifVersion), + TagInfo( 586, "ShutterCount", N_("Shutter Count"), N_("Shutter count"), nikonSi1IfdId, makerTags, unsignedLong, -1, printValue), // End of list marker - TagInfo(0xffff, "(UnknownNikonSi1Tag)", "(UnknownNikonSi1Tag)", N_("Unknown Nikon Shot Info D80 Tag"), nikonSi1IfdId, makerTags, invalidTypeId, printValue) + TagInfo(0xffff, "(UnknownNikonSi1Tag)", "(UnknownNikonSi1Tag)", N_("Unknown Nikon Shot Info D80 Tag"), nikonSi1IfdId, makerTags, invalidTypeId, -1, printValue) }; const TagInfo* Nikon3MakerNote::tagListSi1() @@ -1051,11 +1051,11 @@ namespace Exiv2 { // Nikon3 Shot Info D40 Tag Info const TagInfo Nikon3MakerNote::tagInfoSi2_[] = { - TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonSi2IfdId, makerTags, unsignedByte, printExifVersion), - TagInfo( 582, "ShutterCount", N_("Shutter Count"), N_("Shutter count"), nikonSi2IfdId, makerTags, unsignedLong, printValue), - TagInfo( 738, "FlashLevel", N_("Flash Level"), N_("Flash level"), nikonSi2IfdId, makerTags, unsignedByte, printValue), + TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonSi2IfdId, makerTags, unsignedByte, -1, printExifVersion), + TagInfo( 582, "ShutterCount", N_("Shutter Count"), N_("Shutter count"), nikonSi2IfdId, makerTags, unsignedLong, -1, printValue), + TagInfo( 738, "FlashLevel", N_("Flash Level"), N_("Flash level"), nikonSi2IfdId, makerTags, unsignedByte, -1, printValue), // End of list marker - TagInfo(0xffff, "(UnknownNikonSi2Tag)", "(UnknownNikonSi2Tag)", N_("Unknown Nikon Shot Info D40 Tag"), nikonSi2IfdId, makerTags, invalidTypeId, printValue) + TagInfo(0xffff, "(UnknownNikonSi2Tag)", "(UnknownNikonSi2Tag)", N_("Unknown Nikon Shot Info D40 Tag"), nikonSi2IfdId, makerTags, invalidTypeId, -1, printValue) }; const TagInfo* Nikon3MakerNote::tagListSi2() @@ -1110,12 +1110,12 @@ namespace Exiv2 { // Nikon3 Shot Info D300 (a) Tag Info const TagInfo Nikon3MakerNote::tagInfoSi3_[] = { - TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonSi3IfdId, makerTags, unsignedByte, printExifVersion), - TagInfo( 604, "ISO", N_("ISO"), N_("ISO"), nikonSi3IfdId, makerTags, unsignedByte, printIiIso), - TagInfo( 633, "ShutterCount", N_("Shutter Count"), N_("Shutter count"), nikonSi3IfdId, makerTags, unsignedLong, printValue), - TagInfo( 721, "AFFineTuneAdj", N_("AF Fine Tune Adj"), N_("AF fine tune adj"), nikonSi3IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(nikonAfFineTuneAdj1)), + TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonSi3IfdId, makerTags, unsignedByte, -1, printExifVersion), + TagInfo( 604, "ISO", N_("ISO"), N_("ISO"), nikonSi3IfdId, makerTags, unsignedByte, -1, printIiIso), + TagInfo( 633, "ShutterCount", N_("Shutter Count"), N_("Shutter count"), nikonSi3IfdId, makerTags, unsignedLong, -1, printValue), + TagInfo( 721, "AFFineTuneAdj", N_("AF Fine Tune Adj"), N_("AF fine tune adj"), nikonSi3IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(nikonAfFineTuneAdj1)), // End of list marker - TagInfo(0xffff, "(UnknownNikonSi3Tag)", "(UnknownNikonSi3Tag)", N_("Unknown Nikon Shot Info D300 (a) Tag"), nikonSi3IfdId, makerTags, invalidTypeId, printValue) + TagInfo(0xffff, "(UnknownNikonSi3Tag)", "(UnknownNikonSi3Tag)", N_("Unknown Nikon Shot Info D300 (a) Tag"), nikonSi3IfdId, makerTags, invalidTypeId, -1, printValue) }; const TagInfo* Nikon3MakerNote::tagListSi3() @@ -1170,12 +1170,12 @@ namespace Exiv2 { // Nikon3 Shot Info D300 (b) Tag Info const TagInfo Nikon3MakerNote::tagInfoSi4_[] = { - TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonSi4IfdId, makerTags, unsignedByte, printExifVersion), - TagInfo( 613, "ISO", N_("ISO"), N_("ISO"), nikonSi4IfdId, makerTags, unsignedByte, printIiIso), - TagInfo( 644, "ShutterCount", N_("Shutter Count"), N_("Shutter count"), nikonSi4IfdId, makerTags, unsignedLong, printValue), - TagInfo( 732, "AFFineTuneAdj", N_("AF Fine Tune Adj"), N_("AF fine tune adj"), nikonSi4IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(nikonAfFineTuneAdj2)), + TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonSi4IfdId, makerTags, unsignedByte, -1, printExifVersion), + TagInfo( 613, "ISO", N_("ISO"), N_("ISO"), nikonSi4IfdId, makerTags, unsignedByte, -1, printIiIso), + TagInfo( 644, "ShutterCount", N_("Shutter Count"), N_("Shutter count"), nikonSi4IfdId, makerTags, unsignedLong, -1, printValue), + TagInfo( 732, "AFFineTuneAdj", N_("AF Fine Tune Adj"), N_("AF fine tune adj"), nikonSi4IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(nikonAfFineTuneAdj2)), // End of list marker - TagInfo(0xffff, "(UnknownNikonSi4Tag)", "(UnknownNikonSi4Tag)", N_("Unknown Nikon Shot Info D300 (b) Tag"), nikonSi4IfdId, makerTags, invalidTypeId, printValue) + TagInfo(0xffff, "(UnknownNikonSi4Tag)", "(UnknownNikonSi4Tag)", N_("Unknown Nikon Shot Info D300 (b) Tag"), nikonSi4IfdId, makerTags, invalidTypeId, -1, printValue) }; const TagInfo* Nikon3MakerNote::tagListSi4() @@ -1200,17 +1200,17 @@ namespace Exiv2 { // Nikon3 Shot Info Tag Info const TagInfo Nikon3MakerNote::tagInfoSi5_[] = { - TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonSi5IfdId, makerTags, unsignedByte, printExifVersion), - TagInfo( 106, "ShutterCount1", N_("Shutter Count 1"), N_("Shutter count 1"), nikonSi5IfdId, makerTags, unsignedLong, printValue), - TagInfo( 110, "DeletedImageCount", N_("Deleted Image Count"), N_("Deleted image count"), nikonSi5IfdId, makerTags, unsignedLong, printValue), - TagInfo( 117, "VibrationReduction", N_("Vibration Reduction"), N_("Vibration reduction"), nikonSi5IfdId, makerTags, unsignedByte, EXV_PRINT_TAG(nikonOffOn2)), - TagInfo( 130, "VibrationReduction1", N_(""), N_(""), nikonSi5IfdId, makerTags, unsignedByte, EXV_PRINT_TAG(nikonOffOn)), - TagInfo( 343, "ShutterCount2", N_("Shutter Count 2"), N_("Shutter count 2"), nikonSi5IfdId, makerTags, undefined, printValue), - TagInfo( 430, "VibrationReduction2", N_("Vibration Reduction 2"), N_("Vibration reduction 2"), nikonSi5IfdId, makerTags, unsignedByte, EXV_PRINT_TAG(nikonOffOn3)), - TagInfo( 598, "ISO", N_("ISO"), N_("ISO"), nikonSi5IfdId, makerTags, unsignedByte, printIiIso), - TagInfo( 630, "ShutterCount", N_("Shutter Count"), N_("Shutter count"), nikonSi5IfdId, makerTags, unsignedLong, printValue), + TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonSi5IfdId, makerTags, unsignedByte, -1, printExifVersion), + TagInfo( 106, "ShutterCount1", N_("Shutter Count 1"), N_("Shutter count 1"), nikonSi5IfdId, makerTags, unsignedLong, -1, printValue), + TagInfo( 110, "DeletedImageCount", N_("Deleted Image Count"), N_("Deleted image count"), nikonSi5IfdId, makerTags, unsignedLong, -1, printValue), + TagInfo( 117, "VibrationReduction", N_("Vibration Reduction"), N_("Vibration reduction"), nikonSi5IfdId, makerTags, unsignedByte, -1, EXV_PRINT_TAG(nikonOffOn2)), + TagInfo( 130, "VibrationReduction1", N_(""), N_(""), nikonSi5IfdId, makerTags, unsignedByte, -1, EXV_PRINT_TAG(nikonOffOn)), + TagInfo( 343, "ShutterCount2", N_("Shutter Count 2"), N_("Shutter count 2"), nikonSi5IfdId, makerTags, undefined, -1, printValue), + TagInfo( 430, "VibrationReduction2", N_("Vibration Reduction 2"), N_("Vibration reduction 2"), nikonSi5IfdId, makerTags, unsignedByte, -1, EXV_PRINT_TAG(nikonOffOn3)), + TagInfo( 598, "ISO", N_("ISO"), N_("ISO"), nikonSi5IfdId, makerTags, unsignedByte, -1, printIiIso), + TagInfo( 630, "ShutterCount", N_("Shutter Count"), N_("Shutter count"), nikonSi5IfdId, makerTags, unsignedLong, -1, printValue), // End of list marker - TagInfo(0xffff, "(UnknownNikonSi5Tag)", "(UnknownNikonSi5Tag)", N_("Unknown Nikon Shot Info Tag"), nikonSi5IfdId, makerTags, invalidTypeId, printValue) + TagInfo(0xffff, "(UnknownNikonSi5Tag)", "(UnknownNikonSi5Tag)", N_("Unknown Nikon Shot Info Tag"), nikonSi5IfdId, makerTags, invalidTypeId, -1, printValue) }; const TagInfo* Nikon3MakerNote::tagListSi5() @@ -1220,10 +1220,10 @@ namespace Exiv2 { // Nikon3 Color Balance 1 Tag Info const TagInfo Nikon3MakerNote::tagInfoCb1_[] = { - TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonCb1IfdId, makerTags, undefined, printExifVersion), - TagInfo(36, "WB_RBGGLevels", N_("WB RBGG Levels"), N_("WB RBGG levels"), nikonCb1IfdId, makerTags, unsignedShort, printValue), + TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonCb1IfdId, makerTags, undefined, -1, printExifVersion), + TagInfo(36, "WB_RBGGLevels", N_("WB RBGG Levels"), N_("WB RBGG levels"), nikonCb1IfdId, makerTags, unsignedShort, -1, printValue), // End of list marker - TagInfo(0xffff, "(UnknownNikonCb1Tag)", "(UnknownNikonCb1Tag)", N_("Unknown Nikon Color Balance 1 Tag"), nikonCb1IfdId, makerTags, invalidTypeId, printValue) + TagInfo(0xffff, "(UnknownNikonCb1Tag)", "(UnknownNikonCb1Tag)", N_("Unknown Nikon Color Balance 1 Tag"), nikonCb1IfdId, makerTags, invalidTypeId, -1, printValue) }; const TagInfo* Nikon3MakerNote::tagListCb1() @@ -1233,10 +1233,10 @@ namespace Exiv2 { // Nikon3 Color Balance 2 Tag Info const TagInfo Nikon3MakerNote::tagInfoCb2_[] = { - TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonCb2IfdId, makerTags, undefined, printExifVersion), - TagInfo( 5, "WB_RGGBLevels", N_("WB RGGB Levels"), N_("WB RGGB levels"), nikonCb2IfdId, makerTags, unsignedShort, printValue), + TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonCb2IfdId, makerTags, undefined, -1, printExifVersion), + TagInfo( 5, "WB_RGGBLevels", N_("WB RGGB Levels"), N_("WB RGGB levels"), nikonCb2IfdId, makerTags, unsignedShort, -1, printValue), // End of list marker - TagInfo(0xffff, "(UnknownNikonCb2Tag)", "(UnknownNikonCb2Tag)", N_("Unknown Nikon Color Balance 2 Tag"), nikonCb2IfdId, makerTags, invalidTypeId, printValue) + TagInfo(0xffff, "(UnknownNikonCb2Tag)", "(UnknownNikonCb2Tag)", N_("Unknown Nikon Color Balance 2 Tag"), nikonCb2IfdId, makerTags, invalidTypeId, -1, printValue) }; const TagInfo* Nikon3MakerNote::tagListCb2() @@ -1246,10 +1246,10 @@ namespace Exiv2 { // Nikon3 Color Balance 2a Tag Info const TagInfo Nikon3MakerNote::tagInfoCb2a_[] = { - TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonCb2aIfdId, makerTags, undefined, printExifVersion), - TagInfo( 9, "WB_RGGBLevels", N_("WB RGGB Levels"), N_("WB RGGB levels"), nikonCb2aIfdId, makerTags, unsignedShort, printValue), + TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonCb2aIfdId, makerTags, undefined, -1, printExifVersion), + TagInfo( 9, "WB_RGGBLevels", N_("WB RGGB Levels"), N_("WB RGGB levels"), nikonCb2aIfdId, makerTags, unsignedShort, -1, printValue), // End of list marker - TagInfo(0xffff, "(UnknownNikonCb2aTag)", "(UnknownNikonCb2aTag)", N_("Unknown Nikon Color Balance 2a Tag"), nikonCb2aIfdId, makerTags, invalidTypeId, printValue) + TagInfo(0xffff, "(UnknownNikonCb2aTag)", "(UnknownNikonCb2aTag)", N_("Unknown Nikon Color Balance 2a Tag"), nikonCb2aIfdId, makerTags, invalidTypeId, -1, printValue) }; const TagInfo* Nikon3MakerNote::tagListCb2a() @@ -1259,10 +1259,10 @@ namespace Exiv2 { // Nikon3 Color Balance 2b Tag Info const TagInfo Nikon3MakerNote::tagInfoCb2b_[] = { - TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonCb2bIfdId, makerTags, undefined, printExifVersion), - TagInfo(145, "WB_RGGBLevels", N_("WB RGGB Levels"), N_("WB RGGB levels"), nikonCb2bIfdId, makerTags, unsignedShort, printValue), + TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonCb2bIfdId, makerTags, undefined, -1, printExifVersion), + TagInfo(145, "WB_RGGBLevels", N_("WB RGGB Levels"), N_("WB RGGB levels"), nikonCb2bIfdId, makerTags, unsignedShort, -1, printValue), // End of list marker - TagInfo(0xffff, "(UnknownNikonCb2bTag)", "(UnknownNikonCb2bTag)", N_("Unknown Nikon Color Balance 2b Tag"), nikonCb2bIfdId, makerTags, invalidTypeId, printValue) + TagInfo(0xffff, "(UnknownNikonCb2bTag)", "(UnknownNikonCb2bTag)", N_("Unknown Nikon Color Balance 2b Tag"), nikonCb2bIfdId, makerTags, invalidTypeId, -1, printValue) }; const TagInfo* Nikon3MakerNote::tagListCb2b() @@ -1272,10 +1272,10 @@ namespace Exiv2 { // Nikon3 Color Balance 3 Tag Info const TagInfo Nikon3MakerNote::tagInfoCb3_[] = { - TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonCb3IfdId, makerTags, undefined, printExifVersion), - TagInfo(10, "WB_RGBGLevels", N_("WB RGBG Levels"), N_("WB RGBG levels"), nikonCb3IfdId, makerTags, unsignedShort, printValue), + TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonCb3IfdId, makerTags, undefined, -1, printExifVersion), + TagInfo(10, "WB_RGBGLevels", N_("WB RGBG Levels"), N_("WB RGBG levels"), nikonCb3IfdId, makerTags, unsignedShort, -1, printValue), // End of list marker - TagInfo(0xffff, "(UnknownNikonCb3Tag)", "(UnknownNikonCb3Tag)", N_("Unknown Nikon Color Balance 3 Tag"), nikonCb3IfdId, makerTags, invalidTypeId, printValue) + TagInfo(0xffff, "(UnknownNikonCb3Tag)", "(UnknownNikonCb3Tag)", N_("Unknown Nikon Color Balance 3 Tag"), nikonCb3IfdId, makerTags, invalidTypeId, -1, printValue) }; const TagInfo* Nikon3MakerNote::tagListCb3() @@ -1285,10 +1285,10 @@ namespace Exiv2 { // Nikon3 Color Balance 4 Tag Info const TagInfo Nikon3MakerNote::tagInfoCb4_[] = { - TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonCb4IfdId, makerTags, undefined, printExifVersion), - TagInfo(147, "WB_GRBGLevels", N_("WB GRBG Levels"), N_("WB GRBG levels"), nikonCb4IfdId, makerTags, unsignedShort, printValue), + TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonCb4IfdId, makerTags, undefined, -1, printExifVersion), + TagInfo(147, "WB_GRBGLevels", N_("WB GRBG Levels"), N_("WB GRBG levels"), nikonCb4IfdId, makerTags, unsignedShort, -1, printValue), // End of list marker - TagInfo(0xffff, "(UnknownNikonCb4Tag)", "(UnknownNikonCb4Tag)", N_("Unknown Nikon Color Balance 4 Tag"), nikonCb4IfdId, makerTags, invalidTypeId, printValue) + TagInfo(0xffff, "(UnknownNikonCb4Tag)", "(UnknownNikonCb4Tag)", N_("Unknown Nikon Color Balance 4 Tag"), nikonCb4IfdId, makerTags, invalidTypeId, -1, printValue) }; const TagInfo* Nikon3MakerNote::tagListCb4() @@ -1298,16 +1298,16 @@ namespace Exiv2 { // Nikon3 Lens Data 1 Tag Info const TagInfo Nikon3MakerNote::tagInfoLd1_[] = { - TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonLd1IfdId, makerTags, undefined, printExifVersion), - TagInfo( 6, "LensIDNumber", N_("Lens ID Number"), N_("Lens ID number"), nikonLd1IfdId, makerTags, unsignedByte, printLensId1), - TagInfo( 7, "LensFStops", N_("Lens F-Stops"), N_("Lens F-stops"), nikonLd1IfdId, makerTags, unsignedByte, printFStops), - TagInfo( 8, "MinFocalLength", N_("Min Focal Length"), N_("Min focal length"), nikonLd1IfdId, makerTags, unsignedByte, printFocal), - TagInfo( 9, "MaxFocalLength", N_("Max Focal Length"), N_("Max focal length"), nikonLd1IfdId, makerTags, unsignedByte, printFocal), - TagInfo(10, "MaxApertureAtMinFocal", N_("Max Aperture At Min Focal"), N_("Max aperture at min focal"), nikonLd1IfdId, makerTags, unsignedByte, printAperture), - TagInfo(11, "MaxApertureAtMaxFocal", N_("Max Aperture At Max Focal"), N_("Max aperture at max focal"), nikonLd1IfdId, makerTags, unsignedByte, printAperture), - TagInfo(12, "MCUVersion", N_("MCU Version"), N_("MCU version"), nikonLd1IfdId, makerTags, unsignedByte, printValue), + TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonLd1IfdId, makerTags, undefined, -1, printExifVersion), + TagInfo( 6, "LensIDNumber", N_("Lens ID Number"), N_("Lens ID number"), nikonLd1IfdId, makerTags, unsignedByte, -1, printLensId1), + TagInfo( 7, "LensFStops", N_("Lens F-Stops"), N_("Lens F-stops"), nikonLd1IfdId, makerTags, unsignedByte, -1, printFStops), + TagInfo( 8, "MinFocalLength", N_("Min Focal Length"), N_("Min focal length"), nikonLd1IfdId, makerTags, unsignedByte, -1, printFocal), + TagInfo( 9, "MaxFocalLength", N_("Max Focal Length"), N_("Max focal length"), nikonLd1IfdId, makerTags, unsignedByte, -1, printFocal), + TagInfo(10, "MaxApertureAtMinFocal", N_("Max Aperture At Min Focal"), N_("Max aperture at min focal"), nikonLd1IfdId, makerTags, unsignedByte, -1, printAperture), + TagInfo(11, "MaxApertureAtMaxFocal", N_("Max Aperture At Max Focal"), N_("Max aperture at max focal"), nikonLd1IfdId, makerTags, unsignedByte, -1, printAperture), + TagInfo(12, "MCUVersion", N_("MCU Version"), N_("MCU version"), nikonLd1IfdId, makerTags, unsignedByte, -1, printValue), // End of list marker - TagInfo(0xffff, "(UnknownNikonLd1Tag)", "(UnknownNikonLd1Tag)", N_("Unknown Nikon Lens Data 1 Tag"), nikonLd1IfdId, makerTags, invalidTypeId, printValue) + TagInfo(0xffff, "(UnknownNikonLd1Tag)", "(UnknownNikonLd1Tag)", N_("Unknown Nikon Lens Data 1 Tag"), nikonLd1IfdId, makerTags, invalidTypeId, -1, printValue) }; const TagInfo* Nikon3MakerNote::tagListLd1() @@ -1317,22 +1317,22 @@ namespace Exiv2 { // Nikon3 Lens Data 2 Tag Info const TagInfo Nikon3MakerNote::tagInfoLd2_[] = { - TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonLd2IfdId, makerTags, undefined, printExifVersion), - TagInfo( 4, "ExitPupilPosition", N_("Exit Pupil Position"), N_("Exit pupil position"), nikonLd2IfdId, makerTags, unsignedByte, printExitPupilPosition), - TagInfo( 5, "AFAperture", N_("AF Aperture"), N_("AF aperture"), nikonLd2IfdId, makerTags, unsignedByte, printAperture), - TagInfo( 8, "FocusPosition", N_("Focus Position"), N_("Focus position"), nikonLd2IfdId, makerTags, unsignedByte, printValue), - TagInfo( 9, "FocusDistance", N_("Focus Distance"), N_("Focus distance"), nikonLd2IfdId, makerTags, unsignedByte, printFocusDistance), - TagInfo(10, "FocalLength", N_("Focal Length"), N_("Focal length"), nikonLd2IfdId, makerTags, unsignedByte, printFocal), - TagInfo(11, "LensIDNumber", N_("Lens ID Number"), N_("Lens ID number"), nikonLd2IfdId, makerTags, unsignedByte, printLensId2), - TagInfo(12, "LensFStops", N_("Lens F-Stops"), N_("Lens F-stops"), nikonLd2IfdId, makerTags, unsignedByte, printFStops), - TagInfo(13, "MinFocalLength", N_("Min Focal Length"), N_("Min focal length"), nikonLd2IfdId, makerTags, unsignedByte, printFocal), - TagInfo(14, "MaxFocalLength", N_("Max Focal Length"), N_("Max focal length"), nikonLd2IfdId, makerTags, unsignedByte, printFocal), - TagInfo(15, "MaxApertureAtMinFocal", N_("Max Aperture At Min Focal"), N_("Max aperture at min focal"), nikonLd2IfdId, makerTags, unsignedByte, printAperture), - TagInfo(16, "MaxApertureAtMaxFocal", N_("Max Aperture At Max Focal"), N_("Max aperture at max focal"), nikonLd2IfdId, makerTags, unsignedByte, printAperture), - TagInfo(17, "MCUVersion", N_("MCU Version"), N_("MCU version"), nikonLd2IfdId, makerTags, unsignedByte, printValue), - TagInfo(18, "EffectiveMaxAperture", N_("Effective Max Aperture"), N_("Effective max aperture"), nikonLd2IfdId, makerTags, unsignedByte, printAperture), + TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonLd2IfdId, makerTags, undefined, -1, printExifVersion), + TagInfo( 4, "ExitPupilPosition", N_("Exit Pupil Position"), N_("Exit pupil position"), nikonLd2IfdId, makerTags, unsignedByte, -1, printExitPupilPosition), + TagInfo( 5, "AFAperture", N_("AF Aperture"), N_("AF aperture"), nikonLd2IfdId, makerTags, unsignedByte, -1, printAperture), + TagInfo( 8, "FocusPosition", N_("Focus Position"), N_("Focus position"), nikonLd2IfdId, makerTags, unsignedByte, -1, printValue), + TagInfo( 9, "FocusDistance", N_("Focus Distance"), N_("Focus distance"), nikonLd2IfdId, makerTags, unsignedByte, -1, printFocusDistance), + TagInfo(10, "FocalLength", N_("Focal Length"), N_("Focal length"), nikonLd2IfdId, makerTags, unsignedByte, -1, printFocal), + TagInfo(11, "LensIDNumber", N_("Lens ID Number"), N_("Lens ID number"), nikonLd2IfdId, makerTags, unsignedByte, -1, printLensId2), + TagInfo(12, "LensFStops", N_("Lens F-Stops"), N_("Lens F-stops"), nikonLd2IfdId, makerTags, unsignedByte, -1, printFStops), + TagInfo(13, "MinFocalLength", N_("Min Focal Length"), N_("Min focal length"), nikonLd2IfdId, makerTags, unsignedByte, -1, printFocal), + TagInfo(14, "MaxFocalLength", N_("Max Focal Length"), N_("Max focal length"), nikonLd2IfdId, makerTags, unsignedByte, -1, printFocal), + TagInfo(15, "MaxApertureAtMinFocal", N_("Max Aperture At Min Focal"), N_("Max aperture at min focal"), nikonLd2IfdId, makerTags, unsignedByte, -1, printAperture), + TagInfo(16, "MaxApertureAtMaxFocal", N_("Max Aperture At Max Focal"), N_("Max aperture at max focal"), nikonLd2IfdId, makerTags, unsignedByte, -1, printAperture), + TagInfo(17, "MCUVersion", N_("MCU Version"), N_("MCU version"), nikonLd2IfdId, makerTags, unsignedByte, -1, printValue), + TagInfo(18, "EffectiveMaxAperture", N_("Effective Max Aperture"), N_("Effective max aperture"), nikonLd2IfdId, makerTags, unsignedByte, -1, printAperture), // End of list marker - TagInfo(0xffff, "(UnknownNikonLd2Tag)", "(UnknownNikonLd2Tag)", N_("Unknown Nikon Lens Data 2 Tag"), nikonLd2IfdId, makerTags, invalidTypeId, printValue) + TagInfo(0xffff, "(UnknownNikonLd2Tag)", "(UnknownNikonLd2Tag)", N_("Unknown Nikon Lens Data 2 Tag"), nikonLd2IfdId, makerTags, invalidTypeId, -1, printValue) }; const TagInfo* Nikon3MakerNote::tagListLd2() @@ -1342,22 +1342,22 @@ namespace Exiv2 { // Nikon3 Lens Data 3 Tag Info const TagInfo Nikon3MakerNote::tagInfoLd3_[] = { - TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonLd3IfdId, makerTags, undefined, printExifVersion), - TagInfo( 4, "ExitPupilPosition", N_("Exit Pupil Position"), N_("Exit pupil position"), nikonLd3IfdId, makerTags, unsignedByte, printExitPupilPosition), - TagInfo( 5, "AFAperture", N_("AF Aperture"), N_("AF aperture"), nikonLd3IfdId, makerTags, unsignedByte, printAperture), - TagInfo( 8, "FocusPosition", N_("Focus Position"), N_("Focus position"), nikonLd3IfdId, makerTags, unsignedByte, printValue), - TagInfo(10, "FocusDistance", N_("Focus Distance"), N_("Focus distance"), nikonLd3IfdId, makerTags, unsignedByte, printFocusDistance), - TagInfo(11, "FocalLength", N_("Focal Length"), N_("Focal length"), nikonLd3IfdId, makerTags, unsignedByte, printFocal), - TagInfo(12, "LensIDNumber", N_("Lens ID Number"), N_("Lens ID number"), nikonLd3IfdId, makerTags, unsignedByte, printLensId3), - TagInfo(13, "LensFStops", N_("Lens F-Stops"), N_("Lens F-stops"), nikonLd3IfdId, makerTags, unsignedByte, printFStops), - TagInfo(14, "MinFocalLength", N_("Min Focal Length"), N_("Min focal length"), nikonLd3IfdId, makerTags, unsignedByte, printFocal), - TagInfo(15, "MaxFocalLength", N_("Max Focal Length"), N_("Max focal length"), nikonLd3IfdId, makerTags, unsignedByte, printFocal), - TagInfo(16, "MaxApertureAtMinFocal", N_("Max Aperture At Min Focal"), N_("Max aperture at min focal length"), nikonLd3IfdId, makerTags, unsignedByte, printAperture), - TagInfo(17, "MaxApertureAtMaxFocal", N_("Max Aperture At Max Focal"), N_("Max aperture at max focal length"), nikonLd3IfdId, makerTags, unsignedByte, printAperture), - TagInfo(18, "MCUVersion", N_("MCU Version"), N_("MCU version"), nikonLd3IfdId, makerTags, unsignedByte, printValue), - TagInfo(19, "EffectiveMaxAperture", N_("Effective Max Aperture"), N_("Effective max aperture"), nikonLd3IfdId, makerTags, unsignedByte, printAperture), + TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonLd3IfdId, makerTags, undefined, -1, printExifVersion), + TagInfo( 4, "ExitPupilPosition", N_("Exit Pupil Position"), N_("Exit pupil position"), nikonLd3IfdId, makerTags, unsignedByte, -1, printExitPupilPosition), + TagInfo( 5, "AFAperture", N_("AF Aperture"), N_("AF aperture"), nikonLd3IfdId, makerTags, unsignedByte, -1, printAperture), + TagInfo( 8, "FocusPosition", N_("Focus Position"), N_("Focus position"), nikonLd3IfdId, makerTags, unsignedByte, -1, printValue), + TagInfo(10, "FocusDistance", N_("Focus Distance"), N_("Focus distance"), nikonLd3IfdId, makerTags, unsignedByte, -1, printFocusDistance), + TagInfo(11, "FocalLength", N_("Focal Length"), N_("Focal length"), nikonLd3IfdId, makerTags, unsignedByte, -1, printFocal), + TagInfo(12, "LensIDNumber", N_("Lens ID Number"), N_("Lens ID number"), nikonLd3IfdId, makerTags, unsignedByte, -1, printLensId3), + TagInfo(13, "LensFStops", N_("Lens F-Stops"), N_("Lens F-stops"), nikonLd3IfdId, makerTags, unsignedByte, -1, printFStops), + TagInfo(14, "MinFocalLength", N_("Min Focal Length"), N_("Min focal length"), nikonLd3IfdId, makerTags, unsignedByte, -1, printFocal), + TagInfo(15, "MaxFocalLength", N_("Max Focal Length"), N_("Max focal length"), nikonLd3IfdId, makerTags, unsignedByte, -1, printFocal), + TagInfo(16, "MaxApertureAtMinFocal", N_("Max Aperture At Min Focal"), N_("Max aperture at min focal length"), nikonLd3IfdId, makerTags, unsignedByte, -1, printAperture), + TagInfo(17, "MaxApertureAtMaxFocal", N_("Max Aperture At Max Focal"), N_("Max aperture at max focal length"), nikonLd3IfdId, makerTags, unsignedByte, -1, printAperture), + TagInfo(18, "MCUVersion", N_("MCU Version"), N_("MCU version"), nikonLd3IfdId, makerTags, unsignedByte, -1, printValue), + TagInfo(19, "EffectiveMaxAperture", N_("Effective Max Aperture"), N_("Effective max aperture"), nikonLd3IfdId, makerTags, unsignedByte, -1, printAperture), // End of list marker - TagInfo(0xffff, "(UnknownNikonLd3Tag)", "(UnknownNikonLd3Tag)", N_("Unknown Nikon Lens Data 3 Tag"), nikonLd3IfdId, makerTags, invalidTypeId, printValue) + TagInfo(0xffff, "(UnknownNikonLd3Tag)", "(UnknownNikonLd3Tag)", N_("Unknown Nikon Lens Data 3 Tag"), nikonLd3IfdId, makerTags, invalidTypeId, -1, printValue) }; const TagInfo* Nikon3MakerNote::tagListLd3() diff --git a/src/olympusmn.cpp b/src/olympusmn.cpp index b8d0d258..1f654cbf 100644 --- a/src/olympusmn.cpp +++ b/src/olympusmn.cpp @@ -184,292 +184,292 @@ namespace Exiv2 { add Minolta makenotes tags here (0x0000-0x0103). See Exiftool database.*/ TagInfo(0x0000, "0x0000", "0x0000", N_("Unknown"), - olympusIfdId, makerTags, unsignedShort, printValue), + olympusIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x0100, "ThumbnailImage", N_("Thumbnail Image"), N_("Thumbnail image"), - olympusIfdId, makerTags, undefined, printValue), + olympusIfdId, makerTags, undefined, -1, printValue), TagInfo(0x0104, "BodyFirmwareVersion", N_("Body Firmware Version"), N_("Body firmware version"), - olympusIfdId, makerTags, asciiString, printValue), + olympusIfdId, makerTags, asciiString, -1, printValue), TagInfo(0x0200, "SpecialMode", N_("Special Mode"), N_("Picture taking mode"), - olympusIfdId, makerTags, unsignedLong, print0x0200), + olympusIfdId, makerTags, unsignedLong, -1, print0x0200), TagInfo(0x0201, "Quality", N_("Quality"), N_("Image quality setting"), - olympusIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusQuality)), + olympusIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusQuality)), TagInfo(0x0202, "Macro", N_("Macro"), N_("Macro mode"), - olympusIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusMacro)), + olympusIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusMacro)), TagInfo(0x0203, "BWMode", N_("Black & White Mode"), N_("Black and white mode"), - olympusIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusOffOn)), + olympusIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusOffOn)), TagInfo(0x0204, "DigitalZoom", N_("Digital Zoom"), N_("Digital zoom ratio"), - olympusIfdId, makerTags, unsignedRational, print0x0204), + olympusIfdId, makerTags, unsignedRational, -1, print0x0204), TagInfo(0x0205, "FocalPlaneDiagonal", N_("Focal Plane Diagonal"), N_("Focal plane diagonal"), - olympusIfdId, makerTags, unsignedRational, printValue), + olympusIfdId, makerTags, unsignedRational, -1, printValue), TagInfo(0x0206, "LensDistortionParams", N_("Lens Distortion Parameters"), N_("Lens distortion parameters"), - olympusIfdId, makerTags, signedShort, printValue), + olympusIfdId, makerTags, signedShort, -1, printValue), TagInfo(0x0207, "CameraType", N_("Camera Type"), N_("Camera type"), - olympusIfdId, makerTags, asciiString, printValue), + olympusIfdId, makerTags, asciiString, -1, printValue), TagInfo(0x0208, "PictureInfo", N_("Picture Info"), N_("ASCII format data such as [PictureInfo]"), - olympusIfdId, makerTags, asciiString, printValue), + olympusIfdId, makerTags, asciiString, -1, printValue), TagInfo(0x0209, "CameraID", N_("Camera ID"), N_("Camera ID data"), - olympusIfdId, makerTags, asciiString, print0x0209), + olympusIfdId, makerTags, asciiString, -1, print0x0209), TagInfo(0x020b, "ImageWidth", N_("Image Width"), N_("Image width"), - olympusIfdId, makerTags, unsignedShort, printValue), + olympusIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x020c, "ImageHeight", N_("Image Height"), N_("Image height"), - olympusIfdId, makerTags, unsignedShort, printValue), + olympusIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x020d, "Software", N_("Software"), N_("Software"), - olympusIfdId, makerTags, asciiString, printValue), + olympusIfdId, makerTags, asciiString, -1, printValue), TagInfo(0x0280, "PreviewImage", N_("Preview Image"), N_("Preview image"), - olympusIfdId, makerTags, unsignedByte, printValue), + olympusIfdId, makerTags, unsignedByte, -1, printValue), TagInfo(0x0300, "PreCaptureFrames", N_("Pre Capture Frames"), N_("Pre-capture frames"), - olympusIfdId, makerTags, unsignedShort, printValue), + olympusIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x0301, "WhiteBoard", N_("White Board"), N_("White board"), - olympusIfdId, makerTags, unsignedShort, printValue), + olympusIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x0302, "OneTouchWB", N_("One Touch WB"), N_("One touch white balance"), - olympusIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusOneTouchWb)), + olympusIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusOneTouchWb)), TagInfo(0x0303, "WhiteBalanceBracket", N_("White Balance Bracket"), N_("White balance bracket"), - olympusIfdId, makerTags, unsignedShort, printValue), + olympusIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x0304, "WhiteBalanceBias", N_("White Balance Bias"), N_("White balance bias"), - olympusIfdId, makerTags, unsignedShort, printValue), + olympusIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x0403, "SceneMode", N_("Scene Mode"), N_("Scene mode"), - olympusCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusSceneMode)), + olympusCsIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusSceneMode)), TagInfo(0x0404, "Firmware", N_("Firmware"), N_("Firmwarer"), - olympusIfdId, makerTags, asciiString, printValue), + olympusIfdId, makerTags, asciiString, -1, printValue), TagInfo(0x0e00, "PrintIM", N_("Print IM"), N_("PrintIM information"), - olympusIfdId, makerTags, undefined, printValue), + olympusIfdId, makerTags, undefined, -1, printValue), TagInfo(0x0f00, "DataDump1", N_("Data Dump 1"), N_("Various camera settings 1"), - olympusIfdId, makerTags, undefined, printValue), + olympusIfdId, makerTags, undefined, -1, printValue), TagInfo(0x0f01, "DataDump2", N_("Data Dump 2"), N_("Various camera settings 2"), - olympusIfdId, makerTags, undefined, printValue), + olympusIfdId, makerTags, undefined, -1, printValue), TagInfo(0x1000, "ShutterSpeed", N_("Shutter Speed"), N_("Shutter speed value"), - olympusIfdId, makerTags, signedRational, printValue), + olympusIfdId, makerTags, signedRational, -1, printValue), TagInfo(0x1001, "ISOSpeed", N_("ISO Speed"), N_("ISO speed value"), - olympusIfdId, makerTags, signedRational, printValue), + olympusIfdId, makerTags, signedRational, -1, printValue), TagInfo(0x1002, "ApertureValue", N_("Aperture Value"), N_("Aperture value"), - olympusIfdId, makerTags, signedRational, printValue), + olympusIfdId, makerTags, signedRational, -1, printValue), TagInfo(0x1003, "Brightness", N_("Brightness"), N_("Brightness value"), - olympusIfdId, makerTags, signedRational, printValue), + olympusIfdId, makerTags, signedRational, -1, printValue), TagInfo(0x1004, "FlashMode", N_("Flash Mode"), N_("Flash mode"), - olympusIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusOffOn)), + olympusIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusOffOn)), TagInfo(0x1005, "FlashDevice", N_("Flash Device"), N_("Flash device"), - olympusIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusFlashDevice)), + olympusIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusFlashDevice)), TagInfo(0x1006, "Bracket", N_("Bracket"), N_("Exposure compensation value"), - olympusIfdId, makerTags, signedRational, printValue), + olympusIfdId, makerTags, signedRational, -1, printValue), TagInfo(0x1007, "SensorTemperature", N_("Sensor Temperature"), N_("Sensor temperature"), - olympusIfdId, makerTags, signedShort, printValue), + olympusIfdId, makerTags, signedShort, -1, printValue), TagInfo(0x1008, "LensTemperature", N_("Lens Temperature"), N_("Lens temperature"), - olympusIfdId, makerTags, signedShort, printValue), + olympusIfdId, makerTags, signedShort, -1, printValue), TagInfo(0x1009, "LightCondition", N_("Light Condition"), N_("Light condition"), - olympusIfdId, makerTags, unsignedShort, printValue), + olympusIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x100a, "FocusRange", N_("Focus Range"), N_("Focus range"), - olympusIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusFocusRange)), + olympusIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusFocusRange)), TagInfo(0x100b, "FocusMode", N_("Focus Mode"), N_("Focus mode"), - olympusIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusFocusMode)), + olympusIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusFocusMode)), TagInfo(0x100c, "FocusDistance", N_("Focus Distance"), N_("Manual focus distance"), - olympusIfdId, makerTags, unsignedRational, printValue), + olympusIfdId, makerTags, unsignedRational, -1, printValue), TagInfo(0x100d, "Zoom", N_("Zoom"), N_("Zoom step count"), - olympusIfdId, makerTags, unsignedShort, printValue), + olympusIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x100e, "MacroFocus", N_("Macro Focus"), N_("Macro focus step count"), - olympusIfdId, makerTags, unsignedShort, printValue), + olympusIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x100f, "SharpnessFactor", N_("Sharpness Factor"), N_("Sharpness factor"), - olympusIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusSharpness)), + olympusIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusSharpness)), TagInfo(0x1010, "FlashChargeLevel", N_("Flash Charge Level"), N_("Flash charge level"), - olympusIfdId, makerTags, unsignedShort, printValue), + olympusIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x1011, "ColorMatrix", N_("Color Matrix"), N_("Color matrix"), - olympusIfdId, makerTags, unsignedShort, printValue), + olympusIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x1012, "BlackLevel", N_("BlackLevel"), N_("Black level"), - olympusIfdId, makerTags, unsignedShort, printValue), + olympusIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x1013, "0x1013", "0x1013", N_("Unknown"), - olympusIfdId, makerTags, unsignedShort, printValue), + olympusIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x1014, "0x1014", "0x1014", N_("Unknown"), - olympusIfdId, makerTags, unsignedShort, printValue), + olympusIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x1015, "WhiteBalance", N_("White Balance"), N_("White balance mode"), - olympusIfdId, makerTags, unsignedShort, print0x1015), + olympusIfdId, makerTags, unsignedShort, -1, print0x1015), TagInfo(0x1016, "0x1016", "0x1016", N_("Unknown"), - olympusIfdId, makerTags, unsignedShort, printValue), + olympusIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x1017, "RedBalance", N_("Red Balance"), N_("Red balance"), - olympusIfdId, makerTags, unsignedShort, printValue), + olympusIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x1018, "BlueBalance", N_("Blue Balance"), N_("Blue balance"), - olympusIfdId, makerTags, unsignedShort, printValue), + olympusIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x1019, "ColorMatrixNumber", N_("Color Matrix Number"), N_("Color matrix mumber"), - olympusIfdId, makerTags, unsignedShort, printValue), + olympusIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x101a, "SerialNumber2", N_("Serial Number 2"), N_("Serial number 2"), - olympusIfdId, makerTags, asciiString, printValue), + olympusIfdId, makerTags, asciiString, -1, printValue), TagInfo(0x101b, "0x101b", "0x101b", N_("Unknown"), - olympusIfdId, makerTags, unsignedLong, printValue), + olympusIfdId, makerTags, unsignedLong, -1, printValue), TagInfo(0x101c, "0x101c", "0x101c", N_("Unknown"), - olympusIfdId, makerTags, unsignedLong, printValue), + olympusIfdId, makerTags, unsignedLong, -1, printValue), TagInfo(0x101d, "0x101d", "0x101d", N_("Unknown"), - olympusIfdId, makerTags, unsignedLong, printValue), + olympusIfdId, makerTags, unsignedLong, -1, printValue), TagInfo(0x101e, "0x101e", "0x101e", N_("Unknown"), - olympusIfdId, makerTags, unsignedLong, printValue), + olympusIfdId, makerTags, unsignedLong, -1, printValue), TagInfo(0x101f, "0x101f", "0x101f", N_("Unknown"), - olympusIfdId, makerTags, unsignedLong, printValue), + olympusIfdId, makerTags, unsignedLong, -1, printValue), TagInfo(0x1020, "0x1020", "0x1020", N_("Unknown"), - olympusIfdId, makerTags, unsignedLong, printValue), + olympusIfdId, makerTags, unsignedLong, -1, printValue), TagInfo(0x1021, "0x1021", "0x1021", N_("Unknown"), - olympusIfdId, makerTags, unsignedLong, printValue), + olympusIfdId, makerTags, unsignedLong, -1, printValue), TagInfo(0x1022, "0x1022", "0x1022", N_("Unknown"), - olympusIfdId, makerTags, unsignedLong, printValue), + olympusIfdId, makerTags, unsignedLong, -1, printValue), TagInfo(0x1023, "FlashBias", N_("Flash Bias"), N_("Flash exposure compensation"), - olympusIfdId, makerTags, signedRational, printValue), + olympusIfdId, makerTags, signedRational, -1, printValue), TagInfo(0x1024, "0x1024", "0x1024", N_("Unknown"), - olympusIfdId, makerTags, unsignedShort, printValue), + olympusIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x1025, "0x1025", "0x1025", N_("Unknown"), - olympusIfdId, makerTags, signedRational, printValue), + olympusIfdId, makerTags, signedRational, -1, printValue), TagInfo(0x1026, "ExternalFlashBounce", N_("External Flash Bounce"), N_("External flash bounce"), - olympusIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusOffOn)), + olympusIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusOffOn)), TagInfo(0x1027, "ExternalFlashZoom", N_("External Flash Zoom"), N_("External flash zoom"), - olympusIfdId, makerTags, unsignedShort, printValue), + olympusIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x1028, "ExternalFlashMode", N_("External Flash Mode"), N_("External flash mode"), - olympusIfdId, makerTags, unsignedShort, printValue), + olympusIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x1029, "Contrast", N_("Contrast"), N_("Contrast setting"), - olympusIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusContrast)), + olympusIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusContrast)), TagInfo(0x102a, "SharpnessFactor", N_("Sharpness Factor"), N_("Sharpness factor"), - olympusIfdId, makerTags, unsignedShort, printValue), + olympusIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x102b, "ColorControl", N_("Color Control"), N_("Color control"), - olympusIfdId, makerTags, unsignedShort, printValue), + olympusIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x102c, "ValidBits", N_("ValidBits"), N_("Valid bits"), - olympusIfdId, makerTags, unsignedShort, printValue), + olympusIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x102d, "CoringFilter", N_("CoringFilter"), N_("Coring filter"), - olympusIfdId, makerTags, unsignedShort, printValue), + olympusIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x102e, "ImageWidth", N_("Image Width"), N_("Image width"), - olympusIfdId, makerTags, unsignedLong, printValue), + olympusIfdId, makerTags, unsignedLong, -1, printValue), TagInfo(0x102f, "ImageHeight", N_("Image Height"), N_("Image height"), - olympusIfdId, makerTags, unsignedLong, printValue), + olympusIfdId, makerTags, unsignedLong, -1, printValue), TagInfo(0x1030, "0x1030", "0x1030", N_("Unknown"), - olympusIfdId, makerTags, unsignedShort, printValue), + olympusIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x1031, "0x1031", "0x1031", N_("Unknown"), - olympusIfdId, makerTags, unsignedLong, printValue), + olympusIfdId, makerTags, unsignedLong, -1, printValue), TagInfo(0x1032, "0x1032", "0x1032", N_("Unknown"), - olympusIfdId, makerTags, unsignedShort, printValue), + olympusIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x1033, "0x1033", "0x1033", N_("Unknown"), - olympusIfdId, makerTags, unsignedLong, printValue), + olympusIfdId, makerTags, unsignedLong, -1, printValue), TagInfo(0x1034, "CompressionRatio", N_("Compression Ratio"), N_("Compression ratio"), - olympusIfdId, makerTags, unsignedRational, printValue), + olympusIfdId, makerTags, unsignedRational, -1, printValue), TagInfo(0x1035, "Thumbnail", N_("Thumbnail"), N_("Preview image embedded"), - olympusIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(olympusOffOn)), + olympusIfdId, makerTags, unsignedLong, -1, EXV_PRINT_TAG(olympusOffOn)), TagInfo(0x1036, "ThumbnailOffset", N_("Thumbnail Offset"), N_("Offset of the preview image"), - olympusIfdId, makerTags, unsignedLong, printValue), + olympusIfdId, makerTags, unsignedLong, -1, printValue), TagInfo(0x1037, "ThumbnailLength", N_("Thumbnail Length"), N_("Size of the preview image"), - olympusIfdId, makerTags, unsignedLong, printValue), + olympusIfdId, makerTags, unsignedLong, -1, printValue), TagInfo(0x1039, "CCDScanMode", N_("CCD Scan Mode"), N_("CCD scan mode"), - olympusIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusCCDScanMode)), + olympusIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusCCDScanMode)), TagInfo(0x103a, "NoiseReduction", N_("Noise Reduction"), N_("Noise reduction"), - olympusIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusOffOn)), + olympusIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusOffOn)), TagInfo(0x103b, "InfinityLensStep", N_("Infinity Lens Step"), N_("Infinity lens step"), - olympusIfdId, makerTags, unsignedShort, printValue), + olympusIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x103c, "NearLensStep", N_("Near Lens Step"), N_("Near lens step"), - olympusIfdId, makerTags, unsignedShort, printValue), + olympusIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x2010, "Equipment", N_("Equipment Info"), N_("Camera equipment sub-IFD"), - olympusIfdId, makerTags, unsignedLong, printValue), + olympusIfdId, makerTags, unsignedLong, -1, printValue), TagInfo(0x2020, "CameraSettings", N_("Camera Settings"), N_("Camera Settings sub-IFD"), - olympusIfdId, makerTags, unsignedLong, printValue), + olympusIfdId, makerTags, unsignedLong, -1, printValue), TagInfo(0x2030, "RawDevelopment", N_("Raw Development"), N_("Raw development sub-IFD"), - olympusIfdId, makerTags, unsignedLong, printValue), + olympusIfdId, makerTags, unsignedLong, -1, printValue), TagInfo(0x2031, "RawDevelopment2", N_("Raw Development 2"), N_("Raw development 2 sub-IFD"), - olympusIfdId, makerTags, unsignedLong, printValue), + olympusIfdId, makerTags, unsignedLong, -1, printValue), TagInfo(0x2040, "ImageProcessing", N_("Image Processing"), N_("Image processing sub-IFD"), - olympusIfdId, makerTags, unsignedLong, printValue), + olympusIfdId, makerTags, unsignedLong, -1, printValue), TagInfo(0x2050, "FocusInfo", N_("Focus Info"), N_("Focus sub-IFD"), - olympusIfdId, makerTags, unsignedLong, printValue), + olympusIfdId, makerTags, unsignedLong, -1, printValue), TagInfo(0x3000, "RawInfo", N_("Raw Info"), N_("Raw sub-IFD"), - olympusIfdId, makerTags, unsignedLong, printValue), + olympusIfdId, makerTags, unsignedLong, -1, printValue), // End of list marker TagInfo(0xffff, "(UnknownOlympusMakerNoteTag)", "(UnknownOlympusMakerNoteTag)", N_("Unknown OlympusMakerNote tag"), - olympusIfdId, makerTags, invalidTypeId, printValue) + olympusIfdId, makerTags, invalidTypeId, -1, printValue) }; const TagInfo* OlympusMakerNote::tagList() @@ -653,62 +653,62 @@ namespace Exiv2 { }; const TagInfo OlympusMakerNote::tagInfoCs_[] = { - TagInfo(0x0000, "CameraSettingsVersion", N_("Camera Settings Version"), N_("Camera settings version"), olympusCsIfdId, makerTags, undefined, printExifVersion), - TagInfo(0x0100, "PreviewImageValid", N_("PreviewImage Valid"), N_("Preview image valid"), olympusCsIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(olympusNoYes)), - TagInfo(0x0101, "PreviewImageStart", N_("PreviewImage Start"), N_("Preview image start"), olympusCsIfdId, makerTags, unsignedLong, printValue), - TagInfo(0x0102, "PreviewImageLength", N_("PreviewImage Length"), N_("Preview image length"), olympusCsIfdId, makerTags, unsignedLong, printValue), - TagInfo(0x0200, "ExposureMode", N_("Exposure Mode"), N_("Exposure mode"), olympusCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusExposureMode)), - TagInfo(0x0201, "AELock", N_("AE Lock"), N_("Auto exposure lock"), olympusCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusOffOn)), - TagInfo(0x0202, "MeteringMode", N_("Metering Mode"), N_("Metering mode"), olympusCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusMeteringMode)), - TagInfo(0x0203, "ExposureShift", N_("Exposure Shift"), N_("Exposure shift"), olympusCsIfdId, makerTags, signedRational, printValue), - TagInfo(0x0300, "MacroMode", N_("Macro Mode"), N_("Macro mode"), olympusCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusMacroMode)), - TagInfo(0x0301, "FocusMode", N_("Focus Mode"), N_("Focus mode"), olympusCsIfdId, makerTags, unsignedShort, printCs0x0301), - TagInfo(0x0302, "FocusProcess", N_("Focus Process"), N_("Focus process"), olympusCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusFocusProcess)), - TagInfo(0x0303, "AFSearch", N_("AF Search"), N_("AF search"), olympusCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusAFSearch)), - TagInfo(0x0304, "AFAreas", N_("AF Areas"), N_("AF areas"), olympusCsIfdId, makerTags, unsignedLong, printValue), - TagInfo(0x0305, "AFPointSelected", N_("AFPointSelected"), N_("AFPointSelected"), olympusCsIfdId, makerTags, signedRational, printValue), - TagInfo(0x0307, "AFFineTuneAdj", N_("AF Fine Tune Adjust"), N_("AF fine tune adjust"), olympusCsIfdId, makerTags, signedShort, printValue), - TagInfo(0x0400, "FlashMode", N_("Flash Mode"), N_("Flash mode"), olympusCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG_BITMASK(olympusFlashMode)), - TagInfo(0x0401, "FlashExposureComp", N_("Flash Exposure Compensation"), N_("Flash exposure compensation"), olympusCsIfdId, makerTags, signedRational, printValue), - TagInfo(0x0403, "FlashRemoteControl", N_("Flash Remote Control"), N_("Flash remote control"), olympusCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusFlashRemoteControl)), - TagInfo(0x0404, "FlashControlMode", N_("Flash Control Mode"), N_("Flash control mode"), olympusCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusFlashControlMode)), - TagInfo(0x0405, "FlashIntensity", N_("Flash Intensity"), N_("Flash intensity"), olympusCsIfdId, makerTags, signedRational, printValue), - TagInfo(0x0406, "ManualFlashStrength", N_("Manual Flash Strength"), N_("Manual flash strength"), olympusCsIfdId, makerTags, signedRational, printValue), - TagInfo(0x0500, "WhiteBalance", N_("White Balance 2"), N_("White balance 2"), olympusCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusWhiteBalance)), - TagInfo(0x0501, "WhiteBalanceTemperature", N_("White Balance Temperature"), N_("White balance temperature"), olympusCsIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0502, "WhiteBalanceBracket", N_("White Balance Bracket"), N_("White balance bracket"), olympusCsIfdId, makerTags, signedShort, printValue), - TagInfo(0x0503, "CustomSaturation", N_("Custom Saturation"), N_("Custom saturation"), olympusCsIfdId, makerTags, signedShort, printValue), - TagInfo(0x0504, "ModifiedSaturation", N_("Modified Saturation"), N_("Modified saturation"), olympusCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusModifiedSaturation)), - TagInfo(0x0505, "ContrastSetting", N_("Contrast Setting"), N_("Contrast setting"), olympusCsIfdId, makerTags, signedShort, printValue), - TagInfo(0x0506, "SharpnessSetting", N_("Sharpness Setting"), N_("Sharpness setting"), olympusCsIfdId, makerTags, signedShort, printValue), - TagInfo(0x0507, "ColorSpace", N_("Color Space"), N_("Color space"), olympusCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusColorSpace)), - TagInfo(0x0509, "SceneMode", N_("Scene Mode"), N_("Scene mode"), olympusCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusSceneMode)), - TagInfo(0x050a, "NoiseReduction", N_("Noise Reduction"), N_("Noise reduction"), olympusCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG_BITMASK(olympusNoiseReduction)), - TagInfo(0x050b, "DistortionCorrection", N_("Distortion Correction"), N_("Distortion correction"), olympusCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusOffOn)), - TagInfo(0x050c, "ShadingCompensation", N_("Shading Compensation"), N_("Shading compensation"), olympusCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusOffOn)), - TagInfo(0x050d, "CompressionFactor", N_("Compression Factor"), N_("Compression factor"), olympusCsIfdId, makerTags, unsignedRational, printValue), - TagInfo(0x050f, "Gradation", N_("Gradation"), N_("Gradation"), olympusCsIfdId, makerTags, signedShort, print0x050f), - TagInfo(0x0520, "PictureMode", N_("Picture Mode"), N_("Picture mode"), olympusCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusPictureMode)), - TagInfo(0x0521, "PictureModeSaturation", N_("Picture Mode Saturation"), N_("Picture mode saturation"), olympusCsIfdId, makerTags, signedShort, printValue), - TagInfo(0x0522, "PictureModeHue", N_("Picture Mode Hue"), N_("Picture mode hue"), olympusCsIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0523, "PictureModeContrast", N_("Picture Mode Contrast"), N_("Picture mode contrast"), olympusCsIfdId, makerTags, signedShort, printValue), - TagInfo(0x0524, "PictureModeSharpness", N_("Picture Mode Sharpness"), N_("Picture mode sharpness"), olympusCsIfdId, makerTags, signedShort, printValue), - TagInfo(0x0525, "PictureModeBWFilter", N_("Picture Mode BW Filter"), N_("Picture mode BW filter"), olympusCsIfdId, makerTags, signedShort, EXV_PRINT_TAG(olympusPictureModeBWFilter)), - TagInfo(0x0526, "PictureModeTone", N_("Picture Mode Tone"), N_("Picture mode tone"), olympusCsIfdId, makerTags, signedShort, EXV_PRINT_TAG(olympusPictureModeTone)), - TagInfo(0x0527, "NoiseFilter", N_("Noise Filter"), N_("Noise filter"), olympusCsIfdId, makerTags, signedShort, print0x0527), - TagInfo(0x0529, "ArtFilter", N_("Art Filter"), N_("Art filter"), olympusCsIfdId, makerTags, unsignedShort, print0x0529), - TagInfo(0x052c, "MagicFilter", N_("Magic Filter"), N_("Magic filter"), olympusCsIfdId, makerTags, unsignedShort, print0x0529), - TagInfo(0x0600, "DriveMode", N_("Drive Mode"), N_("Drive mode"), olympusCsIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0601, "PanoramaMode", N_("Panorama Mode"), N_("Panorama mode"), olympusCsIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0603, "Quality", N_("Image Quality 2"), N_("Image quality 2"), olympusCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusCsQuality)), - TagInfo(0x0604, "ImageStabilization", N_("Image Stabilization"), N_("Image stabilization"), olympusCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusImageStabilization)), - TagInfo(0x0900, "ManometerPressure", N_("Manometer Pressure"), N_("Manometer pressure"), olympusCsIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0901, "ManometerReading", N_("Manometer Reading"), N_("Manometer reading"), olympusCsIfdId, makerTags, signedLong, printValue), - TagInfo(0x0902, "ExtendedWBDetect", N_("Extended WB Detect"), N_("Extended WB detect"), olympusCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusOffOn)), - TagInfo(0x0903, "LevelGaugeRoll", N_("Level Gauge Roll"), N_("Level gauge roll"), olympusCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusOffOn)), - TagInfo(0x0904, "LevelGaugePitch", N_("Level Gauge Pitch"), N_("Level gauge pitch"), olympusCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusOffOn)), + TagInfo(0x0000, "CameraSettingsVersion", N_("Camera Settings Version"), N_("Camera settings version"), olympusCsIfdId, makerTags, undefined, -1, printExifVersion), + TagInfo(0x0100, "PreviewImageValid", N_("PreviewImage Valid"), N_("Preview image valid"), olympusCsIfdId, makerTags, unsignedLong, -1, EXV_PRINT_TAG(olympusNoYes)), + TagInfo(0x0101, "PreviewImageStart", N_("PreviewImage Start"), N_("Preview image start"), olympusCsIfdId, makerTags, unsignedLong, -1, printValue), + TagInfo(0x0102, "PreviewImageLength", N_("PreviewImage Length"), N_("Preview image length"), olympusCsIfdId, makerTags, unsignedLong, -1, printValue), + TagInfo(0x0200, "ExposureMode", N_("Exposure Mode"), N_("Exposure mode"), olympusCsIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusExposureMode)), + TagInfo(0x0201, "AELock", N_("AE Lock"), N_("Auto exposure lock"), olympusCsIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusOffOn)), + TagInfo(0x0202, "MeteringMode", N_("Metering Mode"), N_("Metering mode"), olympusCsIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusMeteringMode)), + TagInfo(0x0203, "ExposureShift", N_("Exposure Shift"), N_("Exposure shift"), olympusCsIfdId, makerTags, signedRational, -1, printValue), + TagInfo(0x0300, "MacroMode", N_("Macro Mode"), N_("Macro mode"), olympusCsIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusMacroMode)), + TagInfo(0x0301, "FocusMode", N_("Focus Mode"), N_("Focus mode"), olympusCsIfdId, makerTags, unsignedShort, -1, printCs0x0301), + TagInfo(0x0302, "FocusProcess", N_("Focus Process"), N_("Focus process"), olympusCsIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusFocusProcess)), + TagInfo(0x0303, "AFSearch", N_("AF Search"), N_("AF search"), olympusCsIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusAFSearch)), + TagInfo(0x0304, "AFAreas", N_("AF Areas"), N_("AF areas"), olympusCsIfdId, makerTags, unsignedLong, -1, printValue), + TagInfo(0x0305, "AFPointSelected", N_("AFPointSelected"), N_("AFPointSelected"), olympusCsIfdId, makerTags, signedRational, -1, printValue), + TagInfo(0x0307, "AFFineTuneAdj", N_("AF Fine Tune Adjust"), N_("AF fine tune adjust"), olympusCsIfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x0400, "FlashMode", N_("Flash Mode"), N_("Flash mode"), olympusCsIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG_BITMASK(olympusFlashMode)), + TagInfo(0x0401, "FlashExposureComp", N_("Flash Exposure Compensation"), N_("Flash exposure compensation"), olympusCsIfdId, makerTags, signedRational, -1, printValue), + TagInfo(0x0403, "FlashRemoteControl", N_("Flash Remote Control"), N_("Flash remote control"), olympusCsIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusFlashRemoteControl)), + TagInfo(0x0404, "FlashControlMode", N_("Flash Control Mode"), N_("Flash control mode"), olympusCsIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusFlashControlMode)), + TagInfo(0x0405, "FlashIntensity", N_("Flash Intensity"), N_("Flash intensity"), olympusCsIfdId, makerTags, signedRational, -1, printValue), + TagInfo(0x0406, "ManualFlashStrength", N_("Manual Flash Strength"), N_("Manual flash strength"), olympusCsIfdId, makerTags, signedRational, -1, printValue), + TagInfo(0x0500, "WhiteBalance", N_("White Balance 2"), N_("White balance 2"), olympusCsIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusWhiteBalance)), + TagInfo(0x0501, "WhiteBalanceTemperature", N_("White Balance Temperature"), N_("White balance temperature"), olympusCsIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0502, "WhiteBalanceBracket", N_("White Balance Bracket"), N_("White balance bracket"), olympusCsIfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x0503, "CustomSaturation", N_("Custom Saturation"), N_("Custom saturation"), olympusCsIfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x0504, "ModifiedSaturation", N_("Modified Saturation"), N_("Modified saturation"), olympusCsIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusModifiedSaturation)), + TagInfo(0x0505, "ContrastSetting", N_("Contrast Setting"), N_("Contrast setting"), olympusCsIfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x0506, "SharpnessSetting", N_("Sharpness Setting"), N_("Sharpness setting"), olympusCsIfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x0507, "ColorSpace", N_("Color Space"), N_("Color space"), olympusCsIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusColorSpace)), + TagInfo(0x0509, "SceneMode", N_("Scene Mode"), N_("Scene mode"), olympusCsIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusSceneMode)), + TagInfo(0x050a, "NoiseReduction", N_("Noise Reduction"), N_("Noise reduction"), olympusCsIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG_BITMASK(olympusNoiseReduction)), + TagInfo(0x050b, "DistortionCorrection", N_("Distortion Correction"), N_("Distortion correction"), olympusCsIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusOffOn)), + TagInfo(0x050c, "ShadingCompensation", N_("Shading Compensation"), N_("Shading compensation"), olympusCsIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusOffOn)), + TagInfo(0x050d, "CompressionFactor", N_("Compression Factor"), N_("Compression factor"), olympusCsIfdId, makerTags, unsignedRational, -1, printValue), + TagInfo(0x050f, "Gradation", N_("Gradation"), N_("Gradation"), olympusCsIfdId, makerTags, signedShort, -1, print0x050f), + TagInfo(0x0520, "PictureMode", N_("Picture Mode"), N_("Picture mode"), olympusCsIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusPictureMode)), + TagInfo(0x0521, "PictureModeSaturation", N_("Picture Mode Saturation"), N_("Picture mode saturation"), olympusCsIfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x0522, "PictureModeHue", N_("Picture Mode Hue"), N_("Picture mode hue"), olympusCsIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0523, "PictureModeContrast", N_("Picture Mode Contrast"), N_("Picture mode contrast"), olympusCsIfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x0524, "PictureModeSharpness", N_("Picture Mode Sharpness"), N_("Picture mode sharpness"), olympusCsIfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x0525, "PictureModeBWFilter", N_("Picture Mode BW Filter"), N_("Picture mode BW filter"), olympusCsIfdId, makerTags, signedShort, -1, EXV_PRINT_TAG(olympusPictureModeBWFilter)), + TagInfo(0x0526, "PictureModeTone", N_("Picture Mode Tone"), N_("Picture mode tone"), olympusCsIfdId, makerTags, signedShort, -1, EXV_PRINT_TAG(olympusPictureModeTone)), + TagInfo(0x0527, "NoiseFilter", N_("Noise Filter"), N_("Noise filter"), olympusCsIfdId, makerTags, signedShort, -1, print0x0527), + TagInfo(0x0529, "ArtFilter", N_("Art Filter"), N_("Art filter"), olympusCsIfdId, makerTags, unsignedShort, -1, print0x0529), + TagInfo(0x052c, "MagicFilter", N_("Magic Filter"), N_("Magic filter"), olympusCsIfdId, makerTags, unsignedShort, -1, print0x0529), + TagInfo(0x0600, "DriveMode", N_("Drive Mode"), N_("Drive mode"), olympusCsIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0601, "PanoramaMode", N_("Panorama Mode"), N_("Panorama mode"), olympusCsIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0603, "Quality", N_("Image Quality 2"), N_("Image quality 2"), olympusCsIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusCsQuality)), + TagInfo(0x0604, "ImageStabilization", N_("Image Stabilization"), N_("Image stabilization"), olympusCsIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusImageStabilization)), + TagInfo(0x0900, "ManometerPressure", N_("Manometer Pressure"), N_("Manometer pressure"), olympusCsIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0901, "ManometerReading", N_("Manometer Reading"), N_("Manometer reading"), olympusCsIfdId, makerTags, signedLong, -1, printValue), + TagInfo(0x0902, "ExtendedWBDetect", N_("Extended WB Detect"), N_("Extended WB detect"), olympusCsIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusOffOn)), + TagInfo(0x0903, "LevelGaugeRoll", N_("Level Gauge Roll"), N_("Level gauge roll"), olympusCsIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusOffOn)), + TagInfo(0x0904, "LevelGaugePitch", N_("Level Gauge Pitch"), N_("Level gauge pitch"), olympusCsIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusOffOn)), // End of list marker - TagInfo(0xffff, "(UnknownOlympusCsTag)", "(UnknownOlympusCsTag)", N_("Unknown OlympusCs tag"), olympusCsIfdId, makerTags, invalidTypeId, printValue) + TagInfo(0xffff, "(UnknownOlympusCsTag)", "(UnknownOlympusCsTag)", N_("Unknown OlympusCs tag"), olympusCsIfdId, makerTags, invalidTypeId, -1, printValue) }; const TagInfo* OlympusMakerNote::tagListCs() @@ -736,32 +736,32 @@ namespace Exiv2 { }; const TagInfo OlympusMakerNote::tagInfoEq_[] = { - TagInfo(0x0000, "EquipmentVersion", N_("Equipment Version"), N_("Equipment version"), olympusEqIfdId, makerTags, undefined, printExifVersion), - TagInfo(0x0100, "CameraType", N_("Camera Type"), N_("Camera type"), olympusEqIfdId, makerTags, asciiString, printValue), - TagInfo(0x0101, "SerialNumber", N_("Serial Number"), N_("Serial number"), olympusEqIfdId, makerTags, asciiString, printValue), - TagInfo(0x0102, "InternalSerialNumber", N_("Internal Serial Number"), N_("Internal serial number"), olympusEqIfdId, makerTags, asciiString, printValue), - TagInfo(0x0103, "FocalPlaneDiagonal", N_("Focal Plane Diagonal"), N_("Focal plane diagonal"), olympusEqIfdId, makerTags, unsignedRational, printValue), - TagInfo(0x0104, "BodyFirmwareVersion", N_("Body Firmware Version"), N_("Body firmware version"), olympusEqIfdId, makerTags, unsignedLong, printValue), - TagInfo(0x0201, "LensType", N_("Lens Type"), N_("Lens type"), olympusEqIfdId, makerTags, unsignedByte, print0x0201), - TagInfo(0x0202, "LensSerialNumber", N_("Lens Serial Number"), N_("Lens serial number"), olympusEqIfdId, makerTags, asciiString, printValue), - TagInfo(0x0203, "LensModel", N_("Lens Model"), N_("Lens model"), olympusEqIfdId, makerTags, asciiString, printValue), - TagInfo(0x0204, "LensFirmwareVersion", N_("Lens Firmware Version"), N_("Lens firmware version"), olympusEqIfdId, makerTags, unsignedLong, printValue), - TagInfo(0x0205, "MaxApertureAtMinFocal", N_("Max Aperture At Min Focal"), N_("Max aperture at min focal"), olympusEqIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0206, "MaxApertureAtMaxFocal", N_("Max Aperture At Max Focal"), N_("Max aperture at max focal"), olympusEqIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0207, "MinFocalLength", N_("Min Focal Length"), N_("Min focal length"), olympusEqIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0208, "MaxFocalLength", N_("Max Focal Length"), N_("Max focal length"), olympusEqIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x020a, "MaxApertureAtCurrentFocal", N_("Max Aperture At Current Focal"), N_("Max aperture at current focal"), olympusEqIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x020b, "LensProperties", N_("Lens Properties"), N_("Lens properties"), olympusEqIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0301, "Extender", N_("Extender"), N_("Extender"), olympusEqIfdId, makerTags, unsignedByte, printEq0x0301), - TagInfo(0x0302, "ExtenderSerialNumber", N_("Extender Serial Number"), N_("Extender serial number"), olympusEqIfdId, makerTags, asciiString, printValue), - TagInfo(0x0303, "ExtenderModel", N_("Extender Model"), N_("Extender model"), olympusEqIfdId, makerTags, asciiString, printValue), - TagInfo(0x0304, "ExtenderFirmwareVersion", N_("Extender Firmware Version"), N_("Extender firmwareversion"), olympusEqIfdId, makerTags, unsignedLong, printValue), - TagInfo(0x1000, "FlashType", N_("Flash Type"), N_("Flash type"), olympusEqIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusEqFlashType)), - TagInfo(0x1001, "FlashModel", N_("Flash Model"), N_("Flash model"), olympusEqIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusEqFlashModel)), - TagInfo(0x1002, "FlashFirmwareVersion", N_("Flash Firmware Version"), N_("Flash firmware version"), olympusEqIfdId, makerTags, unsignedLong, printValue), - TagInfo(0x1003, "FlashSerialNumber", N_("FlashSerialNumber"), N_("FlashSerialNumber"), olympusEqIfdId, makerTags, asciiString, printValue), + TagInfo(0x0000, "EquipmentVersion", N_("Equipment Version"), N_("Equipment version"), olympusEqIfdId, makerTags, undefined, -1, printExifVersion), + TagInfo(0x0100, "CameraType", N_("Camera Type"), N_("Camera type"), olympusEqIfdId, makerTags, asciiString, -1, printValue), + TagInfo(0x0101, "SerialNumber", N_("Serial Number"), N_("Serial number"), olympusEqIfdId, makerTags, asciiString, -1, printValue), + TagInfo(0x0102, "InternalSerialNumber", N_("Internal Serial Number"), N_("Internal serial number"), olympusEqIfdId, makerTags, asciiString, -1, printValue), + TagInfo(0x0103, "FocalPlaneDiagonal", N_("Focal Plane Diagonal"), N_("Focal plane diagonal"), olympusEqIfdId, makerTags, unsignedRational, -1, printValue), + TagInfo(0x0104, "BodyFirmwareVersion", N_("Body Firmware Version"), N_("Body firmware version"), olympusEqIfdId, makerTags, unsignedLong, -1, printValue), + TagInfo(0x0201, "LensType", N_("Lens Type"), N_("Lens type"), olympusEqIfdId, makerTags, unsignedByte, -1, print0x0201), + TagInfo(0x0202, "LensSerialNumber", N_("Lens Serial Number"), N_("Lens serial number"), olympusEqIfdId, makerTags, asciiString, -1, printValue), + TagInfo(0x0203, "LensModel", N_("Lens Model"), N_("Lens model"), olympusEqIfdId, makerTags, asciiString, -1, printValue), + TagInfo(0x0204, "LensFirmwareVersion", N_("Lens Firmware Version"), N_("Lens firmware version"), olympusEqIfdId, makerTags, unsignedLong, -1, printValue), + TagInfo(0x0205, "MaxApertureAtMinFocal", N_("Max Aperture At Min Focal"), N_("Max aperture at min focal"), olympusEqIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0206, "MaxApertureAtMaxFocal", N_("Max Aperture At Max Focal"), N_("Max aperture at max focal"), olympusEqIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0207, "MinFocalLength", N_("Min Focal Length"), N_("Min focal length"), olympusEqIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0208, "MaxFocalLength", N_("Max Focal Length"), N_("Max focal length"), olympusEqIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x020a, "MaxApertureAtCurrentFocal", N_("Max Aperture At Current Focal"), N_("Max aperture at current focal"), olympusEqIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x020b, "LensProperties", N_("Lens Properties"), N_("Lens properties"), olympusEqIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0301, "Extender", N_("Extender"), N_("Extender"), olympusEqIfdId, makerTags, unsignedByte, -1, printEq0x0301), + TagInfo(0x0302, "ExtenderSerialNumber", N_("Extender Serial Number"), N_("Extender serial number"), olympusEqIfdId, makerTags, asciiString, -1, printValue), + TagInfo(0x0303, "ExtenderModel", N_("Extender Model"), N_("Extender model"), olympusEqIfdId, makerTags, asciiString, -1, printValue), + TagInfo(0x0304, "ExtenderFirmwareVersion", N_("Extender Firmware Version"), N_("Extender firmwareversion"), olympusEqIfdId, makerTags, unsignedLong, -1, printValue), + TagInfo(0x1000, "FlashType", N_("Flash Type"), N_("Flash type"), olympusEqIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusEqFlashType)), + TagInfo(0x1001, "FlashModel", N_("Flash Model"), N_("Flash model"), olympusEqIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusEqFlashModel)), + TagInfo(0x1002, "FlashFirmwareVersion", N_("Flash Firmware Version"), N_("Flash firmware version"), olympusEqIfdId, makerTags, unsignedLong, -1, printValue), + TagInfo(0x1003, "FlashSerialNumber", N_("FlashSerialNumber"), N_("FlashSerialNumber"), olympusEqIfdId, makerTags, asciiString, -1, printValue), // End of list marker - TagInfo(0xffff, "(UnknownOlympusEqTag)", "(UnknownOlympusEqTag)", N_("Unknown OlympusEq tag"), olympusEqIfdId, makerTags, invalidTypeId, printValue) + TagInfo(0xffff, "(UnknownOlympusEqTag)", "(UnknownOlympusEqTag)", N_("Unknown OlympusEq tag"), olympusEqIfdId, makerTags, invalidTypeId, -1, printValue) }; const TagInfo* OlympusMakerNote::tagListEq() @@ -805,22 +805,22 @@ namespace Exiv2 { }; const TagInfo OlympusMakerNote::tagInfoRd_[] = { - TagInfo(0x0000, "RawDevVersion", N_("Raw Development Version"), N_("Raw development version"), olympusRdIfdId, makerTags, undefined, printExifVersion), - TagInfo(0x0100, "ExposureBiasValue", N_("Exposure Bias Value"), N_("Exposure bias value"), olympusRdIfdId, makerTags, signedRational, printValue), - TagInfo(0x0101, "WhiteBalanceValue", N_("White Balance Value"), N_("White balance value"), olympusRdIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0102, "WBFineAdjustment", N_("WB Fine Adjustment"), N_("WB fine adjustment"), olympusRdIfdId, makerTags, signedShort, printValue), - TagInfo(0x0103, "GrayPoint", N_("Gray Point"), N_("Gray point"), olympusRdIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0104, "SaturationEmphasis", N_("Saturation Emphasis"), N_("Saturation emphasis"), olympusRdIfdId, makerTags, signedShort, printValue), - TagInfo(0x0105, "MemoryColorEmphasis", N_("Memory Color Emphasis"), N_("Memory color emphasis"), olympusRdIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0106, "ContrastValue", N_("Contrast Value"), N_("Contrast value"), olympusRdIfdId, makerTags, signedShort, printValue), - TagInfo(0x0107, "SharpnessValue", N_("Sharpness Value"), N_("Sharpness value"), olympusRdIfdId, makerTags, signedShort, printValue), - TagInfo(0x0108, "ColorSpace", N_("Color Space"), N_("Color space"), olympusRdIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusRdColorSpace)), - TagInfo(0x0109, "Engine", N_("Engine"), N_("Engine"), olympusRdIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusRdEngine)), - TagInfo(0x010a, "NoiseReduction", N_("Noise Reduction"), N_("Noise reduction"), olympusRdIfdId, makerTags, unsignedShort, EXV_PRINT_TAG_BITMASK(olympusNoiseReduction)), - TagInfo(0x010b, "EditStatus", N_("Edit Status"), N_("Edit status"), olympusRdIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusRdEditStatus)), - TagInfo(0x010c, "Settings", N_("Settings"), N_("Settings"), olympusRdIfdId, makerTags, unsignedShort, EXV_PRINT_TAG_BITMASK(olympusRdSettings)), + TagInfo(0x0000, "RawDevVersion", N_("Raw Development Version"), N_("Raw development version"), olympusRdIfdId, makerTags, undefined, -1, printExifVersion), + TagInfo(0x0100, "ExposureBiasValue", N_("Exposure Bias Value"), N_("Exposure bias value"), olympusRdIfdId, makerTags, signedRational, -1, printValue), + TagInfo(0x0101, "WhiteBalanceValue", N_("White Balance Value"), N_("White balance value"), olympusRdIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0102, "WBFineAdjustment", N_("WB Fine Adjustment"), N_("WB fine adjustment"), olympusRdIfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x0103, "GrayPoint", N_("Gray Point"), N_("Gray point"), olympusRdIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0104, "SaturationEmphasis", N_("Saturation Emphasis"), N_("Saturation emphasis"), olympusRdIfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x0105, "MemoryColorEmphasis", N_("Memory Color Emphasis"), N_("Memory color emphasis"), olympusRdIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0106, "ContrastValue", N_("Contrast Value"), N_("Contrast value"), olympusRdIfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x0107, "SharpnessValue", N_("Sharpness Value"), N_("Sharpness value"), olympusRdIfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x0108, "ColorSpace", N_("Color Space"), N_("Color space"), olympusRdIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusRdColorSpace)), + TagInfo(0x0109, "Engine", N_("Engine"), N_("Engine"), olympusRdIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusRdEngine)), + TagInfo(0x010a, "NoiseReduction", N_("Noise Reduction"), N_("Noise reduction"), olympusRdIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG_BITMASK(olympusNoiseReduction)), + TagInfo(0x010b, "EditStatus", N_("Edit Status"), N_("Edit status"), olympusRdIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusRdEditStatus)), + TagInfo(0x010c, "Settings", N_("Settings"), N_("Settings"), olympusRdIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG_BITMASK(olympusRdSettings)), // End of list marker - TagInfo(0xffff, "(UnknownOlympusRdTag)", "(UnknownOlympusRdTag)", N_("Unknown OlympusRd tag"), olympusRdIfdId, makerTags, invalidTypeId, printValue) + TagInfo(0xffff, "(UnknownOlympusRdTag)", "(UnknownOlympusRdTag)", N_("Unknown OlympusRd tag"), olympusRdIfdId, makerTags, invalidTypeId, -1, printValue) }; const TagInfo* OlympusMakerNote::tagListRd() @@ -875,31 +875,31 @@ namespace Exiv2 { }; const TagInfo OlympusMakerNote::tagInfoRd2_[] = { - TagInfo(0x0000, "RawDev2Version", N_("Raw Development 2 Version"), N_("Raw development 2 version"), olympusRd2IfdId, makerTags, undefined, printExifVersion), - TagInfo(0x0100, "ExposureBiasValue", N_("Exposure Bias Value"), N_("Exposure bias value"), olympusRd2IfdId, makerTags, signedRational, printValue), - TagInfo(0x0101, "WhiteBalance", N_("White Balance"), N_("White balance"), olympusRd2IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusRd2WhiteBalance)), - TagInfo(0x0102, "WhiteBalanceValue", N_("White Balance Value"), N_("White balance value"), olympusRd2IfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0103, "WBFineAdjustment", N_("WB Fine Adjustment"), N_("White balance fine adjustment"), olympusRd2IfdId, makerTags, signedShort, printValue), - TagInfo(0x0104, "GrayPoint", N_("Gray Point"), N_("Gray point"), olympusRd2IfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0105, "ContrastValue", N_("Contrast Value"), N_("Contrast value"), olympusRd2IfdId, makerTags, signedShort, printValue), - TagInfo(0x0106, "SharpnessValue", N_("Sharpness Value"), N_("Sharpness value"), olympusRd2IfdId, makerTags, signedShort, printValue), - TagInfo(0x0107, "SaturationEmphasis", N_("Saturation Emphasis"), N_("Saturation emphasis"), olympusRd2IfdId, makerTags, signedShort, printValue), - TagInfo(0x0108, "MemoryColorEmphasis", N_("Memory Color Emphasis"), N_("Memory color emphasis"), olympusRd2IfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0109, "ColorSpace", N_("Color Space"), N_("Color space"), olympusRd2IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusRd2ColorSpace)), - TagInfo(0x010a, "NoiseReduction", N_("Noise Reduction"), N_("Noise reduction"), olympusRd2IfdId, makerTags, unsignedShort, EXV_PRINT_TAG_BITMASK(olympusNoiseReduction)), - TagInfo(0x010b, "Engine", N_("Engine"), N_("Engine"), olympusRd2IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusRd2Engine)), - TagInfo(0x010c, "PictureMode", N_("Picture Mode"), N_("Picture mode"), olympusRd2IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusRd2PictureMode)), - TagInfo(0x010d, "PMSaturation", N_("PM Saturation"), N_("Picture mode saturation"), olympusRd2IfdId, makerTags, signedShort, printValue), - TagInfo(0x010e, "PMContrast", N_("PM Contrast"), N_("Picture mode contrast"), olympusRd2IfdId, makerTags, signedShort, printValue), - TagInfo(0x010f, "PMSharpness", N_("PM Sharpness"), N_("Picture mode sharpness"), olympusRd2IfdId, makerTags, signedShort, printValue), - TagInfo(0x0110, "PM_BWFilter", N_("PM BW Filter"), N_("PM BW filter"), olympusRd2IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusRd2PM_BWFilter)), - TagInfo(0x0111, "PMPictureTone", N_("PM Picture Tone"), N_("PM picture tone"), olympusRd2IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusRd2PMPictureTone)), - TagInfo(0x0112, "Gradation", N_("Gradation"), N_("Gradation"), olympusRd2IfdId, makerTags, signedShort, printValue), - TagInfo(0x0113, "Saturation", N_("Saturation"), N_("Saturation"), olympusRd2IfdId, makerTags, signedShort, printValue), - TagInfo(0x0119, "AutoGradation", N_("Auto Gradation"), N_("Auto gradation"), olympusRd2IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusOffOn)), - TagInfo(0x0120, "PMNoiseFilter", N_("PM Noise Filter"), N_("Picture mode noise filter"), olympusRd2IfdId, makerTags, unsignedShort, printValue), + TagInfo(0x0000, "RawDev2Version", N_("Raw Development 2 Version"), N_("Raw development 2 version"), olympusRd2IfdId, makerTags, undefined, -1, printExifVersion), + TagInfo(0x0100, "ExposureBiasValue", N_("Exposure Bias Value"), N_("Exposure bias value"), olympusRd2IfdId, makerTags, signedRational, -1, printValue), + TagInfo(0x0101, "WhiteBalance", N_("White Balance"), N_("White balance"), olympusRd2IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusRd2WhiteBalance)), + TagInfo(0x0102, "WhiteBalanceValue", N_("White Balance Value"), N_("White balance value"), olympusRd2IfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0103, "WBFineAdjustment", N_("WB Fine Adjustment"), N_("White balance fine adjustment"), olympusRd2IfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x0104, "GrayPoint", N_("Gray Point"), N_("Gray point"), olympusRd2IfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0105, "ContrastValue", N_("Contrast Value"), N_("Contrast value"), olympusRd2IfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x0106, "SharpnessValue", N_("Sharpness Value"), N_("Sharpness value"), olympusRd2IfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x0107, "SaturationEmphasis", N_("Saturation Emphasis"), N_("Saturation emphasis"), olympusRd2IfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x0108, "MemoryColorEmphasis", N_("Memory Color Emphasis"), N_("Memory color emphasis"), olympusRd2IfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0109, "ColorSpace", N_("Color Space"), N_("Color space"), olympusRd2IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusRd2ColorSpace)), + TagInfo(0x010a, "NoiseReduction", N_("Noise Reduction"), N_("Noise reduction"), olympusRd2IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG_BITMASK(olympusNoiseReduction)), + TagInfo(0x010b, "Engine", N_("Engine"), N_("Engine"), olympusRd2IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusRd2Engine)), + TagInfo(0x010c, "PictureMode", N_("Picture Mode"), N_("Picture mode"), olympusRd2IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusRd2PictureMode)), + TagInfo(0x010d, "PMSaturation", N_("PM Saturation"), N_("Picture mode saturation"), olympusRd2IfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x010e, "PMContrast", N_("PM Contrast"), N_("Picture mode contrast"), olympusRd2IfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x010f, "PMSharpness", N_("PM Sharpness"), N_("Picture mode sharpness"), olympusRd2IfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x0110, "PM_BWFilter", N_("PM BW Filter"), N_("PM BW filter"), olympusRd2IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusRd2PM_BWFilter)), + TagInfo(0x0111, "PMPictureTone", N_("PM Picture Tone"), N_("PM picture tone"), olympusRd2IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusRd2PMPictureTone)), + TagInfo(0x0112, "Gradation", N_("Gradation"), N_("Gradation"), olympusRd2IfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x0113, "Saturation", N_("Saturation"), N_("Saturation"), olympusRd2IfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x0119, "AutoGradation", N_("Auto Gradation"), N_("Auto gradation"), olympusRd2IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusOffOn)), + TagInfo(0x0120, "PMNoiseFilter", N_("PM Noise Filter"), N_("Picture mode noise filter"), olympusRd2IfdId, makerTags, unsignedShort, -1, printValue), // End of list marker - TagInfo(0xffff, "(UnknownOlympusRd2Tag)", "(UnknownOlympusRd2Tag)", N_("Unknown OlympusRd2 tag"), olympusRd2IfdId, makerTags, invalidTypeId, printValue) + TagInfo(0xffff, "(UnknownOlympusRd2Tag)", "(UnknownOlympusRd2Tag)", N_("Unknown OlympusRd2 tag"), olympusRd2IfdId, makerTags, invalidTypeId, -1, printValue) }; const TagInfo* OlympusMakerNote::tagListRd2() @@ -928,59 +928,59 @@ namespace Exiv2 { }; const TagInfo OlympusMakerNote::tagInfoIp_[] = { - TagInfo(0x0000, "ImageProcessingVersion", N_("Image Processing Version"), N_("Image processing version"), olympusIpIfdId, makerTags, undefined, printExifVersion), - TagInfo(0x0100, "WB_RBLevels", N_("WB RB Levels"), N_("WB RB levels"), olympusIpIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0102, "WB_RBLevels3000K", N_("WB RB Levels 3000K"), N_("WB RB levels 3000K"), olympusIpIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0103, "WB_RBLevels3300K", N_("WB RB Levels 3300K"), N_("WB RB levels 3300K"), olympusIpIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0104, "WB_RBLevels3600K", N_("WB RB Levels 3600K"), N_("WB RB levels 3600K"), olympusIpIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0105, "WB_RBLevels3900K", N_("WB RB Levels 3900K"), N_("WB RB levels 3900K"), olympusIpIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0106, "WB_RBLevels4000K", N_("WB RB Levels 4000K"), N_("WB RB levels 4000K"), olympusIpIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0107, "WB_RBLevels4300K", N_("WB RB Levels 4300K"), N_("WB RB levels 4300K"), olympusIpIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0108, "WB_RBLevels4500K", N_("WB RB Levels 4500K"), N_("WB RB levels 4500K"), olympusIpIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0109, "WB_RBLevels4800K", N_("WB RB Levels 4800K"), N_("WB RB levels 4800K"), olympusIpIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x010a, "WB_RBLevels5300K", N_("WB RB Levels 5300K"), N_("WB RB levels 5300K"), olympusIpIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x010b, "WB_RBLevels6000K", N_("WB RB Levels 6000K"), N_("WB RB levels 6000K"), olympusIpIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x010c, "WB_RBLevels6600K", N_("WB RB Levels 6600K"), N_("WB RB levels 6600K"), olympusIpIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x010d, "WB_RBLevels7500K", N_("WB RB Levels 7500K"), N_("WB RB levels 7500K"), olympusIpIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x010e, "WB_RBLevelsCWB1", N_("WB RB Levels CWB1"), N_("WB RB levels CWB1"), olympusIpIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x010f, "WB_RBLevelsCWB2", N_("WB RB Levels CWB2"), N_("WB RB levels CWB2"), olympusIpIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0110, "WB_RBLevelsCWB3", N_("WB RB Levels CWB3"), N_("WB RB levels CWB3"), olympusIpIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0111, "WB_RBLevelsCWB4", N_("WB RB Levels CWB4"), N_("WB RB levels CWB4"), olympusIpIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0113, "WB_GLevel3000K", N_("WB G Level 3000K"), N_("WB G level 3000K"), olympusIpIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0114, "WB_GLevel3300K", N_("WB G Level 3300K"), N_("WB G level 3300K"), olympusIpIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0115, "WB_GLevel3600K", N_("WB G Level 3600K"), N_("WB G level 3600K"), olympusIpIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0116, "WB_GLevel3900K", N_("WB G Level 3900K"), N_("WB G level 3900K"), olympusIpIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0117, "WB_GLevel4000K", N_("WB G Level 4000K"), N_("WB G level 4000K"), olympusIpIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0118, "WB_GLevel4300K", N_("WB G Level 4300K"), N_("WB G level 4300K"), olympusIpIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0119, "WB_GLevel4500K", N_("WB G Level 4500K"), N_("WB G level 4500K"), olympusIpIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x011a, "WB_GLevel4800K", N_("WB G Level 4800K"), N_("WB G level 4800K"), olympusIpIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x011b, "WB_GLevel5300K", N_("WB G Level 5300K"), N_("WB G level 5300K"), olympusIpIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x011c, "WB_GLevel6000K", N_("WB G Level 6000K"), N_("WB G level 6000K"), olympusIpIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x011d, "WB_GLevel6600K", N_("WB G Level 6600K"), N_("WB G level 6600K"), olympusIpIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x011e, "WB_GLevel7500K", N_("WB G Level 7500K"), N_("WB G level 7500K"), olympusIpIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x011f, "WB_GLevel", N_("WB G Level"), N_("WB G level"), olympusIpIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0200, "ColorMatrix", N_("Color Matrix"), N_("Color matrix"), olympusIpIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0300, "Enhancer", N_("Enhancer"), N_("Enhancer"), olympusIpIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0301, "EnhancerValues", N_("Enhancer Values"), N_("Enhancer values"), olympusIpIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0310, "CoringFilter", N_("Coring Filter"), N_("Coring filter"), olympusIpIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0311, "CoringValues", N_("Coring Values"), N_("Coring values"), olympusIpIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0600, "BlackLevel", N_("Black Level"), N_("Black level"), olympusIpIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0610, "GainBase", N_("Gain Base"), N_("Gain base"), olympusIpIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0611, "ValidBits", N_("Valid Bits"), N_("Valid bits"), olympusIpIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0612, "CropLeft", N_("Crop Left"), N_("Crop left"), olympusIpIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0613, "CropTop", N_("Crop Top"), N_("Crop top"), olympusIpIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0614, "CropWidth", N_("Crop Width"), N_("Crop width"), olympusIpIfdId, makerTags, unsignedLong, printValue), - TagInfo(0x0615, "CropHeight", N_("Crop Height"), N_("Crop height"), olympusIpIfdId, makerTags, unsignedLong, printValue), - TagInfo(0x1010, "NoiseReduction", N_("Noise Reduction"), N_("Noise reduction"), olympusIpIfdId, makerTags, unsignedShort, EXV_PRINT_TAG_BITMASK(olympusNoiseReduction)), - TagInfo(0x1011, "DistortionCorrection", N_("Distortion Correction"), N_("Distortion correction"), olympusIpIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusOffOn)), - TagInfo(0x1012, "ShadingCompensation", N_("Shading Compensation"), N_("Shading compensation"), olympusIpIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusOffOn)), - TagInfo(0x101c, "MultipleExposureMode", N_("Multiple Exposure Mode"), N_("Multiple exposure mode"), olympusIpIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusIpMultipleExposureMode)), - TagInfo(0x1112, "AspectRatio", N_("Aspect Ratio"), N_("Aspect ratio"), olympusIpIfdId, makerTags, unsignedByte, EXV_PRINT_TAG(olympusIpAspectRatio)), - TagInfo(0x1113, "AspectFrame", N_("Aspect Frame"), N_("Aspect frame"), olympusIpIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x1200, "FaceDetect", N_("Face Detect"), N_("Face detect"), olympusIpIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(olympusOffOn)), - TagInfo(0x1201, "FaceDetectArea", N_("Face Detect Area"), N_("Face detect area"), olympusIpIfdId, makerTags, signedShort, printValue), + TagInfo(0x0000, "ImageProcessingVersion", N_("Image Processing Version"), N_("Image processing version"), olympusIpIfdId, makerTags, undefined, -1, printExifVersion), + TagInfo(0x0100, "WB_RBLevels", N_("WB RB Levels"), N_("WB RB levels"), olympusIpIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0102, "WB_RBLevels3000K", N_("WB RB Levels 3000K"), N_("WB RB levels 3000K"), olympusIpIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0103, "WB_RBLevels3300K", N_("WB RB Levels 3300K"), N_("WB RB levels 3300K"), olympusIpIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0104, "WB_RBLevels3600K", N_("WB RB Levels 3600K"), N_("WB RB levels 3600K"), olympusIpIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0105, "WB_RBLevels3900K", N_("WB RB Levels 3900K"), N_("WB RB levels 3900K"), olympusIpIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0106, "WB_RBLevels4000K", N_("WB RB Levels 4000K"), N_("WB RB levels 4000K"), olympusIpIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0107, "WB_RBLevels4300K", N_("WB RB Levels 4300K"), N_("WB RB levels 4300K"), olympusIpIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0108, "WB_RBLevels4500K", N_("WB RB Levels 4500K"), N_("WB RB levels 4500K"), olympusIpIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0109, "WB_RBLevels4800K", N_("WB RB Levels 4800K"), N_("WB RB levels 4800K"), olympusIpIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x010a, "WB_RBLevels5300K", N_("WB RB Levels 5300K"), N_("WB RB levels 5300K"), olympusIpIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x010b, "WB_RBLevels6000K", N_("WB RB Levels 6000K"), N_("WB RB levels 6000K"), olympusIpIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x010c, "WB_RBLevels6600K", N_("WB RB Levels 6600K"), N_("WB RB levels 6600K"), olympusIpIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x010d, "WB_RBLevels7500K", N_("WB RB Levels 7500K"), N_("WB RB levels 7500K"), olympusIpIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x010e, "WB_RBLevelsCWB1", N_("WB RB Levels CWB1"), N_("WB RB levels CWB1"), olympusIpIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x010f, "WB_RBLevelsCWB2", N_("WB RB Levels CWB2"), N_("WB RB levels CWB2"), olympusIpIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0110, "WB_RBLevelsCWB3", N_("WB RB Levels CWB3"), N_("WB RB levels CWB3"), olympusIpIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0111, "WB_RBLevelsCWB4", N_("WB RB Levels CWB4"), N_("WB RB levels CWB4"), olympusIpIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0113, "WB_GLevel3000K", N_("WB G Level 3000K"), N_("WB G level 3000K"), olympusIpIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0114, "WB_GLevel3300K", N_("WB G Level 3300K"), N_("WB G level 3300K"), olympusIpIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0115, "WB_GLevel3600K", N_("WB G Level 3600K"), N_("WB G level 3600K"), olympusIpIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0116, "WB_GLevel3900K", N_("WB G Level 3900K"), N_("WB G level 3900K"), olympusIpIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0117, "WB_GLevel4000K", N_("WB G Level 4000K"), N_("WB G level 4000K"), olympusIpIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0118, "WB_GLevel4300K", N_("WB G Level 4300K"), N_("WB G level 4300K"), olympusIpIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0119, "WB_GLevel4500K", N_("WB G Level 4500K"), N_("WB G level 4500K"), olympusIpIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x011a, "WB_GLevel4800K", N_("WB G Level 4800K"), N_("WB G level 4800K"), olympusIpIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x011b, "WB_GLevel5300K", N_("WB G Level 5300K"), N_("WB G level 5300K"), olympusIpIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x011c, "WB_GLevel6000K", N_("WB G Level 6000K"), N_("WB G level 6000K"), olympusIpIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x011d, "WB_GLevel6600K", N_("WB G Level 6600K"), N_("WB G level 6600K"), olympusIpIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x011e, "WB_GLevel7500K", N_("WB G Level 7500K"), N_("WB G level 7500K"), olympusIpIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x011f, "WB_GLevel", N_("WB G Level"), N_("WB G level"), olympusIpIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0200, "ColorMatrix", N_("Color Matrix"), N_("Color matrix"), olympusIpIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0300, "Enhancer", N_("Enhancer"), N_("Enhancer"), olympusIpIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0301, "EnhancerValues", N_("Enhancer Values"), N_("Enhancer values"), olympusIpIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0310, "CoringFilter", N_("Coring Filter"), N_("Coring filter"), olympusIpIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0311, "CoringValues", N_("Coring Values"), N_("Coring values"), olympusIpIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0600, "BlackLevel", N_("Black Level"), N_("Black level"), olympusIpIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0610, "GainBase", N_("Gain Base"), N_("Gain base"), olympusIpIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0611, "ValidBits", N_("Valid Bits"), N_("Valid bits"), olympusIpIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0612, "CropLeft", N_("Crop Left"), N_("Crop left"), olympusIpIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0613, "CropTop", N_("Crop Top"), N_("Crop top"), olympusIpIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0614, "CropWidth", N_("Crop Width"), N_("Crop width"), olympusIpIfdId, makerTags, unsignedLong, -1, printValue), + TagInfo(0x0615, "CropHeight", N_("Crop Height"), N_("Crop height"), olympusIpIfdId, makerTags, unsignedLong, -1, printValue), + TagInfo(0x1010, "NoiseReduction", N_("Noise Reduction"), N_("Noise reduction"), olympusIpIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG_BITMASK(olympusNoiseReduction)), + TagInfo(0x1011, "DistortionCorrection", N_("Distortion Correction"), N_("Distortion correction"), olympusIpIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusOffOn)), + TagInfo(0x1012, "ShadingCompensation", N_("Shading Compensation"), N_("Shading compensation"), olympusIpIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusOffOn)), + TagInfo(0x101c, "MultipleExposureMode", N_("Multiple Exposure Mode"), N_("Multiple exposure mode"), olympusIpIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusIpMultipleExposureMode)), + TagInfo(0x1112, "AspectRatio", N_("Aspect Ratio"), N_("Aspect ratio"), olympusIpIfdId, makerTags, unsignedByte, -1, EXV_PRINT_TAG(olympusIpAspectRatio)), + TagInfo(0x1113, "AspectFrame", N_("Aspect Frame"), N_("Aspect frame"), olympusIpIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x1200, "FaceDetect", N_("Face Detect"), N_("Face detect"), olympusIpIfdId, makerTags, unsignedLong, -1, EXV_PRINT_TAG(olympusOffOn)), + TagInfo(0x1201, "FaceDetectArea", N_("Face Detect Area"), N_("Face detect area"), olympusIpIfdId, makerTags, signedShort, -1, printValue), // End of list marker - TagInfo(0xffff, "(UnknownOlympusIpTag)", "(UnknownOlympusIpTag)", N_("Unknown OlympusIp tag"), olympusIpIfdId, makerTags, invalidTypeId, printValue) + TagInfo(0xffff, "(UnknownOlympusIpTag)", "(UnknownOlympusIpTag)", N_("Unknown OlympusIp tag"), olympusIpIfdId, makerTags, invalidTypeId, -1, printValue) }; const TagInfo* OlympusMakerNote::tagListIp() @@ -995,27 +995,27 @@ namespace Exiv2 { }; const TagInfo OlympusMakerNote::tagInfoFi_[] = { - TagInfo(0x0000, "FocusInfoVersion", N_("Focus Info Version"), N_("Focus info version"), olympusFiIfdId, makerTags, undefined, printExifVersion), - TagInfo(0x0209, "AutoFocus", N_("Auto Focus"), N_("Auto focus"), olympusFiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusOffOn)), - TagInfo(0x0210, "SceneDetect", N_("Scene Detect"), N_("Scene detect"), olympusFiIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0211, "SceneArea", N_("Scene Area"), N_("Scene area"), olympusFiIfdId, makerTags, unsignedLong, printValue), - TagInfo(0x0212, "SceneDetectData", N_("Scene Detect Data"), N_("Scene detect data"), olympusFiIfdId, makerTags, unsignedLong, printValue), - TagInfo(0x0300, "ZoomStepCount", N_("Zoom Step Count"), N_("Zoom step count"), olympusFiIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0301, "FocusStepCount", N_("Focus Step Count"), N_("Focus step count"), olympusFiIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0303, "FocusStepInfinity", N_("Focus Step Infinity"), N_("Focus step infinity"), olympusFiIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0304, "FocusStepNear", N_("Focus Step Near"), N_("Focus step near"), olympusFiIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0305, "FocusDistance", N_("Focus Distance"), N_("Focus distance"), olympusFiIfdId, makerTags, unsignedRational, printValue), - TagInfo(0x0308, "AFPoint", N_("AF Point"), N_("AF point"), olympusFiIfdId, makerTags, unsignedShort, print0x0308), - TagInfo(0x1201, "ExternalFlash", N_("External Flash"), N_("External flash"), olympusFiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusOffOn)), - TagInfo(0x1203, "ExternalFlashGuideNumber", N_("External Flash Guide Number"), N_("External flash guide number"), olympusFiIfdId, makerTags, signedRational, printValue), - TagInfo(0x1204, "ExternalFlashBounce", N_("External Flash Bounce"), N_("External flash bounce"), olympusFiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusFiExternalFlashBounce)), - TagInfo(0x1205, "ExternalFlashZoom", N_("External Flash Zoom"), N_("External flash zoom"), olympusFiIfdId, makerTags, unsignedRational, printValue), - TagInfo(0x1208, "InternalFlash", N_("Internal Flash"), N_("Internal flash"), olympusFiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusOffOn)), - TagInfo(0x1209, "ManualFlash", N_("Manual Flash"), N_("Manual flash"), olympusFiIfdId, makerTags, unsignedShort, print0x1209), - TagInfo(0x1500, "SensorTemperature", N_("Sensor Temperature"), N_("Sensor temperature"), olympusFiIfdId, makerTags, signedShort, printValue), - TagInfo(0x1600, "ImageStabilization", N_("Image Stabilization"), N_("Image stabilization"), olympusFiIfdId, makerTags, unsignedLong, printValue), + TagInfo(0x0000, "FocusInfoVersion", N_("Focus Info Version"), N_("Focus info version"), olympusFiIfdId, makerTags, undefined, -1, printExifVersion), + TagInfo(0x0209, "AutoFocus", N_("Auto Focus"), N_("Auto focus"), olympusFiIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusOffOn)), + TagInfo(0x0210, "SceneDetect", N_("Scene Detect"), N_("Scene detect"), olympusFiIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0211, "SceneArea", N_("Scene Area"), N_("Scene area"), olympusFiIfdId, makerTags, unsignedLong, -1, printValue), + TagInfo(0x0212, "SceneDetectData", N_("Scene Detect Data"), N_("Scene detect data"), olympusFiIfdId, makerTags, unsignedLong, -1, printValue), + TagInfo(0x0300, "ZoomStepCount", N_("Zoom Step Count"), N_("Zoom step count"), olympusFiIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0301, "FocusStepCount", N_("Focus Step Count"), N_("Focus step count"), olympusFiIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0303, "FocusStepInfinity", N_("Focus Step Infinity"), N_("Focus step infinity"), olympusFiIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0304, "FocusStepNear", N_("Focus Step Near"), N_("Focus step near"), olympusFiIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0305, "FocusDistance", N_("Focus Distance"), N_("Focus distance"), olympusFiIfdId, makerTags, unsignedRational, -1, printValue), + TagInfo(0x0308, "AFPoint", N_("AF Point"), N_("AF point"), olympusFiIfdId, makerTags, unsignedShort, -1, print0x0308), + TagInfo(0x1201, "ExternalFlash", N_("External Flash"), N_("External flash"), olympusFiIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusOffOn)), + TagInfo(0x1203, "ExternalFlashGuideNumber", N_("External Flash Guide Number"), N_("External flash guide number"), olympusFiIfdId, makerTags, signedRational, -1, printValue), + TagInfo(0x1204, "ExternalFlashBounce", N_("External Flash Bounce"), N_("External flash bounce"), olympusFiIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusFiExternalFlashBounce)), + TagInfo(0x1205, "ExternalFlashZoom", N_("External Flash Zoom"), N_("External flash zoom"), olympusFiIfdId, makerTags, unsignedRational, -1, printValue), + TagInfo(0x1208, "InternalFlash", N_("Internal Flash"), N_("Internal flash"), olympusFiIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusOffOn)), + TagInfo(0x1209, "ManualFlash", N_("Manual Flash"), N_("Manual flash"), olympusFiIfdId, makerTags, unsignedShort, -1, print0x1209), + TagInfo(0x1500, "SensorTemperature", N_("Sensor Temperature"), N_("Sensor temperature"), olympusFiIfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x1600, "ImageStabilization", N_("Image Stabilization"), N_("Image stabilization"), olympusFiIfdId, makerTags, unsignedLong, -1, printValue), // End of list marker - TagInfo(0xffff, "(UnknownOlympusFiTag)", "(UnknownOlympusFiTag)", N_("Unknown OlympusFi tag"), olympusFiIfdId, makerTags, invalidTypeId, printValue) + TagInfo(0xffff, "(UnknownOlympusFiTag)", "(UnknownOlympusFiTag)", N_("Unknown OlympusFi tag"), olympusFiIfdId, makerTags, invalidTypeId, -1, printValue) }; const TagInfo* OlympusMakerNote::tagListFi() @@ -1024,9 +1024,9 @@ namespace Exiv2 { } const TagInfo OlympusMakerNote::tagInfoFe_[] = { - TagInfo(0x0100, "BodyFirmwareVersion", N_("Body Firmware Version"), N_("Body firmware version"), olympusFe1IfdId, makerTags, asciiString, printValue), + TagInfo(0x0100, "BodyFirmwareVersion", N_("Body Firmware Version"), N_("Body firmware version"), olympusFe1IfdId, makerTags, asciiString, -1, printValue), // End of list marker - TagInfo(0xffff, "(UnknownOlympusFeTag)", "(UnknownOlympusFeTag)", N_("Unknown OlympusFe tag"), olympusFe1IfdId, makerTags, invalidTypeId, printValue) + TagInfo(0xffff, "(UnknownOlympusFeTag)", "(UnknownOlympusFeTag)", N_("Unknown OlympusFe tag"), olympusFe1IfdId, makerTags, invalidTypeId, -1, printValue) }; const TagInfo* OlympusMakerNote::tagListFe() @@ -1051,44 +1051,44 @@ namespace Exiv2 { }; const TagInfo OlympusMakerNote::tagInfoRi_[] = { - TagInfo(0x0000, "RawInfoVersion", N_("Raw Info Version"), N_("Raw info version"), olympusRiIfdId, makerTags, undefined, printValue), - TagInfo(0x0100, "WB_RBLevelsUsed", N_("WB_RB Levels Used"), N_("WB_RB levels used"), olympusRiIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0110, "WB_RBLevelsAuto", N_("WB_RB Levels Auto"), N_("WB_RB levels auto"), olympusRiIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0120, "WB_RBLevelsShade", N_("WB_RB Levels Shade"), N_("WB_RB levels shade"), olympusRiIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0121, "WB_RBLevelsCloudy", N_("WB_RB Levels Cloudy"), N_("WB_RB levels cloudy"), olympusRiIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0122, "WB_RBLevelsFineWeather", N_("WB_RB Levels Fine Weather"), N_("WB_RB levels fine weather"), olympusRiIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0123, "WB_RBLevelsTungsten", N_("WB_RB Levels Tungsten"), N_("WB_RB levels tungsten"), olympusRiIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0124, "WB_RBLevelsEveningSunlight", N_("WB_RB Levels Evening Sunlight"), N_("WB_RB levels evening sunlight"), olympusRiIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0130, "WB_RBLevelsDaylightFluor", N_("WB_RB Levels Daylight Fluor"), N_("WB_RB levels daylight fluor"), olympusRiIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0131, "WB_RBLevelsDayWhiteFluor", N_("WB_RB Levels Day White Fluor"), N_("WB_RB levels day white fluor"), olympusRiIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0132, "WB_RBLevelsCoolWhiteFluor", N_("WB_RB Levels Cool White Fluor"), N_("WB_RB levels cool white fluor"), olympusRiIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0133, "WB_RBLevelsWhiteFluorescent", N_("WB_RB Levels White Fluorescent"), N_("WB_RB levels white fluorescent"), olympusRiIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0200, "ColorMatrix2", N_("Color Matrix2"), N_("Color matrix 2"), olympusRiIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0310, "CoringFilter", N_("Coring Filter"), N_("Coring filter"), olympusRiIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0311, "CoringValues", N_("Coring Values"), N_("Coring values"), olympusRiIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0600, "BlackLevel2", N_("Black Level 2"), N_("Black level 2"), olympusRiIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0601, "YCbCrCoefficients", N_("YCbCr Coefficients"), N_("YCbCr coefficients"), olympusRiIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0611, "ValidPixelDepth", N_("Valid Pixel Depth"), N_("Valid pixel depth"), olympusRiIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0612, "CropLeft", N_("Crop Left"), N_("Crop left"), olympusRiIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0613, "CropTop", N_("Crop Top"), N_("Crop top"), olympusRiIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0614, "CropWidth", N_("Crop Width"), N_("Crop width"), olympusRiIfdId, makerTags, unsignedLong, printValue), - TagInfo(0x0615, "CropHeight", N_("Crop Height"), N_("Crop height"), olympusRiIfdId, makerTags, unsignedLong, printValue), - TagInfo(0x1000, "LightSource", N_("Light Source"), N_("Light source"), olympusRiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusRiLightSource)), - TagInfo(0x1001, "WhiteBalanceComp", N_("White Balance Comp"), N_("White balance comp"), olympusRiIfdId, makerTags, signedShort, printValue), - TagInfo(0x1010, "SaturationSetting", N_("Saturation Setting"), N_("Saturation setting"), olympusRiIfdId, makerTags, signedShort, printValue), - TagInfo(0x1011, "HueSetting", N_("Hue Setting"), N_("Hue setting"), olympusRiIfdId, makerTags, signedShort, printValue), - TagInfo(0x1012, "ContrastSetting", N_("Contrast Setting"), N_("Contrast setting"), olympusRiIfdId, makerTags, signedShort, printValue), - TagInfo(0x1013, "SharpnessSetting", N_("Sharpness Setting"), N_("Sharpness setting"), olympusRiIfdId, makerTags, signedShort, printValue), - TagInfo(0x2000, "CMExposureCompensation", N_("CM Exposure Compensation"), N_("CM exposure compensation"), olympusRiIfdId, makerTags, signedRational, printValue), - TagInfo(0x2001, "CMWhiteBalance", N_("CM White Balance"), N_("CM white balance"), olympusRiIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x2002, "CMWhiteBalanceComp", N_("CM White Balance Comp"), N_("CM white balance comp"), olympusRiIfdId, makerTags, signedShort, printValue), - TagInfo(0x2010, "CMWhiteBalanceGrayPoint", N_("CM White Balance Gray Point"), N_("CM white balance gray point"), olympusRiIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x2020, "CMSaturation", N_("CM Saturation"), N_("CM saturation"), olympusRiIfdId, makerTags, signedShort, printValue), - TagInfo(0x2021, "CMHue", N_("CM Hue"), N_("CM hue"), olympusRiIfdId, makerTags, signedShort, printValue), - TagInfo(0x2022, "CMContrast", N_("CM Contrast"), N_("CM contrast"), olympusRiIfdId, makerTags, signedShort, printValue), - TagInfo(0x2023, "CMSharpness", N_("CM Sharpness"), N_("CM sharpness"), olympusRiIfdId, makerTags, signedShort, printValue), + TagInfo(0x0000, "RawInfoVersion", N_("Raw Info Version"), N_("Raw info version"), olympusRiIfdId, makerTags, undefined, -1, printValue), + TagInfo(0x0100, "WB_RBLevelsUsed", N_("WB_RB Levels Used"), N_("WB_RB levels used"), olympusRiIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0110, "WB_RBLevelsAuto", N_("WB_RB Levels Auto"), N_("WB_RB levels auto"), olympusRiIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0120, "WB_RBLevelsShade", N_("WB_RB Levels Shade"), N_("WB_RB levels shade"), olympusRiIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0121, "WB_RBLevelsCloudy", N_("WB_RB Levels Cloudy"), N_("WB_RB levels cloudy"), olympusRiIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0122, "WB_RBLevelsFineWeather", N_("WB_RB Levels Fine Weather"), N_("WB_RB levels fine weather"), olympusRiIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0123, "WB_RBLevelsTungsten", N_("WB_RB Levels Tungsten"), N_("WB_RB levels tungsten"), olympusRiIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0124, "WB_RBLevelsEveningSunlight", N_("WB_RB Levels Evening Sunlight"), N_("WB_RB levels evening sunlight"), olympusRiIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0130, "WB_RBLevelsDaylightFluor", N_("WB_RB Levels Daylight Fluor"), N_("WB_RB levels daylight fluor"), olympusRiIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0131, "WB_RBLevelsDayWhiteFluor", N_("WB_RB Levels Day White Fluor"), N_("WB_RB levels day white fluor"), olympusRiIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0132, "WB_RBLevelsCoolWhiteFluor", N_("WB_RB Levels Cool White Fluor"), N_("WB_RB levels cool white fluor"), olympusRiIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0133, "WB_RBLevelsWhiteFluorescent", N_("WB_RB Levels White Fluorescent"), N_("WB_RB levels white fluorescent"), olympusRiIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0200, "ColorMatrix2", N_("Color Matrix2"), N_("Color matrix 2"), olympusRiIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0310, "CoringFilter", N_("Coring Filter"), N_("Coring filter"), olympusRiIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0311, "CoringValues", N_("Coring Values"), N_("Coring values"), olympusRiIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0600, "BlackLevel2", N_("Black Level 2"), N_("Black level 2"), olympusRiIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0601, "YCbCrCoefficients", N_("YCbCr Coefficients"), N_("YCbCr coefficients"), olympusRiIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0611, "ValidPixelDepth", N_("Valid Pixel Depth"), N_("Valid pixel depth"), olympusRiIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0612, "CropLeft", N_("Crop Left"), N_("Crop left"), olympusRiIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0613, "CropTop", N_("Crop Top"), N_("Crop top"), olympusRiIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0614, "CropWidth", N_("Crop Width"), N_("Crop width"), olympusRiIfdId, makerTags, unsignedLong, -1, printValue), + TagInfo(0x0615, "CropHeight", N_("Crop Height"), N_("Crop height"), olympusRiIfdId, makerTags, unsignedLong, -1, printValue), + TagInfo(0x1000, "LightSource", N_("Light Source"), N_("Light source"), olympusRiIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusRiLightSource)), + TagInfo(0x1001, "WhiteBalanceComp", N_("White Balance Comp"), N_("White balance comp"), olympusRiIfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x1010, "SaturationSetting", N_("Saturation Setting"), N_("Saturation setting"), olympusRiIfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x1011, "HueSetting", N_("Hue Setting"), N_("Hue setting"), olympusRiIfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x1012, "ContrastSetting", N_("Contrast Setting"), N_("Contrast setting"), olympusRiIfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x1013, "SharpnessSetting", N_("Sharpness Setting"), N_("Sharpness setting"), olympusRiIfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x2000, "CMExposureCompensation", N_("CM Exposure Compensation"), N_("CM exposure compensation"), olympusRiIfdId, makerTags, signedRational, -1, printValue), + TagInfo(0x2001, "CMWhiteBalance", N_("CM White Balance"), N_("CM white balance"), olympusRiIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x2002, "CMWhiteBalanceComp", N_("CM White Balance Comp"), N_("CM white balance comp"), olympusRiIfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x2010, "CMWhiteBalanceGrayPoint", N_("CM White Balance Gray Point"), N_("CM white balance gray point"), olympusRiIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x2020, "CMSaturation", N_("CM Saturation"), N_("CM saturation"), olympusRiIfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x2021, "CMHue", N_("CM Hue"), N_("CM hue"), olympusRiIfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x2022, "CMContrast", N_("CM Contrast"), N_("CM contrast"), olympusRiIfdId, makerTags, signedShort, -1, printValue), + TagInfo(0x2023, "CMSharpness", N_("CM Sharpness"), N_("CM sharpness"), olympusRiIfdId, makerTags, signedShort, -1, printValue), // End of list marker - TagInfo(0xffff, "(UnknownOlympusRiTag)", "(UnknownOlympusRiTag)", N_("Unknown OlympusRi tag"), olympusRiIfdId, makerTags, invalidTypeId, printValue) + TagInfo(0xffff, "(UnknownOlympusRiTag)", "(UnknownOlympusRiTag)", N_("Unknown OlympusRi tag"), olympusRiIfdId, makerTags, invalidTypeId, -1, printValue) }; const TagInfo* OlympusMakerNote::tagListRi() diff --git a/src/panasonicmn.cpp b/src/panasonicmn.cpp index a48c5919..ebc2249d 100644 --- a/src/panasonicmn.cpp +++ b/src/panasonicmn.cpp @@ -229,59 +229,59 @@ namespace Exiv2 { // Panasonic MakerNote Tag Info const TagInfo PanasonicMakerNote::tagInfo_[] = { - TagInfo(0x0001, "Quality", N_("Quality"), N_("Image Quality"), panasonicIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(panasonicQuality)), - TagInfo(0x0002, "FirmwareVersion", N_("Firmware Version"), N_("Firmware version"), panasonicIfdId, makerTags, undefined, printValue), - TagInfo(0x0003, "WhiteBalance", N_("White Balance"), N_("White balance setting"), panasonicIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(panasonicWhiteBalance)), - TagInfo(0x0004, "0x0004", "0x0004", N_("Unknown"), panasonicIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0007, "FocusMode", N_("Focus Mode"), N_("Focus mode"), panasonicIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(panasonicFocusMode)), - TagInfo(0x000f, "AFMode", N_("AF Mode"), N_("AF mode"), panasonicIfdId, makerTags, unsignedByte, print0x000f), - TagInfo(0x001a, "ImageStabilization", N_("Image Stabilization"), N_("Image stabilization"), panasonicIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(panasonicImageStabilizer)), - TagInfo(0x001c, "Macro", N_("Macro"), N_("Macro mode"), panasonicIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(panasonicMacro)), - TagInfo(0x001f, "ShootingMode", N_("Shooting Mode"), N_("Shooting mode"), panasonicIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(panasonicShootingMode)), - TagInfo(0x0020, "Audio", N_("Audio"), N_("Audio"), panasonicIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(panasonicAudio)), - TagInfo(0x0021, "DataDump", N_("Data Dump"), N_("Data dump"), panasonicIfdId, makerTags, undefined, printValue), - TagInfo(0x0022, "0x0022", "0x0022", N_("Unknown"), panasonicIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0023, "WhiteBalanceBias", N_("White Balance Bias"), N_("White balance adjustment"), panasonicIfdId, makerTags, signedShort, print0x0023), - TagInfo(0x0024, "FlashBias", N_("FlashBias"), N_("Flash bias"), panasonicIfdId, makerTags, signedShort, 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."), panasonicIfdId, makerTags, undefined, printValue), - TagInfo(0x0026, "ExifVersion", "Exif Version", N_("Exif version"), panasonicIfdId, makerTags, undefined, printExifVersion), - TagInfo(0x0027, "0x0027", "0x0027", N_("Unknown"), panasonicIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0028, "ColorEffect", N_("Color Effect"), N_("Color effect"), panasonicIfdId, makerTags, unsignedShort, 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"), panasonicIfdId, makerTags, unsignedLong, printValue), - TagInfo(0x002a, "BurstMode", N_("Burst Mode"), N_("Burst mode"), panasonicIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(panasonicBurstMode)), - TagInfo(0x002b, "SequenceNumber", N_("Sequence Number"), N_("Sequence number"), panasonicIfdId, makerTags, unsignedLong, printValue), - TagInfo(0x002c, "Contrast", N_("Contrast"), N_("Contrast setting"), panasonicIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(panasonicContrast)), - TagInfo(0x002d, "NoiseReduction", N_("NoiseReduction"), N_("Noise reduction"), panasonicIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(panasonicNoiseReduction)), - TagInfo(0x002e, "SelfTimer", N_("Self Timer"), N_("Self timer"), panasonicIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(panasonicSelfTimer)), - TagInfo(0x002f, "0x002f", "0x002f", N_("Unknown"), panasonicIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0030, "Rotation", N_("Rotation"), N_("Rotation"), panasonicIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(panasonicRotation)), - TagInfo(0x0031, "0x0031", "0x0031", N_("Unknown"), panasonicIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0032, "ColorMode", N_("Color Mode"), N_("Color mode"), panasonicIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(panasonicColorMode)), - TagInfo(0x0033, "BabyAge", N_("Baby Age"), N_("Baby (or pet) age"), panasonicIfdId, makerTags, asciiString, printValue), - TagInfo(0x0034, "OpticalZoomMode", N_("Optical Zoom Mode"), N_("Optical zoom mode"), panasonicIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(panasonicOpticalZoomMode)), - TagInfo(0x0035, "ConversionLens", N_("Conversion Lens"), N_("Conversion lens"), panasonicIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(panasonicConversionLens)), - TagInfo(0x0036, "TravelDay", N_("Travel Day"), N_("Travel day"), panasonicIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0039, "Contrast", N_("Contrast"), N_("Contrast"), panasonicIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x003a, "WorldTimeLocation", N_("World Time Location"), N_("World time location"), panasonicIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(panasonicWorldTimeLocation)), - TagInfo(0x003c, "ProgramISO", N_("Program ISO"), N_("Program ISO"), panasonicIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0040, "Saturation", N_("Saturation"), N_("Saturation"), panasonicIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0041, "Sharpness", N_("Sharpness"), N_("Sharpness"), panasonicIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0042, "FilmMode", N_("Film Mode"), N_("Film mode"), panasonicIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(panasonicFilmMode)), - TagInfo(0x0046, "WBAdjustAB", N_("WB Adjust AB"), N_("WB adjust AB. Positive is a shift toward blue."), panasonicIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0047, "WBAdjustGM", N_("WB Adjust GM"), N_("WBAdjustGM. Positive is a shift toward green."), panasonicIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x0051, "LensType", N_("Lens Type"), N_("Lens type"), panasonicIfdId, makerTags, asciiString, printValue), - TagInfo(0x0052, "LensSerialNumber", N_("Lens Serial Number"), N_("Lens serial number"), panasonicIfdId, makerTags, asciiString, printValue), - TagInfo(0x0053, "AccessoryType", N_("Accessory Type"), N_("Accessory type"), panasonicIfdId, makerTags, asciiString, printValue), - TagInfo(0x0e00, "PrintIM", N_("Print IM"), N_("PrintIM information"), panasonicIfdId, makerTags, undefined, printValue), - TagInfo(0x4449, "0x4449", "0x4449", N_("Unknown"), panasonicIfdId, makerTags, undefined, printValue), - TagInfo(0x8000, "MakerNoteVersion", N_("MakerNote Version"), N_("MakerNote version"), panasonicIfdId, makerTags, undefined, printExifVersion), - TagInfo(0x8001, "SceneMode", N_("Scene Mode"), N_("Scene mode"), panasonicIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(panasonicShootingMode)), - TagInfo(0x8004, "WBRedLevel", N_("WB Red Level"), N_("WB red level"), panasonicIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x8005, "WBGreenLevel", N_("WB Green Level"), N_("WB green level"), panasonicIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x8006, "WBBlueLevel", N_("WB Blue Level"), N_("WB blue level"), panasonicIfdId, makerTags, unsignedShort, printValue), - TagInfo(0x8010, "BabyAge", N_("Baby Age"), N_("Baby (or pet) age"), panasonicIfdId, makerTags, asciiString, printValue), + TagInfo(0x0001, "Quality", N_("Quality"), N_("Image Quality"), panasonicIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicQuality)), + TagInfo(0x0002, "FirmwareVersion", N_("Firmware Version"), N_("Firmware version"), panasonicIfdId, makerTags, undefined, -1, printValue), + TagInfo(0x0003, "WhiteBalance", N_("White Balance"), N_("White balance setting"), panasonicIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicWhiteBalance)), + TagInfo(0x0004, "0x0004", "0x0004", N_("Unknown"), panasonicIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0007, "FocusMode", N_("Focus Mode"), N_("Focus mode"), panasonicIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicFocusMode)), + TagInfo(0x000f, "AFMode", N_("AF Mode"), N_("AF mode"), panasonicIfdId, makerTags, unsignedByte, -1, print0x000f), + TagInfo(0x001a, "ImageStabilization", N_("Image Stabilization"), N_("Image stabilization"), panasonicIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicImageStabilizer)), + TagInfo(0x001c, "Macro", N_("Macro"), N_("Macro mode"), panasonicIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicMacro)), + TagInfo(0x001f, "ShootingMode", N_("Shooting Mode"), N_("Shooting mode"), panasonicIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicShootingMode)), + TagInfo(0x0020, "Audio", N_("Audio"), N_("Audio"), panasonicIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicAudio)), + TagInfo(0x0021, "DataDump", N_("Data Dump"), N_("Data dump"), panasonicIfdId, makerTags, undefined, -1, printValue), + TagInfo(0x0022, "0x0022", "0x0022", N_("Unknown"), panasonicIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0023, "WhiteBalanceBias", N_("White Balance Bias"), N_("White balance adjustment"), panasonicIfdId, makerTags, signedShort, -1, print0x0023), + TagInfo(0x0024, "FlashBias", N_("FlashBias"), N_("Flash bias"), panasonicIfdId, 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."), panasonicIfdId, makerTags, undefined, -1, printValue), + TagInfo(0x0026, "ExifVersion", "Exif Version", N_("Exif version"), panasonicIfdId, makerTags, undefined, -1, printExifVersion), + TagInfo(0x0027, "0x0027", "0x0027", N_("Unknown"), panasonicIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0028, "ColorEffect", N_("Color Effect"), N_("Color effect"), panasonicIfdId, 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"), panasonicIfdId, makerTags, unsignedLong, -1, printValue), + TagInfo(0x002a, "BurstMode", N_("Burst Mode"), N_("Burst mode"), panasonicIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicBurstMode)), + TagInfo(0x002b, "SequenceNumber", N_("Sequence Number"), N_("Sequence number"), panasonicIfdId, makerTags, unsignedLong, -1, printValue), + TagInfo(0x002c, "Contrast", N_("Contrast"), N_("Contrast setting"), panasonicIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicContrast)), + TagInfo(0x002d, "NoiseReduction", N_("NoiseReduction"), N_("Noise reduction"), panasonicIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicNoiseReduction)), + TagInfo(0x002e, "SelfTimer", N_("Self Timer"), N_("Self timer"), panasonicIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicSelfTimer)), + TagInfo(0x002f, "0x002f", "0x002f", N_("Unknown"), panasonicIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0030, "Rotation", N_("Rotation"), N_("Rotation"), panasonicIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicRotation)), + TagInfo(0x0031, "0x0031", "0x0031", N_("Unknown"), panasonicIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0032, "ColorMode", N_("Color Mode"), N_("Color mode"), panasonicIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicColorMode)), + TagInfo(0x0033, "BabyAge", N_("Baby Age"), N_("Baby (or pet) age"), panasonicIfdId, makerTags, asciiString, -1, printValue), + TagInfo(0x0034, "OpticalZoomMode", N_("Optical Zoom Mode"), N_("Optical zoom mode"), panasonicIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicOpticalZoomMode)), + TagInfo(0x0035, "ConversionLens", N_("Conversion Lens"), N_("Conversion lens"), panasonicIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicConversionLens)), + TagInfo(0x0036, "TravelDay", N_("Travel Day"), N_("Travel day"), panasonicIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0039, "Contrast", N_("Contrast"), N_("Contrast"), panasonicIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x003a, "WorldTimeLocation", N_("World Time Location"), N_("World time location"), panasonicIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicWorldTimeLocation)), + TagInfo(0x003c, "ProgramISO", N_("Program ISO"), N_("Program ISO"), panasonicIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0040, "Saturation", N_("Saturation"), N_("Saturation"), panasonicIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0041, "Sharpness", N_("Sharpness"), N_("Sharpness"), panasonicIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0042, "FilmMode", N_("Film Mode"), N_("Film mode"), panasonicIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicFilmMode)), + TagInfo(0x0046, "WBAdjustAB", N_("WB Adjust AB"), N_("WB adjust AB. Positive is a shift toward blue."), panasonicIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0047, "WBAdjustGM", N_("WB Adjust GM"), N_("WBAdjustGM. Positive is a shift toward green."), panasonicIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x0051, "LensType", N_("Lens Type"), N_("Lens type"), panasonicIfdId, makerTags, asciiString, -1, printValue), + TagInfo(0x0052, "LensSerialNumber", N_("Lens Serial Number"), N_("Lens serial number"), panasonicIfdId, makerTags, asciiString, -1, printValue), + TagInfo(0x0053, "AccessoryType", N_("Accessory Type"), N_("Accessory type"), panasonicIfdId, makerTags, asciiString, -1, printValue), + TagInfo(0x0e00, "PrintIM", N_("Print IM"), N_("PrintIM information"), panasonicIfdId, makerTags, undefined, -1, printValue), + TagInfo(0x4449, "0x4449", "0x4449", N_("Unknown"), panasonicIfdId, makerTags, undefined, -1, printValue), + TagInfo(0x8000, "MakerNoteVersion", N_("MakerNote Version"), N_("MakerNote version"), panasonicIfdId, makerTags, undefined, -1, printExifVersion), + TagInfo(0x8001, "SceneMode", N_("Scene Mode"), N_("Scene mode"), panasonicIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicShootingMode)), + TagInfo(0x8004, "WBRedLevel", N_("WB Red Level"), N_("WB red level"), panasonicIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x8005, "WBGreenLevel", N_("WB Green Level"), N_("WB green level"), panasonicIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x8006, "WBBlueLevel", N_("WB Blue Level"), N_("WB blue level"), panasonicIfdId, makerTags, unsignedShort, -1, printValue), + TagInfo(0x8010, "BabyAge", N_("Baby Age"), N_("Baby (or pet) age"), panasonicIfdId, makerTags, asciiString, -1, printValue), // End of list marker - TagInfo(0xffff, "(UnknownPanasonicMakerNoteTag)", "(UnknownPanasonicMakerNoteTag)", N_("Unknown PanasonicMakerNote tag"), panasonicIfdId, makerTags, invalidTypeId, printValue) + TagInfo(0xffff, "(UnknownPanasonicMakerNoteTag)", "(UnknownPanasonicMakerNoteTag)", N_("Unknown PanasonicMakerNote tag"), panasonicIfdId, makerTags, invalidTypeId, -1, printValue) }; const TagInfo* PanasonicMakerNote::tagList() @@ -328,31 +328,31 @@ namespace Exiv2 { // Panasonic MakerNote Tag Info const TagInfo PanasonicMakerNote::tagInfoRaw_[] = { - TagInfo(0x0001, "Version", N_("Version"), N_("Panasonic raw version"), panaRawIfdId, panaRaw, undefined, printExifVersion), - TagInfo(0x0002, "SensorWidth", N_("Sensor Width"), N_("Sensor width"), panaRawIfdId, panaRaw, unsignedShort, printValue), - TagInfo(0x0003, "SensorHeight", N_("Sensor Height"), N_("Sensor height"), panaRawIfdId, panaRaw, unsignedShort, printValue), - TagInfo(0x0004, "SensorTopBorder", N_("Sensor Top Border"), N_("Sensor top border"), panaRawIfdId, panaRaw, unsignedShort, printValue), - TagInfo(0x0005, "SensorLeftBorder", N_("Sensor Left Border"), N_("Sensor left border"), panaRawIfdId, panaRaw, unsignedShort, printValue), - TagInfo(0x0006, "ImageHeight", N_("Image Height"), N_("Image height"), panaRawIfdId, panaRaw, unsignedShort, printValue), - TagInfo(0x0007, "ImageWidth", N_("Image Width"), N_("Image width"), panaRawIfdId, panaRaw, unsignedShort, printValue), - TagInfo(0x0011, "RedBalance", N_("Red Balance"), N_("Red balance (found in Digilux 2 RAW images)"), panaRawIfdId, panaRaw, unsignedShort, printValue), - TagInfo(0x0012, "BlueBalance", N_("Blue Balance"), N_("Blue balance"), panaRawIfdId, panaRaw, unsignedShort, printValue), - TagInfo(0x0017, "ISOSpeed", N_("ISO Speed"), N_("ISO speed setting"), panaRawIfdId, panaRaw, unsignedShort, printValue), - TagInfo(0x0024, "WBRedLevel", N_("WB Red Level"), N_("WB red level"), panaRawIfdId, panaRaw, unsignedShort, printValue), - TagInfo(0x0025, "WBGreenLevel", N_("WB Green Level"), N_("WB green level"), panaRawIfdId, panaRaw, unsignedShort, printValue), - TagInfo(0x0026, "WBBlueLevel", N_("WB Blue Level"), N_("WB blue level"), panaRawIfdId, panaRaw, unsignedShort, printValue), - TagInfo(0x002e, "PreviewImage", N_("Preview Image"), N_("Preview image"), panaRawIfdId, panaRaw, undefined, printValue), - TagInfo(0x010f, "Make", N_("Manufacturer"), N_("The manufacturer of the recording equipment"), panaRawIfdId, panaRaw, asciiString, printValue), - TagInfo(0x0110, "Model", N_("Model"), N_("The model name or model number of the equipment"), panaRawIfdId, panaRaw, asciiString, printValue), - TagInfo(0x0111, "StripOffsets", N_("Strip Offsets"), N_("Strip offsets"), panaRawIfdId, panaRaw, unsignedLong, printValue), - TagInfo(0x0112, "Orientation", N_("Orientation"), N_("Orientation"), panaRawIfdId, panaRaw, unsignedShort, print0x0112), - TagInfo(0x0116, "RowsPerStrip", N_("Rows Per Strip"), N_("The number of rows per strip"), panaRawIfdId, panaRaw, unsignedShort, printValue), - TagInfo(0x0117, "StripByteCounts", N_("Strip Byte Counts"), N_("Strip byte counts"), panaRawIfdId, panaRaw, unsignedLong, printValue), - TagInfo(0x0118, "RawDataOffset", N_("Raw Data Offset"), N_("Raw data offset"), panaRawIfdId, panaRaw, unsignedLong, printValue), - TagInfo(0x8769, "ExifTag", N_("Exif IFD Pointer"), N_("A pointer to the Exif IFD"), panaRawIfdId, panaRaw, unsignedLong, printValue), - TagInfo(0x8825, "GPSTag", N_("GPS Info IFD Pointer"), N_("A pointer to the GPS Info IFD"), panaRawIfdId, panaRaw, unsignedLong, printValue), + TagInfo(0x0001, "Version", N_("Version"), N_("Panasonic raw version"), panaRawIfdId, panaRaw, undefined, -1, printExifVersion), + TagInfo(0x0002, "SensorWidth", N_("Sensor Width"), N_("Sensor width"), panaRawIfdId, panaRaw, unsignedShort, -1, printValue), + TagInfo(0x0003, "SensorHeight", N_("Sensor Height"), N_("Sensor height"), panaRawIfdId, panaRaw, unsignedShort, -1, printValue), + TagInfo(0x0004, "SensorTopBorder", N_("Sensor Top Border"), N_("Sensor top border"), panaRawIfdId, panaRaw, unsignedShort, -1, printValue), + TagInfo(0x0005, "SensorLeftBorder", N_("Sensor Left Border"), N_("Sensor left border"), panaRawIfdId, panaRaw, unsignedShort, -1, printValue), + TagInfo(0x0006, "ImageHeight", N_("Image Height"), N_("Image height"), panaRawIfdId, panaRaw, unsignedShort, -1, printValue), + TagInfo(0x0007, "ImageWidth", N_("Image Width"), N_("Image width"), panaRawIfdId, panaRaw, unsignedShort, -1, printValue), + TagInfo(0x0011, "RedBalance", N_("Red Balance"), N_("Red balance (found in Digilux 2 RAW images)"), panaRawIfdId, panaRaw, unsignedShort, -1, printValue), + TagInfo(0x0012, "BlueBalance", N_("Blue Balance"), N_("Blue balance"), panaRawIfdId, panaRaw, unsignedShort, -1, printValue), + TagInfo(0x0017, "ISOSpeed", N_("ISO Speed"), N_("ISO speed setting"), panaRawIfdId, panaRaw, unsignedShort, -1, printValue), + TagInfo(0x0024, "WBRedLevel", N_("WB Red Level"), N_("WB red level"), panaRawIfdId, panaRaw, unsignedShort, -1, printValue), + TagInfo(0x0025, "WBGreenLevel", N_("WB Green Level"), N_("WB green level"), panaRawIfdId, panaRaw, unsignedShort, -1, printValue), + TagInfo(0x0026, "WBBlueLevel", N_("WB Blue Level"), N_("WB blue level"), panaRawIfdId, panaRaw, unsignedShort, -1, printValue), + TagInfo(0x002e, "PreviewImage", N_("Preview Image"), N_("Preview image"), panaRawIfdId, panaRaw, undefined, -1, printValue), + TagInfo(0x010f, "Make", N_("Manufacturer"), N_("The manufacturer of the recording equipment"), panaRawIfdId, panaRaw, asciiString, -1, printValue), + TagInfo(0x0110, "Model", N_("Model"), N_("The model name or model number of the equipment"), panaRawIfdId, panaRaw, asciiString, -1, printValue), + TagInfo(0x0111, "StripOffsets", N_("Strip Offsets"), N_("Strip offsets"), panaRawIfdId, panaRaw, unsignedLong, -1, printValue), + TagInfo(0x0112, "Orientation", N_("Orientation"), N_("Orientation"), panaRawIfdId, panaRaw, unsignedShort, -1, print0x0112), + TagInfo(0x0116, "RowsPerStrip", N_("Rows Per Strip"), N_("The number of rows per strip"), panaRawIfdId, panaRaw, unsignedShort, -1, printValue), + TagInfo(0x0117, "StripByteCounts", N_("Strip Byte Counts"), N_("Strip byte counts"), panaRawIfdId, panaRaw, unsignedLong, -1, printValue), + TagInfo(0x0118, "RawDataOffset", N_("Raw Data Offset"), N_("Raw data offset"), panaRawIfdId, panaRaw, unsignedLong, -1, printValue), + TagInfo(0x8769, "ExifTag", N_("Exif IFD Pointer"), N_("A pointer to the Exif IFD"), panaRawIfdId, panaRaw, unsignedLong, -1, printValue), + TagInfo(0x8825, "GPSTag", N_("GPS Info IFD Pointer"), N_("A pointer to the GPS Info IFD"), panaRawIfdId, panaRaw, unsignedLong, -1, printValue), // End of list marker - TagInfo(0xffff, "(UnknownPanasonicRawTag)", "(UnknownPanasonicRawTag)", N_("Unknown PanasonicRaw tag"), panaRawIfdId, panaRaw, invalidTypeId, printValue) + TagInfo(0xffff, "(UnknownPanasonicRawTag)", "(UnknownPanasonicRawTag)", N_("Unknown PanasonicRaw tag"), panaRawIfdId, panaRaw, invalidTypeId, -1, printValue) }; const TagInfo* PanasonicMakerNote::tagListRaw() diff --git a/src/pentaxmn.cpp b/src/pentaxmn.cpp index 9b1cf4b1..ff7d2d6e 100644 --- a/src/pentaxmn.cpp +++ b/src/pentaxmn.cpp @@ -863,266 +863,266 @@ namespace Exiv2 { const TagInfo PentaxMakerNote::tagInfo_[] = { TagInfo(0x0000, "Version", N_("Version"), N_("Pentax Makernote version"), - pentaxIfdId, makerTags, undefined, printPentaxVersion), + pentaxIfdId, makerTags, undefined, -1, printPentaxVersion), TagInfo(0x0001, "Mode", N_("Shooting mode"), N_("Camera shooting mode"), - pentaxIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(pentaxShootingMode)), + pentaxIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(pentaxShootingMode)), TagInfo(0x0002, "PreviewResolution", N_("Resolution of a preview image"), N_("Resolution of a preview image"), - pentaxIfdId, makerTags, undefined, printPentaxResolution), + pentaxIfdId, makerTags, undefined, -1, printPentaxResolution), TagInfo(0x0003, "PreviewLength", N_("Length of a preview image"), N_("Size of an IFD containing a preview image"), - pentaxIfdId, makerTags, undefined, printValue), + pentaxIfdId, makerTags, undefined, -1, printValue), TagInfo(0x0004, "PreviewOffset", N_("Pointer to a preview image"), N_("Offset to an IFD containing a preview image"), - pentaxIfdId, makerTags, undefined, printValue), + pentaxIfdId, makerTags, undefined, -1, printValue), TagInfo(0x0005, "ModelID", N_("Model identification"), N_("Pentax model idenfication"), - pentaxIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(pentaxModel)), + pentaxIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(pentaxModel)), TagInfo(0x0006, "Date", N_("Date"), N_("Date"), - pentaxIfdId, makerTags, undefined, printPentaxDate), + pentaxIfdId, makerTags, undefined, -1, printPentaxDate), TagInfo(0x0007, "Time", N_("Time"), N_("Time"), - pentaxIfdId, makerTags, undefined, printPentaxTime), + pentaxIfdId, makerTags, undefined, -1, printPentaxTime), TagInfo(0x0008, "Quality", N_("Image quality"), N_("Image quality settings"), - pentaxIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(pentaxQuality)), + pentaxIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(pentaxQuality)), TagInfo(0x0009, "Size", N_("Image size"), N_("Image size settings"), - pentaxIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(pentaxSize)), + pentaxIfdId, makerTags, unsignedLong, -1, EXV_PRINT_TAG(pentaxSize)), /* Some missing ! */ TagInfo(0x000c, "Flash", N_("Flash mode"), N_("Flash mode settings"), - pentaxIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(pentaxFlash)), + pentaxIfdId, makerTags, unsignedLong, -1, EXV_PRINT_TAG(pentaxFlash)), TagInfo(0x000d, "Focus", N_("Focus mode"), N_("Focus mode settings"), - pentaxIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(pentaxFocus)), + pentaxIfdId, makerTags, unsignedLong, -1, EXV_PRINT_TAG(pentaxFocus)), TagInfo(0x000e, "AFPoint", N_("AF point"), N_("Selected AF point"), - pentaxIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(pentaxAFPoint)), + pentaxIfdId, makerTags, unsignedLong, -1, EXV_PRINT_TAG(pentaxAFPoint)), TagInfo(0x000F, "AFPointInFocus", N_("AF point in focus"), N_("AF point in focus"), - pentaxIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(pentaxAFPointFocus)), + pentaxIfdId, makerTags, unsignedLong, -1, EXV_PRINT_TAG(pentaxAFPointFocus)), /* Some missing ! */ TagInfo(0x0012, "ExposureTime", N_("Exposure time"), N_("Exposure time"), - pentaxIfdId, makerTags, unsignedLong, printPentaxExposure), + pentaxIfdId, makerTags, unsignedLong, -1, printPentaxExposure), TagInfo(0x0013, "FNumber", N_("F-Number"), N_("F-Number"), - pentaxIfdId, makerTags, unsignedLong, printPentaxFValue), + pentaxIfdId, makerTags, unsignedLong, -1, printPentaxFValue), TagInfo(0x0014, "ISO", N_("ISO sensitivity"), N_("ISO sensitivity settings"), - pentaxIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(pentaxISO)), + pentaxIfdId, makerTags, unsignedLong, -1, EXV_PRINT_TAG(pentaxISO)), /* Some missing ! */ TagInfo(0x0016, "ExposureCompensation", N_("Exposure compensation"), N_("Exposure compensation"), - pentaxIfdId, makerTags, unsignedLong, printPentaxCompensation), + pentaxIfdId, makerTags, unsignedLong, -1, printPentaxCompensation), /* Some missing ! */ TagInfo(0x0017, "MeteringMode", N_("MeteringMode"), N_("MeteringMode"), - pentaxIfdId, makerTags, undefined, EXV_PRINT_TAG(pentaxMeteringMode)), + pentaxIfdId, makerTags, undefined, -1, EXV_PRINT_TAG(pentaxMeteringMode)), TagInfo(0x0018, "AutoBracketing", N_("AutoBracketing"), N_("AutoBracketing"), - pentaxIfdId, makerTags, undefined, printPentaxBracketing), + pentaxIfdId, makerTags, undefined, -1, printPentaxBracketing), TagInfo(0x0019, "WhiteBallance", N_("White ballance"), N_("White ballance"), - pentaxIfdId, makerTags, undefined, EXV_PRINT_TAG(pentaxWhiteBallance)), + pentaxIfdId, makerTags, undefined, -1, EXV_PRINT_TAG(pentaxWhiteBallance)), TagInfo(0x001a, "WhiteBallanceMode", N_("White ballance mode"), N_("White ballance mode"), - pentaxIfdId, makerTags, undefined, EXV_PRINT_TAG(pentaxWhiteBallanceMode)), + pentaxIfdId, makerTags, undefined, -1, EXV_PRINT_TAG(pentaxWhiteBallanceMode)), TagInfo(0x001b, "BlueBalance", N_("Blue balance"), N_("Blue color balance"), - pentaxIfdId, makerTags, unsignedLong, printValue), + pentaxIfdId, makerTags, unsignedLong, -1, printValue), TagInfo(0x001c, "RedBalance", N_("Red balance"), N_("Red color balance"), - pentaxIfdId, makerTags, unsignedLong, printValue), + pentaxIfdId, makerTags, unsignedLong, -1, printValue), TagInfo(0x001d, "FocalLength", N_("FocalLength"), N_("FocalLength"), - pentaxIfdId, makerTags, undefined, printPentaxFocalLength), + pentaxIfdId, makerTags, undefined, -1, printPentaxFocalLength), TagInfo(0x001e, "DigitalZoom", N_("Digital zoom"), N_("Digital zoom"), - pentaxIfdId, makerTags, unsignedLong, printValue), + pentaxIfdId, makerTags, unsignedLong, -1, printValue), TagInfo(0x001f, "Saturation", N_("Saturation"), N_("Saturation"), - pentaxIfdId, makerTags, undefined, EXV_PRINT_TAG(pentaxSaturation)), + pentaxIfdId, makerTags, undefined, -1, EXV_PRINT_TAG(pentaxSaturation)), TagInfo(0x0020, "Contrast", N_("Contrast"), N_("Contrast"), - pentaxIfdId, makerTags, undefined, EXV_PRINT_TAG(pentaxContrast)), + pentaxIfdId, makerTags, undefined, -1, EXV_PRINT_TAG(pentaxContrast)), TagInfo(0x0021, "Sharpness", N_("Sharpness"), N_("Sharpness"), - pentaxIfdId, makerTags, undefined, EXV_PRINT_TAG(pentaxSharpness)), + pentaxIfdId, makerTags, undefined, -1, EXV_PRINT_TAG(pentaxSharpness)), TagInfo(0x0022, "Location", N_("Location"), N_("Location"), - pentaxIfdId, makerTags, undefined, EXV_PRINT_TAG(pentaxLocation)), + pentaxIfdId, makerTags, undefined, -1, EXV_PRINT_TAG(pentaxLocation)), TagInfo(0x0023, "Hometown", N_("Hometown"), N_("Home town"), - pentaxIfdId, makerTags, undefined, EXV_PRINT_TAG(pentaxCities)), + pentaxIfdId, makerTags, undefined, -1, EXV_PRINT_TAG(pentaxCities)), TagInfo(0x0024, "Destination", N_("Destination"), N_("Destination"), - pentaxIfdId, makerTags, undefined, EXV_PRINT_TAG(pentaxCities)), + pentaxIfdId, makerTags, undefined, -1, EXV_PRINT_TAG(pentaxCities)), TagInfo(0x0025, "HometownDST", N_("Hometown DST"), N_("Whether day saving time is active in home town"), - pentaxIfdId, makerTags, undefined, EXV_PRINT_TAG(pentaxYesNo)), + pentaxIfdId, makerTags, undefined, -1, EXV_PRINT_TAG(pentaxYesNo)), TagInfo(0x0026, "DestinationDST", N_("Destination DST"), N_("Whether day saving time is active in destination"), - pentaxIfdId, makerTags, undefined, EXV_PRINT_TAG(pentaxYesNo)), + pentaxIfdId, makerTags, undefined, -1, EXV_PRINT_TAG(pentaxYesNo)), TagInfo(0x0027, "DSPFirmwareVersion", N_("DSPFirmwareVersion"), N_("DSPFirmwareVersion"), - pentaxIfdId, makerTags, unsignedByte, printValue), /* TODO: Decoding missing */ + pentaxIfdId, makerTags, unsignedByte, -1, printValue), /* TODO: Decoding missing */ TagInfo(0x0028, "CPUFirmwareVersion", N_("CPUFirmwareVersion"), N_("CPUFirmwareVersion"), - pentaxIfdId, makerTags, unsignedByte, printValue), /* TODO: Decoding missing */ + pentaxIfdId, makerTags, unsignedByte, -1, printValue), /* TODO: Decoding missing */ TagInfo(0x0029, "FrameNumber", N_("Frame number"), N_("Frame number"), - pentaxIfdId, makerTags, undefined, printValue), + pentaxIfdId, makerTags, undefined, -1, printValue), /* Some missing ! */ TagInfo(0x002d, "EffectiveLV", N_("Light value"), N_("Camera calculated light value, includes exposure compensation"), - pentaxIfdId, makerTags, unsignedShort, printValue), + pentaxIfdId, makerTags, unsignedShort, -1, printValue), /* Some missing ! */ TagInfo(0x0032, "ImageProcessing", N_("Image processing"), N_("Image processing"), - pentaxIfdId, makerTags, undefined, EXV_PRINT_COMBITAG(pentaxImageProcessing, 4, 0)), + pentaxIfdId, makerTags, undefined, -1, EXV_PRINT_COMBITAG(pentaxImageProcessing, 4, 0)), TagInfo(0x0033, "PictureMode", N_("Picture mode"), N_("Picture mode"), - pentaxIfdId, makerTags, undefined, EXV_PRINT_COMBITAG(pentaxPictureMode, 3, 0)), + pentaxIfdId, makerTags, undefined, -1, EXV_PRINT_COMBITAG(pentaxPictureMode, 3, 0)), TagInfo(0x0034, "DriveMode", N_("Drive mode"), N_("Drive mode"), - pentaxIfdId, makerTags, undefined, EXV_PRINT_COMBITAG(pentaxDriveMode, 4, 0)), + pentaxIfdId, makerTags, undefined, -1, EXV_PRINT_COMBITAG(pentaxDriveMode, 4, 0)), /* Some missing ! */ TagInfo(0x0037, "ColorSpace", N_("Color space"), N_("Color space"), - pentaxIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(pentaxColorSpace)), + pentaxIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(pentaxColorSpace)), TagInfo(0x0038, "ImageAreaOffset", N_("Image area offset"), N_("Image area offset"), - pentaxIfdId, makerTags, unsignedLong, printValue), + pentaxIfdId, makerTags, unsignedLong, -1, printValue), TagInfo(0x0039, "RawImageSize", N_("Raw image size"), N_("Raw image size"), - pentaxIfdId, makerTags, unsignedLong, printValue), + pentaxIfdId, makerTags, unsignedLong, -1, printValue), /* Some missing ! */ TagInfo(0x003e, "PreviewImageBorders", N_("Preview image borders"), N_("Preview image borders"), - pentaxIfdId, makerTags, unsignedByte, printValue), + pentaxIfdId, makerTags, unsignedByte, -1, printValue), TagInfo(0x003f, "LensType", N_("Lens type"), N_("Lens type"), - pentaxIfdId, makerTags, unsignedByte, EXV_PRINT_COMBITAG_MULTI(pentaxLensType, 2, 1, 2)), + pentaxIfdId, makerTags, unsignedByte, -1, EXV_PRINT_COMBITAG_MULTI(pentaxLensType, 2, 1, 2)), TagInfo(0x0040, "SensitivityAdjust", N_("Sensitivity adjust"), N_("Sensitivity adjust"), - pentaxIfdId, makerTags, unsignedLong, printValue), + pentaxIfdId, makerTags, unsignedLong, -1, printValue), TagInfo(0x0041, "DigitalFilter", N_("Digital filter"), N_("Digital filter"), - pentaxIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(pentaxOffOn)), + pentaxIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(pentaxOffOn)), /* Some missing ! */ TagInfo(0x0047, "Temperature", N_("Temperature"), N_("Camera temperature"), - pentaxIfdId, makerTags, signedByte, printPentaxTemperature), + pentaxIfdId, makerTags, signedByte, -1, printPentaxTemperature), TagInfo(0x0048, "AELock", N_("AE lock"), N_("AE lock"), - pentaxIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(pentaxOffOn)), + pentaxIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(pentaxOffOn)), TagInfo(0x0049, "NoiseReduction", N_("Noise reduction"), N_("Noise reduction"), - pentaxIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(pentaxOffOn)), + pentaxIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(pentaxOffOn)), /* Some missing ! */ TagInfo(0x004d, "FlashExposureCompensation", N_("Flash exposure compensation"), N_("Flash exposure compensation"), - pentaxIfdId, makerTags, signedLong, printPentaxFlashCompensation), + pentaxIfdId, makerTags, signedLong, -1, printPentaxFlashCompensation), /* Some missing ! */ TagInfo(0x004f, "ImageTone", N_("Image tone"), N_("Image tone"), - pentaxIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(pentaxImageTone)), + pentaxIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(pentaxImageTone)), TagInfo(0x0050, "ColorTemperature", N_("Colort temperature"), N_("Colort temperature"), - pentaxIfdId, makerTags, unsignedShort, printValue), + pentaxIfdId, makerTags, unsignedShort, -1, printValue), /* Some missing ! */ TagInfo(0x005c, "ShakeReduction", N_("Shake reduction"), N_("Shake reduction information"), - pentaxIfdId, makerTags, undefined, printValue), + pentaxIfdId, makerTags, undefined, -1, printValue), TagInfo(0x005d, "ShutterCount", N_("Shutter count"), N_("Shutter count"), - pentaxIfdId, makerTags, undefined, printValue), /* TODO: This has some encryption by date (see exiftool) */ + pentaxIfdId, makerTags, undefined, -1, printValue), /* TODO: This has some encryption by date (see exiftool) */ TagInfo(0x0069, "DynamicRangeExpansion", N_("Dynamic range expansion"), N_("Dynamic range expansion"), - pentaxIfdId, makerTags, undefined, EXV_PRINT_COMBITAG(pentaxDynamicRangeExpansion, 4, 0)), + pentaxIfdId, makerTags, undefined, -1, EXV_PRINT_COMBITAG(pentaxDynamicRangeExpansion, 4, 0)), TagInfo(0x0071, "HighISONoiseReduction", N_("High ISO noise reduction"), N_("High ISO noise reduction"), - pentaxIfdId, makerTags, unsignedByte, EXV_PRINT_TAG(pentaxHighISONoiseReduction)), + pentaxIfdId, makerTags, unsignedByte, -1, EXV_PRINT_TAG(pentaxHighISONoiseReduction)), TagInfo(0x0072, "AFAdjustment", N_("AF Adjustment"), N_("AF Adjustment"), - pentaxIfdId, makerTags, undefined, printValue), + pentaxIfdId, makerTags, undefined, -1, printValue), /* Many missing ! */ TagInfo(0x0200, "BlackPoint", N_("Black point"), N_("Black point"), - pentaxIfdId, makerTags, undefined, printValue), + pentaxIfdId, makerTags, undefined, -1, printValue), TagInfo(0x0201, "WhitePoint", N_("White point"), N_("White point"), - pentaxIfdId, makerTags, undefined, printValue), + pentaxIfdId, makerTags, undefined, -1, printValue), /* Some missing ! */ TagInfo(0x0205, "ShotInfo", N_("ShotInfo"), N_("ShotInfo"), - pentaxIfdId, makerTags, undefined, printValue), /* TODO: Decoding missing */ + pentaxIfdId, makerTags, undefined, -1, printValue), /* TODO: Decoding missing */ TagInfo(0x0206, "AEInfo", N_("AEInfo"), N_("AEInfo"), - pentaxIfdId, makerTags, undefined, printValue), /* TODO: Decoding missing */ + pentaxIfdId, makerTags, undefined, -1, printValue), /* TODO: Decoding missing */ TagInfo(0x0207, "LensInfo", N_("LensInfo"), N_("LensInfo"), - pentaxIfdId, makerTags, undefined, printValue), /* TODO: Decoding missing */ + pentaxIfdId, makerTags, undefined, -1, printValue), /* TODO: Decoding missing */ TagInfo(0x0208, "FlashInfo", N_("FlashInfo"), N_("FlashInfo"), - pentaxIfdId, makerTags, undefined, printValue), /* TODO: Decoding missing */ + pentaxIfdId, makerTags, undefined, -1, printValue), /* TODO: Decoding missing */ TagInfo(0x0209, "AEMeteringSegments", N_("AEMeteringSegments"), N_("AEMeteringSegments"), - pentaxIfdId, makerTags, undefined, printValue), /* TODO: Decoding missing */ + pentaxIfdId, makerTags, undefined, -1, printValue), /* TODO: Decoding missing */ TagInfo(0x020a, "FlashADump", N_("FlashADump"), N_("FlashADump"), - pentaxIfdId, makerTags, undefined, printValue), /* TODO: Decoding missing */ + pentaxIfdId, makerTags, undefined, -1, printValue), /* TODO: Decoding missing */ TagInfo(0x020b, "FlashBDump", N_("FlashBDump"), N_("FlashBDump"), - pentaxIfdId, makerTags, undefined, printValue), /* TODO: Decoding missing */ + pentaxIfdId, makerTags, undefined, -1, printValue), /* TODO: Decoding missing */ /* Some missing ! */ TagInfo(0x020d, "WB_RGGBLevelsDaylight", N_("WB_RGGBLevelsDaylight"), N_("WB_RGGBLevelsDaylight"), - pentaxIfdId, makerTags, undefined, printValue), /* TODO: Decoding missing */ + pentaxIfdId, makerTags, undefined, -1, printValue), /* TODO: Decoding missing */ TagInfo(0x020e, "WB_RGGBLevelsShade", N_("WB_RGGBLevelsShade"), N_("WB_RGGBLevelsShade"), - pentaxIfdId, makerTags, undefined, printValue), /* TODO: Decoding missing */ + pentaxIfdId, makerTags, undefined, -1, printValue), /* TODO: Decoding missing */ TagInfo(0x020f, "WB_RGGBLevelsCloudy", N_("WB_RGGBLevelsCloudy"), N_("WB_RGGBLevelsCloudy"), - pentaxIfdId, makerTags, undefined, printValue), /* TODO: Decoding missing */ + pentaxIfdId, makerTags, undefined, -1, printValue), /* TODO: Decoding missing */ TagInfo(0x0210, "WB_RGGBLevelsTungsten", N_("WB_RGGBLevelsTungsten"), N_("WB_RGGBLevelsTungsten"), - pentaxIfdId, makerTags, undefined, printValue), /* TODO: Decoding missing */ + pentaxIfdId, makerTags, undefined, -1, printValue), /* TODO: Decoding missing */ TagInfo(0x0211, "WB_RGGBLevelsFluorescentD", N_("WB_RGGBLevelsFluorescentD"), N_("WB_RGGBLevelsFluorescentD"), - pentaxIfdId, makerTags, undefined, printValue), /* TODO: Decoding missing */ + pentaxIfdId, makerTags, undefined, -1, printValue), /* TODO: Decoding missing */ TagInfo(0x0212, "WB_RGGBLevelsFluorescentN", N_("WB_RGGBLevelsFluorescentN"), N_("WB_RGGBLevelsFluorescentN"), - pentaxIfdId, makerTags, undefined, printValue), /* TODO: Decoding missing */ + pentaxIfdId, makerTags, undefined, -1, printValue), /* TODO: Decoding missing */ TagInfo(0x0213, "WB_RGGBLevelsFluorescentW", N_("WB_RGGBLevelsFluorescentW"), N_("WB_RGGBLevelsFluorescentW"), - pentaxIfdId, makerTags, undefined, printValue), /* TODO: Decoding missing */ + pentaxIfdId, makerTags, undefined, -1, printValue), /* TODO: Decoding missing */ TagInfo(0x0214, "WB_RGGBLevelsFlash", N_("WB_RGGBLevelsFlash"), N_("WB_RGGBLevelsFlash"), - pentaxIfdId, makerTags, undefined, printValue), /* TODO: Decoding missing */ + pentaxIfdId, makerTags, undefined, -1, printValue), /* TODO: Decoding missing */ TagInfo(0x0215, "CameraInfo", N_("CameraInfo"), N_("CameraInfo"), - pentaxIfdId, makerTags, undefined, printValue), /* TODO: Decoding missing */ + pentaxIfdId, makerTags, undefined, -1, printValue), /* TODO: Decoding missing */ TagInfo(0x0216, "BatteryInfo", N_("BatteryInfo"), N_("BatteryInfo"), - pentaxIfdId, makerTags, undefined, printValue), /* TODO: Decoding missing */ + pentaxIfdId, makerTags, undefined, -1, printValue), /* TODO: Decoding missing */ TagInfo(0x021f, "AFInfo", N_("AFInfo"), N_("AFInfo"), - pentaxIfdId, makerTags, undefined, printValue), /* TODO: Decoding missing */ + pentaxIfdId, makerTags, undefined, -1, printValue), /* TODO: Decoding missing */ TagInfo(0x0222, "ColorInfo", N_("ColorInfo"), N_("ColorInfo"), - pentaxIfdId, makerTags, undefined, printValue), /* TODO: Decoding missing */ + pentaxIfdId, makerTags, undefined, -1, printValue), /* TODO: Decoding missing */ TagInfo(0x0229, "SerialNumber", N_("Serial Number"), N_("Serial Number"), - pentaxIfdId, makerTags, asciiString, printValue), + pentaxIfdId, makerTags, asciiString, -1, printValue), // End of list marker TagInfo(0xffff, "(UnknownPentaxMakerNoteTag)", "(UnknownPentaxMakerNoteTag)", N_("Unknown PentaxMakerNote tag"), - pentaxIfdId, makerTags, invalidTypeId, printValue) + pentaxIfdId, makerTags, invalidTypeId, -1, printValue) }; const TagInfo* PentaxMakerNote::tagList() diff --git a/src/sigmamn.cpp b/src/sigmamn.cpp index 34761834..352fb790 100644 --- a/src/sigmamn.cpp +++ b/src/sigmamn.cpp @@ -55,76 +55,76 @@ namespace Exiv2 { const TagInfo SigmaMakerNote::tagInfo_[] = { TagInfo(0x0002, "SerialNumber", N_("Serial Number"), N_("Camera serial number"), - sigmaIfdId, makerTags, asciiString, printValue), + sigmaIfdId, makerTags, asciiString, -1, printValue), TagInfo(0x0003, "DriveMode", N_("Drive Mode"), N_("Drive mode"), - sigmaIfdId, makerTags, asciiString, printValue), + sigmaIfdId, makerTags, asciiString, -1, printValue), TagInfo(0x0004, "ResolutionMode", N_("Resolution Mode"), - N_("Resolution mode"), sigmaIfdId, makerTags, asciiString, printValue), + N_("Resolution mode"), sigmaIfdId, makerTags, asciiString, -1, printValue), TagInfo(0x0005, "AutofocusMode", N_("Autofocus Mode"), N_("Autofocus mode"), - sigmaIfdId, makerTags, asciiString, printValue), + sigmaIfdId, makerTags, asciiString, -1, printValue), TagInfo(0x0006, "FocusSetting", N_("Focus Setting"), N_("Focus setting"), - sigmaIfdId, makerTags, asciiString, printValue), + sigmaIfdId, makerTags, asciiString, -1, printValue), TagInfo(0x0007, "WhiteBalance", N_("White Balance"), N_("White balance"), - sigmaIfdId, makerTags, asciiString, printValue), + sigmaIfdId, makerTags, asciiString, -1, printValue), TagInfo(0x0008, "ExposureMode", N_("Exposure Mode"), N_("Exposure mode"), - sigmaIfdId, makerTags, asciiString, print0x0008), + sigmaIfdId, makerTags, asciiString, -1, print0x0008), TagInfo(0x0009, "MeteringMode", N_("Metering Mode"), N_("Metering mode"), - sigmaIfdId, makerTags, asciiString, print0x0009), + sigmaIfdId, makerTags, asciiString, -1, print0x0009), TagInfo(0x000a, "LensRange", N_("Lens Range"), N_("Lens focal length range"), - sigmaIfdId, makerTags, asciiString, printValue), + sigmaIfdId, makerTags, asciiString, -1, printValue), TagInfo(0x000b, "ColorSpace", N_("Color Space"), N_("Color space"), - sigmaIfdId, makerTags, asciiString, printValue), + sigmaIfdId, makerTags, asciiString, -1, printValue), TagInfo(0x000c, "Exposure", N_("Exposure"), N_("Exposure"), - sigmaIfdId, makerTags, asciiString, printStripLabel), + sigmaIfdId, makerTags, asciiString, -1, printStripLabel), TagInfo(0x000d, "Contrast", N_("Contrast"), N_("Contrast"), - sigmaIfdId, makerTags, asciiString, printStripLabel), + sigmaIfdId, makerTags, asciiString, -1, printStripLabel), TagInfo(0x000e, "Shadow", N_("Shadow"), N_("Shadow"), - sigmaIfdId, makerTags, asciiString, printStripLabel), + sigmaIfdId, makerTags, asciiString, -1, printStripLabel), TagInfo(0x000f, "Highlight", N_("Highlight"), N_("Highlight"), - sigmaIfdId, makerTags, asciiString, printStripLabel), + sigmaIfdId, makerTags, asciiString, -1, printStripLabel), TagInfo(0x0010, "Saturation", N_("Saturation"), N_("Saturation"), - sigmaIfdId, makerTags, asciiString, printStripLabel), + sigmaIfdId, makerTags, asciiString, -1, printStripLabel), TagInfo(0x0011, "Sharpness", N_("Sharpness"), N_("Sharpness"), - sigmaIfdId, makerTags, asciiString, printStripLabel), + sigmaIfdId, makerTags, asciiString, -1, printStripLabel), TagInfo(0x0012, "FillLight", N_("Fill Light"), N_("X3 Fill light"), - sigmaIfdId, makerTags, asciiString, printStripLabel), + sigmaIfdId, makerTags, asciiString, -1, printStripLabel), TagInfo(0x0014, "ColorAdjustment", N_("Color Adjustment"), N_("Color adjustment"), - sigmaIfdId, makerTags, asciiString, printStripLabel), + sigmaIfdId, makerTags, asciiString, -1, printStripLabel), TagInfo(0x0015, "AdjustmentMode", N_("Adjustment Mode"), N_("Adjustment mode"), - sigmaIfdId, makerTags, asciiString, printValue), + sigmaIfdId, makerTags, asciiString, -1, printValue), TagInfo(0x0016, "Quality", N_("Quality"), N_("Quality"), - sigmaIfdId, makerTags, asciiString, printStripLabel), + sigmaIfdId, makerTags, asciiString, -1, printStripLabel), TagInfo(0x0017, "Firmware", N_("Firmware"), N_("Firmware"), - sigmaIfdId, makerTags, asciiString, printValue), + sigmaIfdId, makerTags, asciiString, -1, printValue), TagInfo(0x0018, "Software", N_("Software"), N_("Software"), - sigmaIfdId, makerTags, asciiString, printValue), + sigmaIfdId, makerTags, asciiString, -1, printValue), TagInfo(0x0019, "AutoBracket", N_("Auto Bracket"), N_("Auto bracket"), - sigmaIfdId, makerTags, asciiString, printValue), + sigmaIfdId, makerTags, asciiString, -1, printValue), // End of list marker TagInfo(0xffff, "(UnknownSigmaMakerNoteTag)", "(UnknownSigmaMakerNoteTag)", N_("Unknown SigmaMakerNote tag"), - sigmaIfdId, makerTags, invalidTypeId, printValue) + sigmaIfdId, makerTags, invalidTypeId, -1, printValue) }; const TagInfo* SigmaMakerNote::tagList() diff --git a/src/sonymn.cpp b/src/sonymn.cpp index 4afa3258..396aaec6 100644 --- a/src/sonymn.cpp +++ b/src/sonymn.cpp @@ -273,167 +273,167 @@ namespace Exiv2 { const TagInfo SonyMakerNote::tagInfo_[] = { TagInfo(0x0102, "Quality", N_("Image Quality"), N_("Image quality"), - sony1IfdId, makerTags, unsignedLong, printMinoltaSonyImageQuality), + sony1IfdId, makerTags, unsignedLong, -1, printMinoltaSonyImageQuality), TagInfo(0x0104, "FlashExposureComp", N_("Flash Exposure Compensation"), N_("Flash exposure compensation in EV"), - sony1IfdId, makerTags, signedRational, print0x9204), + sony1IfdId, makerTags, signedRational, -1, print0x9204), TagInfo(0x0105, "Teleconverter", N_("Teleconverter Model"), N_("Teleconverter Model"), - sony1IfdId, makerTags, unsignedLong, printMinoltaSonyTeleconverterModel), + sony1IfdId, makerTags, unsignedLong, -1, printMinoltaSonyTeleconverterModel), TagInfo(0x0112, "WhiteBalanceFineTune", N_("White Balance Fine Tune"), N_("White Balance Fine Tune Value"), - sony1IfdId, makerTags, unsignedLong, printValue), + sony1IfdId, makerTags, unsignedLong, -1, printValue), TagInfo(0x0114, "CameraSettings", N_("Camera Settings"), N_("Camera Settings"), - sony1IfdId, makerTags, undefined, printValue), + sony1IfdId, makerTags, undefined, -1, printValue), TagInfo(0x0115, "WhiteBalance", N_("White Balance"), N_("White balance"), - sony1IfdId, makerTags, unsignedLong, printMinoltaSonyWhiteBalanceStd), + sony1IfdId, makerTags, unsignedLong, -1, printMinoltaSonyWhiteBalanceStd), TagInfo(0x0116, "0x0116", "0x0116", N_("Unknown"), - sony1IfdId, makerTags, undefined, printValue), + sony1IfdId, makerTags, undefined, -1, printValue), TagInfo(0x0E00, "PrintIM", N_("Print IM"), N_("PrintIM information"), - sony1IfdId, makerTags, undefined, printValue), + sony1IfdId, makerTags, undefined, -1, printValue), TagInfo(0x1000, "MultiBurstMode", N_("Multi Burst Mode"), N_("Multi Burst Mode"), - sony1IfdId, makerTags, undefined, printMinoltaSonyBoolValue), + sony1IfdId, makerTags, undefined, -1, printMinoltaSonyBoolValue), TagInfo(0x1001, "MultiBurstImageWidth", N_("Multi Burst Image Width"), N_("Multi Burst Image Width"), - sony1IfdId, makerTags, unsignedShort, printValue), + sony1IfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x1002, "MultiBurstImageHeight", N_("Multi Burst Image Height"), N_("Multi Burst Image Height"), - sony1IfdId, makerTags, unsignedShort, printValue), + sony1IfdId, makerTags, unsignedShort, -1, printValue), // TODO : Implement Panorama tags decoding. TagInfo(0x1003, "Panorama", N_("Panorama"), N_("Panorama"), - sony1IfdId, makerTags, undefined, printValue), + sony1IfdId, makerTags, undefined, -1, printValue), TagInfo(0x2000, "0x2000", "0x2000", N_("Unknown"), - sony1IfdId, makerTags, undefined, printValue), + sony1IfdId, makerTags, undefined, -1, printValue), TagInfo(0x2001, "PreviewImage", N_("Preview Image"), N_("JPEG preview image"), - sony1IfdId, makerTags, undefined, printValue), + sony1IfdId, makerTags, undefined, -1, printValue), TagInfo(0x2002, "0x2002", "0x2002", N_("Unknown"), - sony1IfdId, makerTags, unsignedLong, printValue), + sony1IfdId, makerTags, unsignedLong, -1, printValue), TagInfo(0x2003, "0x2003", "0x2003", N_("Unknown"), - sony1IfdId, makerTags, asciiString, printValue), + sony1IfdId, makerTags, asciiString, -1, printValue), TagInfo(0x2004, "Contrast", "Contrast", N_("Contrast"), - sony1IfdId, makerTags, signedLong, printValue), + sony1IfdId, makerTags, signedLong, -1, printValue), TagInfo(0x2005, "Saturation", "Saturation", N_("Saturation"), - sony1IfdId, makerTags, signedLong, printValue), + sony1IfdId, makerTags, signedLong, -1, printValue), TagInfo(0x2006, "0x2006", "0x2006", N_("Unknown"), - sony1IfdId, makerTags, signedLong, printValue), + sony1IfdId, makerTags, signedLong, -1, printValue), TagInfo(0x2007, "0x2007", "0x2007", N_("Unknown"), - sony1IfdId, makerTags, signedLong, printValue), + sony1IfdId, makerTags, signedLong, -1, printValue), TagInfo(0x2008, "0x2008", "0x2008", N_("Unknown"), - sony1IfdId, makerTags, signedLong, printValue), + sony1IfdId, makerTags, signedLong, -1, printValue), TagInfo(0x2009, "0x2009", "0x2009", N_("Unknown"), - sony1IfdId, makerTags, unsignedShort, printValue), + sony1IfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x200A, "AutoHDR", N_("Auto HDR"), N_("High Definition Range Mode"), - sony1IfdId, makerTags, unsignedLong, EXV_PRINT_TAG(sonyHDRMode)), + sony1IfdId, makerTags, unsignedLong, -1, EXV_PRINT_TAG(sonyHDRMode)), // TODO : Implement Shot Info tags decoding. TagInfo(0x3000, "ShotInfo", N_("Shot Info"), N_("Shot Information"), - sony1IfdId, makerTags, undefined, printValue), + sony1IfdId, makerTags, undefined, -1, printValue), TagInfo(0xB000, "FileFormat", N_("File Format"), N_("File Format"), - sony1IfdId, makerTags, unsignedByte, print0xb000), + sony1IfdId, makerTags, unsignedByte, -1, print0xb000), TagInfo(0xB001, "SonyModelID", N_("Sony Model ID"), N_("Sony Model ID"), - sony1IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyModelId)), + sony1IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyModelId)), TagInfo(0xB020, "ColorReproduction", N_("Color Reproduction"), N_("Color Reproduction"), - sony1IfdId, makerTags, asciiString, printValue), + sony1IfdId, makerTags, asciiString, -1, printValue), TagInfo(0xb021, "ColorTemperature", N_("Color Temperature"), N_("Color Temperature"), - sony1IfdId, makerTags, unsignedLong, printValue), + sony1IfdId, makerTags, unsignedLong, -1, printValue), TagInfo(0xB022, "ColorCompensationFilter", N_("Color Compensation Filter"), N_("Color Compensation Filter: negative is green, positive is magenta"), - sony1IfdId, makerTags, unsignedLong, printValue), + sony1IfdId, makerTags, unsignedLong, -1, printValue), TagInfo(0xB023, "SceneMode", N_("Scene Mode"), N_("Scene Mode"), - sony1IfdId, makerTags, unsignedLong, printMinoltaSonySceneMode), + sony1IfdId, makerTags, unsignedLong, -1, printMinoltaSonySceneMode), TagInfo(0xB024, "ZoneMatching", N_("Zone Matching"), N_("Zone Matching"), - sony1IfdId, makerTags, unsignedLong, printMinoltaSonyZoneMatching), + sony1IfdId, makerTags, unsignedLong, -1, printMinoltaSonyZoneMatching), TagInfo(0xB025, "DynamicRangeOptimizer", N_("Dynamic Range Optimizer"), N_("Dynamic Range Optimizer"), - sony1IfdId, makerTags, unsignedLong, EXV_PRINT_TAG(print0xb025)), + sony1IfdId, makerTags, unsignedLong, -1, EXV_PRINT_TAG(print0xb025)), TagInfo(0xB026, "ImageStabilization", N_("Image Stabilization"), N_("Image stabilization"), - sony1IfdId, makerTags, unsignedLong, printMinoltaSonyBoolValue), + sony1IfdId, makerTags, unsignedLong, -1, printMinoltaSonyBoolValue), TagInfo(0xB027, "LensID", N_("Lens ID"), N_("Lens identifier"), - sony1IfdId, makerTags, unsignedLong, printMinoltaSonyLensID), + sony1IfdId, makerTags, unsignedLong, -1, printMinoltaSonyLensID), TagInfo(0xB028, "MinoltaMakerNote", N_("Minolta MakerNote"), N_("Minolta MakerNote"), - sony1IfdId, makerTags, undefined, printValue), + sony1IfdId, makerTags, undefined, -1, printValue), TagInfo(0xB029, "ColorMode", N_("Color Mode"), N_("Color Mode"), - sony1IfdId, makerTags, unsignedLong, printMinoltaSonyColorMode), + sony1IfdId, makerTags, unsignedLong, -1, printMinoltaSonyColorMode), TagInfo(0xB02B, "FullImageSize", N_("Full Image Size"), N_("Full Image Size"), - sony1IfdId, makerTags, unsignedLong, printImageSize), + sony1IfdId, makerTags, unsignedLong, -1, printImageSize), TagInfo(0xB02C, "PreviewImageSize", N_("Preview Image Size"), N_("Preview image size"), - sony1IfdId, makerTags, unsignedLong, printImageSize), + sony1IfdId, makerTags, unsignedLong, -1, printImageSize), TagInfo(0xB040, "Macro", N_("Macro"), N_("Macro"), - sony1IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyMacroMode)), + sony1IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyMacroMode)), TagInfo(0xB041, "ExposureMode", N_("Exposure Mode"), N_("Exposure Mode"), - sony1IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyExposureMode)), + sony1IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyExposureMode)), TagInfo(0xB042, "FocusMode", N_("Focus Mode"), N_("Focus Mode"), - sony1IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyFocusMode)), + sony1IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyFocusMode)), TagInfo(0xB043, "AFMode", N_("AF Mode"), N_("AF Mode"), - sony1IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyAFMode)), + sony1IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyAFMode)), TagInfo(0xB044, "AFIlluminator", N_("AF Illuminator"), N_("AF Illuminator"), - sony1IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyAFIlluminator)), + sony1IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyAFIlluminator)), TagInfo(0xB047, "JPEGQuality", N_("JPEG Quality"), N_("JPEG Quality"), - sony1IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyJPEGQuality)), + sony1IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyJPEGQuality)), TagInfo(0xB048, "FlashLevel", N_("Flash Level"), N_("Flash Level"), - sony1IfdId, makerTags, signedShort, EXV_PRINT_TAG(sonyFlashLevel)), + sony1IfdId, makerTags, signedShort, -1, EXV_PRINT_TAG(sonyFlashLevel)), TagInfo(0xB049, "ReleaseMode", N_("Release Mode"), N_("Release Mode"), - sony1IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyReleaseMode)), + sony1IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyReleaseMode)), TagInfo(0xB04A, "SequenceNumber", N_("Sequence Number"), N_("Shot number in continous burst mode"), - sony1IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonySequenceNumber)), + sony1IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonySequenceNumber)), TagInfo(0xB04B, "AntiBlur", N_("Anti-Blur"), N_("Anti-Blur"), - sony1IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyAntiBlur)), + sony1IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyAntiBlur)), TagInfo(0xB04E, "LongExposureNoiseReduction", N_("Long Exposure Noise Reduction"), N_("Long Exposure Noise Reduction"), - sony1IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyLongExposureNoiseReduction)), + sony1IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyLongExposureNoiseReduction)), TagInfo(0xB04F, "DynamicRangeOptimizer", N_("Dynamic Range Optimizer"), N_("Dynamic Range Optimizer"), - sony1IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(print0xb04f)), + sony1IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(print0xb04f)), TagInfo(0xB052, "IntelligentAuto", N_("Intelligent Auto"), N_("Intelligent Auto"), - sony1IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyIntelligentAuto)), + sony1IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyIntelligentAuto)), TagInfo(0xB054, "WhiteBalance2", N_("White Balance 2"), N_("White balance 2"), - sony1IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyWhiteBalance)), + sony1IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyWhiteBalance)), // End of list marker TagInfo(0xffff, "(UnknownSony1MakerNoteTag)", "(UnknownSony1MakerNoteTag)", N_("Unknown Sony1MakerNote tag"), - sony1IfdId, makerTags, invalidTypeId, printValue) + sony1IfdId, makerTags, invalidTypeId, -1, printValue) }; const TagInfo* SonyMakerNote::tagList() @@ -558,102 +558,102 @@ namespace Exiv2 { // NOTE: A700 only TagInfo(0x0004, "DriveMode", N_("Drive Mode"), N_("Drive Mode"), - sony1CsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyDriveModeStd)), + sony1CsIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyDriveModeStd)), // NOTE: A700 only TagInfo(0x0006, "WhiteBalanceFineTune", N_("White Balance Fine Tune"), N_("White Balance Fine Tune"), - sony1CsIfdId, makerTags, signedShort, printValue), + sony1CsIfdId, makerTags, signedShort, -1, printValue), TagInfo(0x0010, "FocusMode", N_("Focus Mode"), N_("Focus Mode"), - sony1CsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyCSFocusMode)), + sony1CsIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyCSFocusMode)), TagInfo(0x0011, "AFAreaMode", N_("AF Area Mode"), N_("AF Area Mode"), - sony1CsIfdId, makerTags, unsignedShort, printMinoltaSonyAFAreaMode), + sony1CsIfdId, makerTags, unsignedShort, -1, printMinoltaSonyAFAreaMode), TagInfo(0x0012, "LocalAFAreaPoint", N_("Local AF Area Point"), N_("Local AF Area Point"), - sony1CsIfdId, makerTags, unsignedShort, printMinoltaSonyLocalAFAreaPoint), + sony1CsIfdId, makerTags, unsignedShort, -1, printMinoltaSonyLocalAFAreaPoint), TagInfo(0x0015, "MeteringMode", N_("Metering Mode"), N_("Metering Mode"), - sony1CsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyMeteringMode)), + sony1CsIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyMeteringMode)), TagInfo(0x0016, "ISOSetting", N_("ISO Setting"), N_("ISO Setting"), - sony1CsIfdId, makerTags, unsignedShort, printValue), + sony1CsIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x0018, "DynamicRangeOptimizerMode", N_("Dynamic Range Optimizer Mode"), N_("Dynamic Range Optimizer Mode"), - sony1CsIfdId, makerTags, unsignedShort, printMinoltaSonyDynamicRangeOptimizerMode), + sony1CsIfdId, makerTags, unsignedShort, -1, printMinoltaSonyDynamicRangeOptimizerMode), TagInfo(0x0019, "DynamicRangeOptimizerLevel", N_("Dynamic Range Optimizer Level"), N_("Dynamic Range Optimizer Level"), - sony1CsIfdId, makerTags, unsignedShort, printValue), + sony1CsIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x001A, "CreativeStyle", N_("Creative Style"), N_("Creative Style"), - sony1CsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyCreativeStyle)), + sony1CsIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyCreativeStyle)), TagInfo(0x001C, "Sharpness", N_("Sharpness"), N_("Sharpness"), - sony1CsIfdId, makerTags, unsignedShort, printValue), + sony1CsIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x001D, "Contrast", N_("Contrast"), N_("Contrast"), - sony1CsIfdId, makerTags, unsignedShort, printValue), + sony1CsIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x001E, "Saturation", N_("Saturation"), N_("Saturation"), - sony1CsIfdId, makerTags, unsignedShort, printValue), + sony1CsIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x001F, "ZoneMatchingValue", N_("Zone Matching Value"), N_("Zone Matching Value"), - sony1CsIfdId, makerTags, unsignedShort, printValue), + sony1CsIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x0022, "Brightness", N_("Brightness"), N_("Brightness"), - sony1CsIfdId, makerTags, unsignedShort, printValue), + sony1CsIfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x0023, "FlashMode", N_("FlashMode"), N_("FlashMode"), - sony1CsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyFlashMode)), + sony1CsIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyFlashMode)), // NOTE: A700 only TagInfo(0x0028, "PrioritySetupShutterRelease", N_("Priority Setup Shutter Release"), N_("Priority Setup Shutter Release"), - sony1CsIfdId, makerTags, unsignedShort, printMinoltaSonyPrioritySetupShutterRelease), + sony1CsIfdId, makerTags, unsignedShort, -1, printMinoltaSonyPrioritySetupShutterRelease), // NOTE: A700 only TagInfo(0x0029, "AFIlluminator", N_("AF Illuminator"), N_("AF Illuminator"), - sony1CsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyAFIlluminatorCS)), + sony1CsIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyAFIlluminatorCS)), // NOTE: A700 only TagInfo(0x002A, "AFWithShutter", N_("AF With Shutter"), N_("AF With Shutter"), - sony1CsIfdId, makerTags, unsignedShort, printMinoltaSonyBoolInverseValue), + sony1CsIfdId, makerTags, unsignedShort, -1, printMinoltaSonyBoolInverseValue), // NOTE: A700 only TagInfo(0x002B, "LongExposureNoiseReduction", N_("Long Exposure Noise Reduction"), N_("Long Exposure Noise Reduction"), - sony1CsIfdId, makerTags, unsignedShort, printMinoltaSonyBoolValue), + sony1CsIfdId, makerTags, unsignedShort, -1, printMinoltaSonyBoolValue), // NOTE: A700 only TagInfo(0x002C, "HighISONoiseReduction", N_("High ISO NoiseReduction"), N_("High ISO NoiseReduction"), - sony1CsIfdId, makerTags, unsignedShort, printValue), + sony1CsIfdId, makerTags, unsignedShort, -1, printValue), // NOTE: A700 only TagInfo(0x002D, "ImageStyle", N_("Image Style"), N_("Image Style"), - sony1CsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyImageStyle)), + sony1CsIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyImageStyle)), TagInfo(0x003C, "ExposureProgram", N_("Exposure Program"), N_("Exposure Program"), - sony1CsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyExposureProgram)), + sony1CsIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyExposureProgram)), TagInfo(0x003D, "ImageStabilization", N_("Image Stabilization"), N_("Image Stabilization"), - sony1CsIfdId, makerTags, unsignedShort, printMinoltaSonyBoolValue), + sony1CsIfdId, makerTags, unsignedShort, -1, printMinoltaSonyBoolValue), TagInfo(0x003F, "Rotation", N_("Rotation"), N_("Rotation"), - sony1CsIfdId, makerTags, unsignedShort, printMinoltaSonyRotation), + sony1CsIfdId, makerTags, unsignedShort, -1, printMinoltaSonyRotation), TagInfo(0x0054, "SonyImageSize", N_("Sony Image Size"), N_("Sony Image Size"), - sony1CsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyImageSize)), + sony1CsIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyImageSize)), TagInfo(0x0055, "AspectRatio", N_("Aspect Ratio"), N_("Aspect Ratio"), - sony1CsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyAspectRatio)), + sony1CsIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyAspectRatio)), TagInfo(0x0056, "Quality", N_("Quality"), N_("Quality"), - sony1CsIfdId, makerTags, unsignedShort, printMinoltaSonyQualityCs), + sony1CsIfdId, makerTags, unsignedShort, -1, printMinoltaSonyQualityCs), TagInfo(0x0058, "ExposureLevelIncrements", N_("Exposure Level Increments"), N_("Exposure Level Increments"), - sony1CsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyExposureLevelIncrements)), + sony1CsIfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyExposureLevelIncrements)), // End of list marker TagInfo(0xffff, "(UnknownSony1CsTag)", "(UnknownSony1CsTag)", N_("Unknown Sony1 Camera Settings tag"), - sony1CsIfdId, makerTags, invalidTypeId, printValue) + sony1CsIfdId, makerTags, invalidTypeId, -1, printValue) }; const TagInfo* SonyMakerNote::tagListCs() @@ -672,53 +672,53 @@ namespace Exiv2 { TagInfo(0x0010, "FocusMode", N_("Focus Mode"), N_("Focus Mode"), - sony1Cs2IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyCSFocusMode)), + sony1Cs2IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyCSFocusMode)), TagInfo(0x0011, "AFAreaMode", N_("AF Area Mode"), N_("AF Area Mode"), - sony1Cs2IfdId, makerTags, unsignedShort, printMinoltaSonyAFAreaMode), + sony1Cs2IfdId, makerTags, unsignedShort, -1, printMinoltaSonyAFAreaMode), TagInfo(0x0012, "LocalAFAreaPoint", N_("Local AF Area Point"), N_("Local AF Area Point"), - sony1Cs2IfdId, makerTags, unsignedShort, printMinoltaSonyLocalAFAreaPoint), + sony1Cs2IfdId, makerTags, unsignedShort, -1, printMinoltaSonyLocalAFAreaPoint), TagInfo(0x0013, "MeteringMode", N_("Metering Mode"), N_("Metering Mode"), - sony1Cs2IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyMeteringMode)), + sony1Cs2IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyMeteringMode)), TagInfo(0x0014, "ISOSetting", N_("ISO Setting"), N_("ISO Setting"), - sony1Cs2IfdId, makerTags, unsignedShort, printValue), + sony1Cs2IfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x0016, "DynamicRangeOptimizerMode", N_("Dynamic Range Optimizer Mode"), N_("Dynamic Range Optimizer Mode"), - sony1Cs2IfdId, makerTags, unsignedShort, printMinoltaSonyDynamicRangeOptimizerMode), + sony1Cs2IfdId, makerTags, unsignedShort, -1, printMinoltaSonyDynamicRangeOptimizerMode), TagInfo(0x0017, "DynamicRangeOptimizerLevel", N_("Dynamic Range Optimizer Level"), N_("Dynamic Range Optimizer Level"), - sony1Cs2IfdId, makerTags, unsignedShort, printValue), + sony1Cs2IfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x0018, "CreativeStyle", N_("Creative Style"), N_("Creative Style"), - sony1Cs2IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyCreativeStyle)), + sony1Cs2IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyCreativeStyle)), TagInfo(0x0019, "Sharpness", N_("Sharpness"), N_("Sharpness"), - sony1Cs2IfdId, makerTags, unsignedShort, printValue), + sony1Cs2IfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x001A, "Contrast", N_("Contrast"), N_("Contrast"), - sony1Cs2IfdId, makerTags, unsignedShort, printValue), + sony1Cs2IfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x001B, "Saturation", N_("Saturation"), N_("Saturation"), - sony1Cs2IfdId, makerTags, unsignedShort, printValue), + sony1Cs2IfdId, makerTags, unsignedShort, -1, printValue), TagInfo(0x0023, "FlashMode", N_("FlashMode"), N_("FlashMode"), - sony1Cs2IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyFlashMode)), + sony1Cs2IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyFlashMode)), TagInfo(0x003C, "ExposureProgram", N_("Exposure Program"), N_("Exposure Program"), - sony1Cs2IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyExposureProgram)), + sony1Cs2IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyExposureProgram)), TagInfo(0x003F, "Rotation", N_("Rotation"), N_("Rotation"), - sony1Cs2IfdId, makerTags, unsignedShort, printMinoltaSonyRotation), + sony1Cs2IfdId, makerTags, unsignedShort, -1, printMinoltaSonyRotation), TagInfo(0x0054, "SonyImageSize", N_("Sony Image Size"), N_("Sony Image Size"), - sony1Cs2IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyImageSize)), + sony1Cs2IfdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyImageSize)), // End of list marker TagInfo(0xffff, "(UnknownSony1Cs2Tag)", "(UnknownSony1Cs2Tag)", N_("Unknown Sony1 Camera Settings 2 tag"), - sony1Cs2IfdId, makerTags, invalidTypeId, printValue) + sony1Cs2IfdId, makerTags, invalidTypeId, -1, printValue) }; const TagInfo* SonyMakerNote::tagListCs2() diff --git a/src/tags.cpp b/src/tags.cpp index ff67b4bb..4d610c16 100644 --- a/src/tags.cpp +++ b/src/tags.cpp @@ -401,148 +401,148 @@ namespace Exiv2 { TagInfo(0x000b, "ProcessingSoftware", N_("Processing Software"), N_("The name and version of the software used to post-process " "the picture."), // ACD Systems Digital Imaging tag - ifd0Id, otherTags, asciiString, printValue), + ifd0Id, otherTags, asciiString, 0, printValue), TagInfo(0x00fe, "NewSubfileType", N_("New Subfile Type"), N_("A general indication of the kind of data contained in this subfile."), - ifd0Id, imgStruct, unsignedLong, EXV_PRINT_TAG(exifNewSubfileType)), // TIFF tag + ifd0Id, imgStruct, unsignedLong, 1, EXV_PRINT_TAG(exifNewSubfileType)), // TIFF tag TagInfo(0x00ff, "SubfileType", N_("Subfile Type"), N_("A general indication of the kind of data contained in this subfile. " "This field is deprecated. The NewSubfileType field should be used instead."), - ifd0Id, imgStruct, unsignedShort, EXV_PRINT_TAG(exifSubfileType)), // TIFF tag + ifd0Id, imgStruct, unsignedShort, 1, EXV_PRINT_TAG(exifSubfileType)), // TIFF tag TagInfo(0x0100, "ImageWidth", N_("Image Width"), N_("The number of columns of image data, equal to the number of " "pixels per row. In JPEG compressed data a JPEG marker is " "used instead of this tag."), - ifd0Id, imgStruct, unsignedLong, printValue), + ifd0Id, imgStruct, unsignedLong, 1, printValue), TagInfo(0x0101, "ImageLength", N_("Image Length"), N_("The number of rows of image data. In JPEG compressed data a " "JPEG marker is used instead of this tag."), - ifd0Id, imgStruct, unsignedLong, printValue), + ifd0Id, imgStruct, unsignedLong, 1, printValue), TagInfo(0x0102, "BitsPerSample", N_("Bits per Sample"), N_("The number of bits per image component. In this standard each " "component of the image is 8 bits, so the value for this " "tag is 8. See also . In JPEG compressed data " "a JPEG marker is used instead of this tag."), - ifd0Id, imgStruct, unsignedShort, printValue), + ifd0Id, imgStruct, unsignedShort, 3, printValue), TagInfo(0x0103, "Compression", N_("Compression"), N_("The compression scheme used for the image data. When a " "primary image is JPEG compressed, this designation is " "not necessary and is omitted. When thumbnails use JPEG " "compression, this tag value is set to 6."), - ifd0Id, imgStruct, unsignedShort, EXV_PRINT_TAG(exifCompression)), + ifd0Id, imgStruct, unsignedShort, 1, EXV_PRINT_TAG(exifCompression)), TagInfo(0x0106, "PhotometricInterpretation", N_("Photometric Interpretation"), N_("The pixel composition. In JPEG compressed data a JPEG " "marker is used instead of this tag."), - ifd0Id, imgStruct, unsignedShort, EXV_PRINT_TAG(exifPhotometricInterpretation)), + ifd0Id, imgStruct, unsignedShort, 1, EXV_PRINT_TAG(exifPhotometricInterpretation)), TagInfo(0x0107, "Threshholding", N_("Threshholding"), N_("For black and white TIFF files that represent shades of gray, " "the technique used to convert from gray to black and white pixels."), - ifd0Id, imgStruct, unsignedShort, EXV_PRINT_TAG(exifThreshholding)), // TIFF tag + ifd0Id, imgStruct, unsignedShort, 1, EXV_PRINT_TAG(exifThreshholding)), // TIFF tag TagInfo(0x0108, "CellWidth", N_("Cell Width"), N_("The width of the dithering or halftoning matrix used to create a " "dithered or halftoned bilevel file."), - ifd0Id, imgStruct, unsignedShort, printValue), // TIFF tag + ifd0Id, imgStruct, unsignedShort, 1, printValue), // TIFF tag TagInfo(0x0109, "CellLength", N_("Cell Length"), N_("The length of the dithering or halftoning matrix used to create a " "dithered or halftoned bilevel file."), - ifd0Id, imgStruct, unsignedShort, printValue), // TIFF tag + ifd0Id, imgStruct, unsignedShort, 1, printValue), // TIFF tag TagInfo(0x010a, "FillOrder", N_("Fill Order"), N_("The logical order of bits within a byte"), - ifd0Id, imgStruct, unsignedShort, printValue), // TIFF tag + ifd0Id, imgStruct, unsignedShort, 1, printValue), // TIFF tag TagInfo(0x010d, "DocumentName", N_("Document Name"), N_("The name of the document from which this image was scanned"), - ifd0Id, imgStruct, asciiString, printValue), // TIFF tag + ifd0Id, imgStruct, asciiString, 0, printValue), // TIFF tag TagInfo(0x010e, "ImageDescription", N_("Image Description"), N_("A character string giving the title of the image. It may be " "a comment such as \"1988 company picnic\" or " "the like. Two-bytes character codes cannot be used. " "When a 2-bytes code is necessary, the Exif Private tag " " is to be used."), - ifd0Id, otherTags, asciiString, printValue), + ifd0Id, otherTags, asciiString, 0, printValue), TagInfo(0x010f, "Make", N_("Manufacturer"), N_("The manufacturer of the recording " "equipment. This is the manufacturer of the DSC, scanner, " "video digitizer or other equipment that generated the " "image. When the field is left blank, it is treated as unknown."), - ifd0Id, otherTags, asciiString, printValue), + ifd0Id, otherTags, asciiString, 0, printValue), TagInfo(0x0110, "Model", N_("Model"), N_("The model name or model number of the equipment. This is the " "model name or number of the DSC, scanner, video digitizer " "or other equipment that generated the image. When the field " "is left blank, it is treated as unknown."), - ifd0Id, otherTags, asciiString, printValue), + ifd0Id, otherTags, asciiString, 0, printValue), TagInfo(0x0111, "StripOffsets", N_("Strip Offsets"), N_("For each strip, the byte offset of that strip. It is " "recommended that this be selected so the number of strip " "bytes does not exceed 64 Kbytes. With JPEG compressed " "data this designation is not needed and is omitted. See also " " and ."), - ifd0Id, recOffset, unsignedLong, printValue), + ifd0Id, recOffset, unsignedLong, -1, printValue), TagInfo(0x0112, "Orientation", N_("Orientation"), N_("The image orientation viewed in terms of rows and columns."), - ifd0Id, imgStruct, unsignedShort, print0x0112), + ifd0Id, imgStruct, unsignedShort, 1, print0x0112), TagInfo(0x0115, "SamplesPerPixel", N_("Samples per Pixel"), N_("The number of components per pixel. Since this standard applies " "to RGB and YCbCr images, the value set for this tag is 3. " "In JPEG compressed data a JPEG marker is used instead of this tag."), - ifd0Id, imgStruct, unsignedShort, printValue), + ifd0Id, imgStruct, unsignedShort, 1, printValue), TagInfo(0x0116, "RowsPerStrip", N_("Rows per Strip"), N_("The number of rows per strip. This is the number of rows " "in the image of one strip when an image is divided into " "strips. With JPEG compressed data this designation is not " "needed and is omitted. See also and ."), - ifd0Id, recOffset, unsignedLong, printValue), + ifd0Id, recOffset, unsignedLong, 1, printValue), TagInfo(0x0117, "StripByteCounts", N_("Strip Byte Count"), N_("The total number of bytes in each strip. With JPEG compressed " "data this designation is not needed and is omitted."), - ifd0Id, recOffset, unsignedLong, printValue), + ifd0Id, recOffset, unsignedLong, -1, printValue), TagInfo(0x011a, "XResolution", N_("X-Resolution"), N_("The number of pixels per in the " "direction. When the image resolution is unknown, 72 [dpi] is designated."), - ifd0Id, imgStruct, unsignedRational, printLong), + ifd0Id, imgStruct, unsignedRational, 1, printLong), TagInfo(0x011b, "YResolution", N_("Y-Resolution"), N_("The number of pixels per in the " "direction. The same value as is designated."), - ifd0Id, imgStruct, unsignedRational, printLong), + ifd0Id, imgStruct, unsignedRational, 1, printLong), TagInfo(0x011c, "PlanarConfiguration", N_("Planar Configuration"), N_("Indicates whether pixel components are recorded in a chunky " "or planar format. In JPEG compressed files a JPEG marker " "is used instead of this tag. If this field does not exist, " "the TIFF default of 1 (chunky) is assumed."), - ifd0Id, imgStruct, unsignedShort, printValue), + ifd0Id, imgStruct, unsignedShort, 1, printValue), TagInfo(0x0122, "GrayResponseUnit", N_("Gray Response Unit"), N_("The precision of the information contained in the GrayResponseCurve."), - ifd0Id, imgStruct, unsignedShort, printValue), // TIFF tag + ifd0Id, imgStruct, unsignedShort, 1, printValue), // TIFF tag TagInfo(0x0123, "GrayResponseCurve", N_("Gray Response Curve"), N_("For grayscale data, the optical density of each possible pixel value."), - ifd0Id, imgStruct, unsignedShort, printValue), // TIFF tag + ifd0Id, imgStruct, unsignedShort, -1, printValue), // TIFF tag TagInfo(0x0124, "T4Options", N_("T4 Options"), N_("T.4-encoding options."), - ifd0Id, imgStruct, unsignedLong, printValue), // TIFF tag + ifd0Id, imgStruct, unsignedLong, 1, printValue), // TIFF tag TagInfo(0x0125, "T6Options", N_("T6 Options"), N_("T.6-encoding options."), - ifd0Id, imgStruct, unsignedLong, printValue), // TIFF tag + ifd0Id, imgStruct, unsignedLong, 1, printValue), // TIFF tag TagInfo(0x0128, "ResolutionUnit", N_("Resolution Unit"), N_("The unit for measuring and . The same " "unit is used for both and . If " "the image resolution is unknown, 2 (inches) is designated."), - ifd0Id, imgStruct, unsignedShort, printExifUnit), + ifd0Id, imgStruct, unsignedShort, 1, printExifUnit), TagInfo(0x012d, "TransferFunction", N_("Transfer Function"), N_("A transfer function for the image, described in tabular style. " "Normally this tag is not necessary, since color space is " "specified in the color space information tag ()."), - ifd0Id, imgCharacter, unsignedShort, printValue), + ifd0Id, imgCharacter, unsignedShort, 3*256, printValue), TagInfo(0x0131, "Software", N_("Software"), N_("This tag records the name and version of the software or " "firmware of the camera or image input device used to " "generate the image. The detailed format is not specified, but " "it is recommended that the example shown below be " "followed. When the field is left blank, it is treated as unknown."), - ifd0Id, otherTags, asciiString, printValue), + ifd0Id, otherTags, asciiString, 0, printValue), TagInfo(0x0132, "DateTime", N_("Date and Time"), N_("The date and time of image creation. In Exif standard, " "it is the date and time the file was changed."), - ifd0Id, otherTags, asciiString, printValue), + ifd0Id, otherTags, asciiString, 20, printValue), TagInfo(0x013b, "Artist", N_("Artist"), N_("This tag records the name of the camera owner, photographer or " "image creator. The detailed format is not specified, but it is " @@ -550,118 +550,118 @@ namespace Exiv2 { "below for ease of Interoperability. When the field is " "left blank, it is treated as unknown. Ex.) \"Camera owner, John " "Smith; Photographer, Michael Brown; Image creator, Ken James\""), - ifd0Id, otherTags, asciiString, printValue), + ifd0Id, otherTags, asciiString, 0, printValue), TagInfo(0x013c, "HostComputer", N_("Host Computer"), N_("This tag records information about the host computer used " "to generate the image."), - ifd0Id, otherTags, asciiString, printValue), + ifd0Id, otherTags, asciiString, 0, printValue), TagInfo(0x013d, "Predictor", N_("Predictor"), N_("A predictor is a mathematical operator that is applied to " "the image data before an encoding scheme is applied."), - ifd0Id, imgStruct, unsignedShort, EXV_PRINT_TAG(exifPredictor)), // TIFF tag + ifd0Id, imgStruct, unsignedShort, 1, EXV_PRINT_TAG(exifPredictor)), // TIFF tag TagInfo(0x013e, "WhitePoint", N_("White Point"), N_("The chromaticity of the white point of the image. Normally " "this tag is not necessary, since color space is specified " "in the colorspace information tag ()."), - ifd0Id, imgCharacter, unsignedRational, printValue), + ifd0Id, imgCharacter, unsignedRational, 2, printValue), TagInfo(0x013f, "PrimaryChromaticities", N_("Primary Chromaticities"), N_("The chromaticity of the three primary colors of the image. " "Normally this tag is not necessary, since colorspace is " "specified in the colorspace information tag ()."), - ifd0Id, imgCharacter, unsignedRational, printValue), + ifd0Id, imgCharacter, unsignedRational, 6, printValue), TagInfo(0x0140, "ColorMap", N_("Color Map"), N_("A color map for palette color images. This field defines " "a Red-Green-Blue color map (often called a lookup table) " "for palette-color images. In a palette-color image, a " "pixel value is used to index into an RGB lookup table."), - ifd0Id, imgCharacter, unsignedShort, printValue), + ifd0Id, imgCharacter, unsignedShort, -1, printValue), TagInfo(0x0141, "HalftoneHints", N_("Halftone Hints"), N_("The purpose of the HalftoneHints field is to convey to the " "halftone function the range of gray levels within a " "colorimetrically-specified image that should retain tonal detail."), - ifd0Id, imgStruct, unsignedShort, printValue), // TIFF tag + ifd0Id, imgStruct, unsignedShort, 2, printValue), // TIFF tag TagInfo(0x0142, "TileWidth", N_("Tile Width"), N_("The tile width in pixels. This is the number of columns in each tile."), - ifd0Id, recOffset, unsignedShort, printValue), // TIFF tag + ifd0Id, recOffset, unsignedShort, 1, printValue), // TIFF tag TagInfo(0x0143, "TileLength", N_("Tile Length"), N_("The tile length (height) in pixels. This is the number of rows in each tile."), - ifd0Id, recOffset, unsignedShort, printValue), // TIFF tag + ifd0Id, recOffset, unsignedShort, 1, printValue), // TIFF tag TagInfo(0x0144, "TileOffsets", N_("Tile Offsets"), N_("For each tile, the byte offset of that tile, as compressed and " "stored on disk. The offset is specified with respect to the " "beginning of the TIFF file. Note that this implies that each " "tile has a location independent of the locations of other tiles."), - ifd0Id, recOffset, unsignedShort, printValue), // TIFF tag + ifd0Id, recOffset, unsignedShort, -1, printValue), // TIFF tag TagInfo(0x0145, "TileByteCounts", N_("Tile Byte Counts"), N_("For each tile, the number of (compressed) bytes in that tile. See " "TileOffsets for a description of how the byte counts are ordered."), - ifd0Id, recOffset, unsignedShort, printValue), // TIFF tag + ifd0Id, recOffset, unsignedShort, -1, printValue), // TIFF tag TagInfo(0x014a, "SubIFDs", N_("SubIFD Offsets"), N_("Defined by Adobe Corporation to enable TIFF Trees within a TIFF file."), - ifd0Id, tiffEp, unsignedLong, printValue), + ifd0Id, tiffEp, unsignedLong, -1, printValue), TagInfo(0x014c, "InkSet", N_("Ink Set"), N_("The set of inks used in a separated (PhotometricInterpretation=5) image."), - ifd0Id, imgStruct, unsignedShort, EXV_PRINT_TAG(exifInkSet)), // TIFF tag + ifd0Id, imgStruct, unsignedShort, 1, EXV_PRINT_TAG(exifInkSet)), // TIFF tag TagInfo(0x014d, "InkNames", N_("Ink Names"), N_("The name of each ink used in a separated (PhotometricInterpretation=5) image."), - ifd0Id, imgStruct, asciiString, printValue), // TIFF tag + ifd0Id, imgStruct, asciiString, 0, printValue), // TIFF tag TagInfo(0x014e, "NumberOfInks", N_("Number Of Inks"), N_("The number of inks. Usually equal to SamplesPerPixel, unless there are extra samples."), - ifd0Id, imgStruct, unsignedShort, printValue), // TIFF tag + ifd0Id, imgStruct, unsignedShort, 1, printValue), // TIFF tag TagInfo(0x0150, "DotRange", N_("Dot Range"), N_("The component values that correspond to a 0% dot and 100% dot."), - ifd0Id, imgStruct, unsignedByte, printValue), // TIFF tag + ifd0Id, imgStruct, unsignedByte, -1, printValue), // TIFF tag TagInfo(0x0151, "TargetPrinter", N_("Target Printer"), N_("A description of the printing environment for which this separation is intended."), - ifd0Id, imgStruct, asciiString, printValue), // TIFF tag + ifd0Id, imgStruct, asciiString, 0, printValue), // TIFF tag TagInfo(0x0152, "ExtraSamples", N_("Extra Samples"), N_("Specifies that each pixel has m extra components whose interpretation " "is defined by one of the values listed below."), - ifd0Id, imgStruct, unsignedShort, printValue), // TIFF tag + ifd0Id, imgStruct, unsignedShort, -1, printValue), // TIFF tag TagInfo(0x0153, "SampleFormat", N_("Sample Format"), N_("This field specifies how to interpret each data sample in a pixel."), - ifd0Id, imgStruct, unsignedShort, EXV_PRINT_TAG(exifSampleFormat)), // TIFF tag + ifd0Id, imgStruct, unsignedShort, -1, EXV_PRINT_TAG(exifSampleFormat)), // TIFF tag TagInfo(0x0154, "SMinSampleValue", N_("SMin Sample Value"), N_("This field specifies the minimum sample value."), - ifd0Id, imgStruct, unsignedShort, printValue), // TIFF tag + ifd0Id, imgStruct, unsignedShort, -1, printValue), // TIFF tag TagInfo(0x0155, "SMaxSampleValue", N_("SMax Sample Value"), N_("This field specifies the maximum sample value."), - ifd0Id, imgStruct, unsignedShort, printValue), // TIFF tag + ifd0Id, imgStruct, unsignedShort, -1, printValue), // TIFF tag TagInfo(0x0156, "TransferRange", N_("Transfer Range"), N_("Expands the range of the TransferFunction"), - ifd0Id, imgCharacter, unsignedShort, printValue), // TIFF tag + ifd0Id, imgCharacter, unsignedShort, 6, printValue), // TIFF tag TagInfo(0x0157, "ClipPath", N_("Clip Path"), N_("A TIFF ClipPath is intended to mirror the essentials of PostScript's " "path creation functionality."), - ifd0Id, tiffPm6, unsignedByte, printValue), // TIFF&PM6 tag + ifd0Id, tiffPm6, unsignedByte, -1, printValue), // TIFF&PM6 tag TagInfo(0x0158, "XClipPathUnits", N_("X Clip Path Units"), N_("The number of units that span the width of the image, in terms of " "integer ClipPath coordinates."), - ifd0Id, tiffPm6, signedShort, printValue), // TIFF&PM6 tag + ifd0Id, tiffPm6, signedShort, 1, printValue), // TIFF&PM6 tag TagInfo(0x0159, "YClipPathUnits", N_("Y Clip Path Units"), N_("The number of units that span the height of the image, in terms of " "integer ClipPath coordinates."), - ifd0Id, tiffPm6, signedShort, printValue), // TIFF&PM6 tag + ifd0Id, tiffPm6, signedShort, 1, printValue), // TIFF&PM6 tag TagInfo(0x015a, "Indexed", N_("Indexed"), N_("Indexed images are images where the 'pixels' do not represent color " "values, but rather an index (usually 8-bit) into a separate color " "table, the ColorMap."), - ifd0Id, tiffPm6, unsignedShort, EXV_PRINT_TAG(exifIndexed)), // TIFF&PM6 tag + ifd0Id, tiffPm6, unsignedShort, 1, EXV_PRINT_TAG(exifIndexed)), // TIFF&PM6 tag TagInfo(0x015b, "JPEGTables", N_("JPEG tables"), N_("This optional tag may be used to encode the JPEG quantization and" "Huffman tables for subsequent use by the JPEG decompression process."), - ifd0Id, imgStruct, undefined, printValue), // TIFF/EP tag + ifd0Id, imgStruct, undefined, 0, printValue), // TIFF/EP tag TagInfo(0x015F, "OPIProxy", N_("OPI Proxy"), N_("OPIProxy gives information concerning whether this image is a " "low-resolution proxy of a high-resolution image (Adobe OPI)."), - ifd0Id, adobeOpi, unsignedShort, printValue), // Adobe OPI tag + ifd0Id, adobeOpi, unsignedShort, 1, printValue), // Adobe OPI tag TagInfo(0x0200, "JPEGProc", N_("JPEG Process"), N_("This field indicates the process used to produce the compressed data"), - ifd0Id, recOffset, unsignedLong, printValue), // TIFF tag + ifd0Id, recOffset, unsignedLong, 1, printValue), // TIFF tag TagInfo(0x0201, "JPEGInterchangeFormat", N_("JPEG Interchange Format"), N_("The offset to the start byte (SOI) of JPEG compressed " "thumbnail data. This is not used for primary image JPEG data."), - ifd0Id, recOffset, unsignedLong, printValue), + ifd0Id, recOffset, unsignedLong, 1, printValue), TagInfo(0x0202, "JPEGInterchangeFormatLength", N_("JPEG Interchange Format Length"), N_("The number of bytes of JPEG compressed thumbnail data. This " "is not used for primary image JPEG data. JPEG thumbnails " @@ -669,30 +669,30 @@ namespace Exiv2 { "bitstream from SOI to EOI. Appn and COM markers should " "not be recorded. Compressed thumbnails must be recorded in no " "more than 64 Kbytes, including all other data to be recorded in APP1."), - ifd0Id, recOffset, unsignedLong, printValue), + ifd0Id, recOffset, unsignedLong, 1, printValue), TagInfo(0x0203, "JPEGRestartInterval", N_("JPEG Restart Interval"), N_("This Field indicates the length of the restart interval used " "in the compressed image data."), - ifd0Id, imgStruct, unsignedShort, printValue), // TIFF tag + ifd0Id, imgStruct, unsignedShort, 1, printValue), // TIFF tag TagInfo(0x0205, "JPEGLosslessPredictors", N_("JPEG Lossless Predictors"), N_("This Field points to a list of lossless predictor-selection " "values, one per component."), - ifd0Id, imgStruct, unsignedShort, EXV_PRINT_TAG(exifJpegLosslessPredictor)), // TIFF tag + ifd0Id, imgStruct, unsignedShort, -1, EXV_PRINT_TAG(exifJpegLosslessPredictor)), // TIFF tag TagInfo(0x0206, "JPEGPointTransforms", N_("JPEG Point Transforms"), N_("This Field points to a list of point transform values, one per component."), - ifd0Id, imgStruct, unsignedShort, printValue), // TIFF tag + ifd0Id, imgStruct, unsignedShort, -1, printValue), // TIFF tag TagInfo(0x0207, "JPEGQTables", N_("JPEG Q-Tables"), N_("This Field points to a list of offsets to the quantization tables, " "one per component."), - ifd0Id, imgStruct, unsignedLong, printValue), // TIFF tag + ifd0Id, imgStruct, unsignedLong, -1, printValue), // TIFF tag TagInfo(0x0208, "JPEGDCTables", N_("JPEG DC-Tables"), N_("This Field points to a list of offsets to the DC Huffman tables or " "the lossless Huffman tables, one per component."), - ifd0Id, imgStruct, unsignedLong, printValue), // TIFF tag + ifd0Id, imgStruct, unsignedLong, -1, printValue), // TIFF tag TagInfo(0x0209, "JPEGACTables", N_("JPEG AC-Tables"), N_("This Field points to a list of offsets to the Huffman AC tables, " "one per component."), - ifd0Id, imgStruct, unsignedLong, printValue), // TIFF tag + ifd0Id, imgStruct, unsignedLong, -1, printValue), // TIFF tag TagInfo(0x0211, "YCbCrCoefficients", N_("YCbCr Coefficients"), N_("The matrix coefficients for transformation from RGB to YCbCr " "image data. No default is given in TIFF; but here the " @@ -701,12 +701,12 @@ namespace Exiv2 { "color space information tag, with the default being the value " "that gives the optimal image characteristics " "Interoperability this condition."), - ifd0Id, imgCharacter, unsignedRational, printValue), + ifd0Id, imgCharacter, unsignedRational, 3, printValue), TagInfo(0x0212, "YCbCrSubSampling", N_("YCbCr Sub-Sampling"), N_("The sampling ratio of chrominance components in relation to the " "luminance component. In JPEG compressed data a JPEG marker " "is used instead of this tag."), - ifd0Id, imgStruct, unsignedShort, printValue), + ifd0Id, imgStruct, unsignedShort, 2, printValue), TagInfo(0x0213, "YCbCrPositioning", N_("YCbCr Positioning"), N_("The position of chrominance components in relation to the " "luminance component. This field is designated only for " @@ -721,7 +721,7 @@ namespace Exiv2 { ", it shall follow the TIFF default regardless " "of the value in this field. It is preferable that readers " "be able to support both centered and co-sited positioning."), - ifd0Id, imgStruct, unsignedShort, print0x0213), + ifd0Id, imgStruct, unsignedShort, 1, print0x0213), TagInfo(0x0214, "ReferenceBlackWhite", N_("Reference Black/White"), N_("The reference black point value and reference white point " "value. No defaults are given in TIFF, but the values " @@ -729,33 +729,33 @@ namespace Exiv2 { "in a color space information tag, with the default " "being the value that gives the optimal image characteristics " "Interoperability these conditions."), - ifd0Id, imgCharacter, unsignedRational, printValue), + ifd0Id, imgCharacter, unsignedRational, 6, printValue), TagInfo(0x02bc, "XMLPacket", N_("XML Packet"), N_("XMP Metadata (Adobe technote 9-14-02)"), - ifd0Id, otherTags, unsignedByte, printValue), + ifd0Id, otherTags, unsignedByte, -1, printValue), TagInfo(0x4746, "Rating", N_("Windows Rating"), N_("Rating tag used by Windows"), - ifd0Id, otherTags, unsignedShort, printValue), // Windows Tag + ifd0Id, otherTags, unsignedShort, -1, printValue), // Windows Tag TagInfo(0x4749, "RatingPercent", N_("Windows Rating Percent"), N_("Rating tag used by Windows, value in percent"), - ifd0Id, otherTags, unsignedShort, printValue), // Windows Tag + ifd0Id, otherTags, unsignedShort, -1, printValue), // Windows Tag TagInfo(0x800d, "ImageID", N_("Image ID"), N_("ImageID is the full pathname of the original, high-resolution image, " "or any other identifying string that uniquely identifies the original " "image (Adobe OPI)."), - ifd0Id, adobeOpi, asciiString, printValue), // Adobe OPI tag + ifd0Id, adobeOpi, asciiString, 0, printValue), // Adobe OPI tag TagInfo(0x828d, "CFARepeatPatternDim", N_("CFA Repeat Pattern Dimension"), N_("Contains two values representing the minimum rows and columns " "to define the repeating patterns of the color filter array"), - ifd0Id, tiffEp, unsignedShort, printValue), // TIFF/EP Tag + ifd0Id, tiffEp, unsignedShort, 2, printValue), // TIFF/EP Tag TagInfo(0x828e, "CFAPattern", N_("CFA Pattern"), N_("Indicates the color filter array (CFA) geometric pattern of the image " "sensor when a one-chip color area sensor is used. It does not apply to " "all sensing methods"), - ifd0Id, tiffEp, unsignedByte, printValue), // TIFF/EP Tag + ifd0Id, tiffEp, unsignedByte, -1, printValue), // TIFF/EP Tag TagInfo(0x828f, "BatteryLevel", N_("Battery Level"), "Contains a value of the battery level as a fraction or string", - ifd0Id, tiffEp, unsignedRational, printValue), // TIFF/EP Tag + ifd0Id, tiffEp, unsignedRational, 1, printValue), // TIFF/EP Tag TagInfo(0x8298, "Copyright", N_("Copyright"), N_("Copyright information. In this standard the tag is used to " "indicate both the photographer and editor copyrights. It is " @@ -775,93 +775,93 @@ namespace Exiv2 { "consists of one space followed by a terminating NULL code, then " "the editor copyright is given. When the field is left blank, it is " "treated as unknown."), - ifd0Id, otherTags, asciiString, print0x8298), - TagInfo(0x829a, "ExposureTime", N_("Exposure Time"), N_("Exposure time, given in seconds."), ifd0Id, tiffEp, unsignedRational, print0x829a), // TIFF/EP tag - TagInfo(0x829d, "FNumber", N_("FNumber"), N_("The F number."), ifd0Id, tiffEp, unsignedRational, print0x829d), // TIFF/EP tag + ifd0Id, otherTags, asciiString, 0, print0x8298), + TagInfo(0x829a, "ExposureTime", N_("Exposure Time"), N_("Exposure time, given in seconds."), ifd0Id, tiffEp, unsignedRational, 1, print0x829a), // TIFF/EP tag + TagInfo(0x829d, "FNumber", N_("FNumber"), N_("The F number."), ifd0Id, tiffEp, unsignedRational, 1, print0x829d), // TIFF/EP tag TagInfo(0x83bb, "IPTCNAA", N_("IPTC/NAA"), N_("Contains an IPTC/NAA record"), - ifd0Id, tiffEp, unsignedLong, printValue), // TIFF/EP Tag + ifd0Id, tiffEp, unsignedLong, 0, printValue), // TIFF/EP Tag TagInfo(0x8649, "ImageResources", N_("Image Resources Block"), N_("Contains information embedded by the Adobe Photoshop application"), - ifd0Id, otherTags, unsignedByte, printValue), + ifd0Id, otherTags, unsignedByte, -1, printValue), TagInfo(0x8769, "ExifTag", N_("Exif IFD Pointer"), N_("A pointer to the Exif IFD. Interoperability, Exif IFD has the " "same structure as that of the IFD specified in TIFF. " "ordinarily, however, it does not contain image data as in " "the case of TIFF."), - ifd0Id, exifFormat, unsignedLong, printValue), + ifd0Id, exifFormat, unsignedLong, 1, printValue), TagInfo(0x8773, "InterColorProfile", N_("Inter Color Profile"), N_("Contains an InterColor Consortium (ICC) format color space characterization/profile"), - ifd0Id, tiffEp, undefined, printValue), - TagInfo(0x8822, "ExposureProgram", N_("Exposure Program"), N_("The class of the program used by the camera to set exposure when the picture is taken."), ifd0Id, tiffEp, unsignedShort, print0x8822), // TIFF/EP tag - TagInfo(0x8824, "SpectralSensitivity", N_("Spectral Sensitivity"), N_("Indicates the spectral sensitivity of each channel of the camera used."), ifd0Id, tiffEp, asciiString, printValue), // TIFF/EP tag + ifd0Id, tiffEp, undefined, -1, printValue), + TagInfo(0x8822, "ExposureProgram", N_("Exposure Program"), N_("The class of the program used by the camera to set exposure when the picture is taken."), ifd0Id, tiffEp, unsignedShort, 1, print0x8822), // TIFF/EP tag + TagInfo(0x8824, "SpectralSensitivity", N_("Spectral Sensitivity"), N_("Indicates the spectral sensitivity of each channel of the camera used."), ifd0Id, tiffEp, asciiString, 0, printValue), // TIFF/EP tag TagInfo(0x8825, "GPSTag", N_("GPS Info IFD Pointer"), N_("A pointer to the GPS Info IFD. The " "Interoperability structure of the GPS Info IFD, like that of " "Exif IFD, has no image data."), - ifd0Id, exifFormat, unsignedLong, printValue), - TagInfo(0x8827, "ISOSpeedRatings", N_("ISO Speed Ratings"), N_("Indicates the ISO Speed and ISO Latitude of the camera or input device as specified in ISO 12232."), ifd0Id, tiffEp, unsignedShort, print0x8827), // TIFF/EP tag - TagInfo(0x8828, "OECF", N_("OECF"), N_("Indicates the Opto-Electric Conversion Function (OECF) specified in ISO 14524."), ifd0Id, tiffEp, undefined, printValue), // TIFF/EP tag - TagInfo(0x8829, "Interlace", N_("Interlace"), N_("Indicates the field number of multifield images."), ifd0Id, tiffEp, unsignedShort, printValue), // TIFF/EP tag + ifd0Id, exifFormat, unsignedLong, 1, printValue), + TagInfo(0x8827, "ISOSpeedRatings", N_("ISO Speed Ratings"), N_("Indicates the ISO Speed and ISO Latitude of the camera or input device as specified in ISO 12232."), ifd0Id, tiffEp, unsignedShort, 0, print0x8827), // TIFF/EP tag + TagInfo(0x8828, "OECF", N_("OECF"), N_("Indicates the Opto-Electric Conversion Function (OECF) specified in ISO 14524."), ifd0Id, tiffEp, undefined, 0, printValue), // TIFF/EP tag + TagInfo(0x8829, "Interlace", N_("Interlace"), N_("Indicates the field number of multifield images."), ifd0Id, tiffEp, unsignedShort, 1, printValue), // TIFF/EP tag TagInfo(0x882a, "TimeZoneOffset", N_("Time Zone Offset"), N_("This optional tag encodes the time zone of the camera clock (relative" "to Greenwich Mean Time) used to create the DataTimeOriginal tag-value" "when the picture was taken. It may also contain the time zone offset" "of the clock used to create the DateTime tag-value when the image was" "modified."), - ifd0Id, tiffEp, signedShort, printValue), - TagInfo(0x882b, "SelfTimerMode", N_("Self Timer Mode"), N_("Number of seconds image capture was delayed from button press."), ifd0Id, tiffEp, unsignedShort, printValue), // TIFF/EP tag - TagInfo(0x9003, "DateTimeOriginal", N_("Date Time Original"), N_("The date and time when the original image data was generated."), ifd0Id, tiffEp, asciiString, printValue), // TIFF/EP tag - TagInfo(0x9102, "CompressedBitsPerPixel", N_("Compressed Bits Per Pixel"), N_("Specific to compressed data; states the compressed bits per pixel."), ifd0Id, tiffEp, unsignedRational, printFloat), // TIFF/EP tag - TagInfo(0x9201, "ShutterSpeedValue", N_("Shutter Speed Value"), N_("Shutter speed."), ifd0Id, tiffEp, signedRational, print0x9201), // TIFF/EP tag - TagInfo(0x9202, "ApertureValue", N_("Aperture Value"), N_("The lens aperture."), ifd0Id, tiffEp, unsignedRational, print0x9202), // TIFF/EP tag - TagInfo(0x9203, "BrightnessValue", N_("Brightness Value"), N_("The value of brightness."), ifd0Id, tiffEp, signedRational, printFloat), // TIFF/EP tag - TagInfo(0x9204, "ExposureBiasValue", N_("Exposure Bias Value"), N_("The exposure bias."), ifd0Id, tiffEp, signedRational, print0x9204), // TIFF/EP tag - TagInfo(0x9205, "MaxApertureValue", N_("Max Aperture Value"), N_("The smallest F number of the lens."), ifd0Id, tiffEp, unsignedRational, print0x9202), // TIFF/EP tag - TagInfo(0x9206, "SubjectDistance", N_("Subject Distance"), N_("The distance to the subject, given in meters."), ifd0Id, tiffEp, signedRational, print0x9206), // TIFF/EP tag - TagInfo(0x9207, "MeteringMode", N_("Metering Mode"), N_("The metering mode."), ifd0Id, tiffEp, unsignedShort, print0x9207), // TIFF/EP tag - TagInfo(0x9208, "LightSource", N_("Light Source"), N_("The kind of light source."), ifd0Id, tiffEp, unsignedShort, print0x9208), // TIFF/EP tag - TagInfo(0x9209, "Flash", N_("Flash"), N_("Indicates the status of flash when the image was shot."), ifd0Id, tiffEp, unsignedShort, EXV_PRINT_TAG(exifFlash)), // TIFF/EP tag - TagInfo(0x920a, "FocalLength", N_("Focal Length"), N_("The actual focal length of the lens, in mm."), ifd0Id, tiffEp, unsignedRational, print0x920a), // TIFF/EP tag - TagInfo(0x920b, "FlashEnergy", N_("Flash Energy"), N_("Amount of flash energy (BCPS)."), ifd0Id, tiffEp, unsignedRational, printValue), // TIFF/EP tag - TagInfo(0x920c, "SpatialFrequencyResponse", N_("Spatial Frequency Response"), N_("SFR of the camera."), ifd0Id, tiffEp, undefined, printValue), // TIFF/EP tag - TagInfo(0x920d, "Noise", N_("Noise"), N_("Noise measurement values."), ifd0Id, tiffEp, undefined, printValue), // TIFF/EP tag - TagInfo(0x920e, "FocalPlaneXResolution", N_("Focal Plane X Resolution"), N_("Number of pixels per FocalPlaneResolutionUnit (37392) in ImageWidth direction for main image."), ifd0Id, tiffEp, unsignedRational, printValue), // TIFF/EP tag - TagInfo(0x920f, "FocalPlaneYResolution", N_("Focal Plane Y Resolution"), N_("Number of pixels per FocalPlaneResolutionUnit (37392) in ImageLength direction for main image."), ifd0Id, tiffEp, unsignedRational, printValue), // TIFF/EP tag - TagInfo(0x9210, "FocalPlaneResolutionUnit", N_("Focal Plane Resolution Unit"), N_("Unit of measurement for FocalPlaneXResolution(37390) and FocalPlaneYResolution(37391)."), ifd0Id, tiffEp, unsignedShort, printValue), // TIFF/EP tag - TagInfo(0x9211, "ImageNumber", N_("Image Number"), N_("Number assigned to an image, e.g., in a chained image burst."), ifd0Id, tiffEp, unsignedLong, printValue), // TIFF/EP tag - TagInfo(0x9212, "SecurityClassification", N_("Security Classification"), N_("Security classification assigned to the image."), ifd0Id, tiffEp, asciiString, printValue), // TIFF/EP tag - TagInfo(0x9213, "ImageHistory", N_("Image History"), N_("Record of what has been done to the image."), ifd0Id, tiffEp, asciiString, printValue), // TIFF/EP tag - TagInfo(0x9214, "SubjectLocation", N_("Subject Location"), N_("Indicates the location and area of the main subject in the overall scene."), ifd0Id, tiffEp, unsignedShort, printValue), // TIFF/EP tag - TagInfo(0x9215, "ExposureIndex", N_("Exposure Index"), N_("Encodes the camera exposure index setting when image was captured."), ifd0Id, tiffEp, unsignedRational, printValue), // TIFF/EP tag + ifd0Id, tiffEp, signedShort, -1, printValue), + TagInfo(0x882b, "SelfTimerMode", N_("Self Timer Mode"), N_("Number of seconds image capture was delayed from button press."), ifd0Id, tiffEp, unsignedShort, 1, printValue), // TIFF/EP tag + TagInfo(0x9003, "DateTimeOriginal", N_("Date Time Original"), N_("The date and time when the original image data was generated."), ifd0Id, tiffEp, asciiString, 20, printValue), // TIFF/EP tag + TagInfo(0x9102, "CompressedBitsPerPixel", N_("Compressed Bits Per Pixel"), N_("Specific to compressed data; states the compressed bits per pixel."), ifd0Id, tiffEp, unsignedRational, 1, printFloat), // TIFF/EP tag + TagInfo(0x9201, "ShutterSpeedValue", N_("Shutter Speed Value"), N_("Shutter speed."), ifd0Id, tiffEp, signedRational, 1, print0x9201), // TIFF/EP tag + TagInfo(0x9202, "ApertureValue", N_("Aperture Value"), N_("The lens aperture."), ifd0Id, tiffEp, unsignedRational, 1, print0x9202), // TIFF/EP tag + TagInfo(0x9203, "BrightnessValue", N_("Brightness Value"), N_("The value of brightness."), ifd0Id, tiffEp, signedRational, 1, printFloat), // TIFF/EP tag + TagInfo(0x9204, "ExposureBiasValue", N_("Exposure Bias Value"), N_("The exposure bias."), ifd0Id, tiffEp, signedRational, 1, print0x9204), // TIFF/EP tag + TagInfo(0x9205, "MaxApertureValue", N_("Max Aperture Value"), N_("The smallest F number of the lens."), ifd0Id, tiffEp, unsignedRational, 1, print0x9202), // TIFF/EP tag + TagInfo(0x9206, "SubjectDistance", N_("Subject Distance"), N_("The distance to the subject, given in meters."), ifd0Id, tiffEp, signedRational, 1, print0x9206), // TIFF/EP tag + TagInfo(0x9207, "MeteringMode", N_("Metering Mode"), N_("The metering mode."), ifd0Id, tiffEp, unsignedShort, 1, print0x9207), // TIFF/EP tag + TagInfo(0x9208, "LightSource", N_("Light Source"), N_("The kind of light source."), ifd0Id, tiffEp, unsignedShort, 1, print0x9208), // TIFF/EP tag + TagInfo(0x9209, "Flash", N_("Flash"), N_("Indicates the status of flash when the image was shot."), ifd0Id, tiffEp, unsignedShort, 1, EXV_PRINT_TAG(exifFlash)), // TIFF/EP tag + TagInfo(0x920a, "FocalLength", N_("Focal Length"), N_("The actual focal length of the lens, in mm."), ifd0Id, tiffEp, unsignedRational, 1, print0x920a), // TIFF/EP tag + TagInfo(0x920b, "FlashEnergy", N_("Flash Energy"), N_("Amount of flash energy (BCPS)."), ifd0Id, tiffEp, unsignedRational, 1, printValue), // TIFF/EP tag + TagInfo(0x920c, "SpatialFrequencyResponse", N_("Spatial Frequency Response"), N_("SFR of the camera."), ifd0Id, tiffEp, undefined, 0, printValue), // TIFF/EP tag + TagInfo(0x920d, "Noise", N_("Noise"), N_("Noise measurement values."), ifd0Id, tiffEp, undefined, 0, printValue), // TIFF/EP tag + TagInfo(0x920e, "FocalPlaneXResolution", N_("Focal Plane X Resolution"), N_("Number of pixels per FocalPlaneResolutionUnit (37392) in ImageWidth direction for main image."), ifd0Id, tiffEp, unsignedRational, 1, printValue), // TIFF/EP tag + TagInfo(0x920f, "FocalPlaneYResolution", N_("Focal Plane Y Resolution"), N_("Number of pixels per FocalPlaneResolutionUnit (37392) in ImageLength direction for main image."), ifd0Id, tiffEp, unsignedRational, 1, printValue), // TIFF/EP tag + TagInfo(0x9210, "FocalPlaneResolutionUnit", N_("Focal Plane Resolution Unit"), N_("Unit of measurement for FocalPlaneXResolution(37390) and FocalPlaneYResolution(37391)."), ifd0Id, tiffEp, unsignedShort, 1, printValue), // TIFF/EP tag + TagInfo(0x9211, "ImageNumber", N_("Image Number"), N_("Number assigned to an image, e.g., in a chained image burst."), ifd0Id, tiffEp, unsignedLong, 1, printValue), // TIFF/EP tag + TagInfo(0x9212, "SecurityClassification", N_("Security Classification"), N_("Security classification assigned to the image."), ifd0Id, tiffEp, asciiString, 0, printValue), // TIFF/EP tag + TagInfo(0x9213, "ImageHistory", N_("Image History"), N_("Record of what has been done to the image."), ifd0Id, tiffEp, asciiString, 0, printValue), // TIFF/EP tag + TagInfo(0x9214, "SubjectLocation", N_("Subject Location"), N_("Indicates the location and area of the main subject in the overall scene."), ifd0Id, tiffEp, unsignedShort, 2, printValue), // TIFF/EP tag + TagInfo(0x9215, "ExposureIndex", N_("Exposure Index"), N_("Encodes the camera exposure index setting when image was captured."), ifd0Id, tiffEp, unsignedRational, 1, printValue), // TIFF/EP tag TagInfo(0x9216, "TIFFEPStandardID", N_("TIFF/EP Standard ID"), N_("Contains four ASCII characters representing the TIFF/EP standard " "version of a TIFF/EP file, eg '1', '0', '0', '0'"), - ifd0Id, tiffEp, unsignedByte, printValue), // TIFF/EP Tag - TagInfo(0x9217, "SensingMethod", N_("Sensing Method"), N_("Type of image sensor."), ifd0Id, tiffEp, unsignedShort, printValue), // TIFF/EP tag + ifd0Id, tiffEp, unsignedByte, 4, printValue), // TIFF/EP Tag + TagInfo(0x9217, "SensingMethod", N_("Sensing Method"), N_("Type of image sensor."), ifd0Id, tiffEp, unsignedShort, 1, printValue), // TIFF/EP tag TagInfo(0x9c9b, "XPTitle", N_("Windows Title"), N_("Title tag used by Windows, encoded in UCS2"), - ifd0Id, otherTags, unsignedByte, printUcs2), // Windows Tag + ifd0Id, otherTags, unsignedByte, -1, printUcs2), // Windows Tag TagInfo(0x9c9c, "XPComment", N_("Windows Comment"), N_("Comment tag used by Windows, encoded in UCS2"), - ifd0Id, otherTags, unsignedByte, printUcs2), // Windows Tag + ifd0Id, otherTags, unsignedByte, -1, printUcs2), // Windows Tag TagInfo(0x9c9d, "XPAuthor", N_("Windows Author"), N_("Author tag used by Windows, encoded in UCS2"), - ifd0Id, otherTags, unsignedByte, printUcs2), // Windows Tag + ifd0Id, otherTags, unsignedByte, -1, printUcs2), // Windows Tag TagInfo(0x9c9e, "XPKeywords", N_("Windows Keywords"), N_("Keywords tag used by Windows, encoded in UCS2"), - ifd0Id, otherTags, unsignedByte, printUcs2), // Windows Tag + ifd0Id, otherTags, unsignedByte, -1, printUcs2), // Windows Tag TagInfo(0x9c9f, "XPSubject", N_("Windows Subject"), N_("Subject tag used by Windows, encoded in UCS2"), - ifd0Id, otherTags, unsignedByte, printUcs2), // Windows Tag + ifd0Id, otherTags, unsignedByte, -1, printUcs2), // Windows Tag TagInfo(0xc4a5, "PrintImageMatching", N_("Print Image Matching"), - N_("Print Image Matching, descriptiont needed."), - ifd0Id, otherTags, undefined, printValue), + N_("Print Image Matching, description needed."), + ifd0Id, otherTags, undefined, -1, printValue), TagInfo(0xc612, "DNGVersion", N_("DNG version"), N_("This tag encodes the DNG four-tier version number. For files " "compliant with version 1.1.0.0 of the DNG specification, this " "tag should contain the bytes: 1, 1, 0, 0."), - ifd0Id, dngTags, unsignedByte, printValue), // DNG tag + ifd0Id, dngTags, unsignedByte, 4, printValue), // DNG tag TagInfo(0xc613, "DNGBackwardVersion", N_("DNG backward version"), N_("This tag specifies the oldest version of the Digital Negative " "specification for which a file is compatible. Readers should" @@ -870,7 +870,7 @@ namespace Exiv2 { "the reader was based on. In addition to checking the version tags, " "readers should, for all tags, check the types, counts, and values, " "to verify it is able to correctly read the file."), - ifd0Id, dngTags, unsignedByte, printValue), // DNG tag + ifd0Id, dngTags, unsignedByte, 4, printValue), // DNG tag TagInfo(0xc614, "UniqueCameraModel", N_("Unique Camera Model"), N_("Defines a unique, non-localized name for the camera model that " "created the image in the raw file. This name should include the " @@ -878,56 +878,56 @@ namespace Exiv2 { "even if the camera name itself is localized for different markets " "(see LocalizedCameraModel). This string may be used by reader " "software to index into per-model preferences and replacement profiles."), - ifd0Id, dngTags, asciiString, printValue), // DNG tag + ifd0Id, dngTags, asciiString, 0, printValue), // DNG tag TagInfo(0xc615, "LocalizedCameraModel", N_("Localized Camera Model"), N_("Similar to the UniqueCameraModel field, except the name can be " "localized for different markets to match the localization of the " "camera name."), - ifd0Id, dngTags, unsignedByte, printValue), // DNG tag + ifd0Id, dngTags, unsignedByte, 0, printValue), // DNG tag TagInfo(0xc616, "CFAPlaneColor", N_("CFA Plane Color"), N_("Provides a mapping between the values in the CFAPattern tag and the " "plane numbers in LinearRaw space. This is a required tag for non-RGB " "CFA images."), - ifd0Id, dngTags, unsignedByte, printValue), // DNG tag + ifd0Id, dngTags, unsignedByte, -1, printValue), // DNG tag TagInfo(0xc617, "CFALayout", N_("CFA Layout"), N_("Describes the spatial layout of the CFA."), - ifd0Id, dngTags, unsignedShort, EXV_PRINT_TAG(exifCfaLayout)), // DNG tag + ifd0Id, dngTags, unsignedShort, 1, EXV_PRINT_TAG(exifCfaLayout)), // DNG tag TagInfo(0xc618, "LinearizationTable", N_("Linearization Table"), N_("Describes a lookup table that maps stored values into linear values. " "This tag is typically used to increase compression ratios by storing " "the raw data in a non-linear, more visually uniform space with fewer " "total encoding levels. If SamplesPerPixel is not equal to one, this " "single table applies to all the samples for each pixel."), - ifd0Id, dngTags, unsignedShort, printValue), // DNG tag + ifd0Id, dngTags, unsignedShort, -1, printValue), // DNG tag TagInfo(0xc619, "BlackLevelRepeatDim", N_("Black Level Repeat Dim"), N_("Specifies repeat pattern size for the BlackLevel tag."), - ifd0Id, dngTags, unsignedShort, printValue), // DNG tag + ifd0Id, dngTags, unsignedShort, 2, printValue), // DNG tag TagInfo(0xc61a, "BlackLevel", N_("Black Level"), N_("Specifies the zero light (a.k.a. thermal black or black current) " "encoding level, as a repeating pattern. The origin of this pattern " "is the top-left corner of the ActiveArea rectangle. The values are " "stored in row-column-sample scan order."), - ifd0Id, dngTags, unsignedRational, printValue), // DNG tag + ifd0Id, dngTags, unsignedRational, -1, printValue), // DNG tag TagInfo(0xc61b, "BlackLevelDeltaH", N_("Black Level Delta H"), N_("If the zero light encoding level is a function of the image column, " "BlackLevelDeltaH specifies the difference between the zero light " "encoding level for each column and the baseline zero light encoding " "level. If SamplesPerPixel is not equal to one, this single table " "applies to all the samples for each pixel."), - ifd0Id, dngTags, signedRational, printValue), // DNG tag + ifd0Id, dngTags, signedRational, -1, printValue), // DNG tag TagInfo(0xc61c, "BlackLevelDeltaV", N_("Black Level Delta V"), N_("If the zero light encoding level is a function of the image row, " "this tag specifies the difference between the zero light encoding " "level for each row and the baseline zero light encoding level. If " "SamplesPerPixel is not equal to one, this single table applies to " "all the samples for each pixel."), - ifd0Id, dngTags, signedRational, printValue), // DNG tag + ifd0Id, dngTags, signedRational, -1, printValue), // DNG tag TagInfo(0xc61d, "WhiteLevel", N_("White Level"), N_("This tag specifies the fully saturated encoding level for the raw " "sample values. Saturation is caused either by the sensor itself " "becoming highly non-linear in response, or by the camera's analog " "to digital converter clipping."), - ifd0Id, dngTags, unsignedShort, printValue), // DNG tag + ifd0Id, dngTags, unsignedShort, -1, printValue), // DNG tag TagInfo(0xc61e, "DefaultScale", N_("Default Scale"), N_("DefaultScale is required for cameras with non-square pixels. It " "specifies the default scale factors for each direction to convert " @@ -935,7 +935,7 @@ namespace Exiv2 { "to approximately preserve total pixel count. For CFA images that " "use CFALayout equal to 2, 3, 4, or 5, such as the Fujifilm SuperCCD, " "these two values should usually differ by a factor of 2.0."), - ifd0Id, dngTags, unsignedRational, printValue), // DNG tag + ifd0Id, dngTags, unsignedRational, 2, printValue), // DNG tag TagInfo(0xc61f, "DefaultCropOrigin", N_("Default Crop Origin"), N_("Raw images often store extra pixels around the edges of the final " "image. These extra pixels help prevent interpolation artifacts near " @@ -943,27 +943,27 @@ namespace Exiv2 { "of the final image area, in raw image coordinates (i.e., before the " "DefaultScale has been applied), relative to the top-left corner of " "the ActiveArea rectangle."), - ifd0Id, dngTags, unsignedShort, printValue), // DNG tag + ifd0Id, dngTags, unsignedShort, 2, printValue), // DNG tag TagInfo(0xc620, "DefaultCropSize", N_("Default Crop Size"), N_("Raw images often store extra pixels around the edges of the final " "image. These extra pixels help prevent interpolation artifacts near " "the edges of the final image. DefaultCropSize specifies the size of " "the final image area, in raw image coordinates (i.e., before the " "DefaultScale has been applied)."), - ifd0Id, dngTags, unsignedShort, printValue), // DNG tag + ifd0Id, dngTags, unsignedShort, 2, printValue), // DNG tag TagInfo(0xc621, "ColorMatrix1", N_("Color Matrix 1"), N_("ColorMatrix1 defines a transformation matrix that converts XYZ " "values to reference camera native color space values, under the " "first calibration illuminant. The matrix values are stored in row " "scan order. The ColorMatrix1 tag is required for all non-monochrome " "DNG files."), - ifd0Id, dngTags, signedRational, printValue), // DNG tag + ifd0Id, dngTags, signedRational, -1, printValue), // DNG tag TagInfo(0xc622, "ColorMatrix2", N_("Color Matrix 2"), N_("ColorMatrix2 defines a transformation matrix that converts XYZ " "values to reference camera native color space values, under the " "second calibration illuminant. The matrix values are stored in row " "scan order."), - ifd0Id, dngTags, signedRational, printValue), // DNG tag + ifd0Id, dngTags, signedRational, -1, printValue), // DNG tag TagInfo(0xc623, "CameraCalibration1", N_("Camera Calibration 1"), N_("CameraClalibration1 defines a calibration matrix that transforms " "reference camera native space values to individual camera native " @@ -973,7 +973,7 @@ namespace Exiv2 { "swap in replacement color matrices based on UniqueCameraModel tag, " "while still taking advantage of any per-individual camera calibration " "performed by the camera manufacturer."), - ifd0Id, dngTags, signedRational, printValue), // DNG tag + ifd0Id, dngTags, signedRational, -1, printValue), // DNG tag TagInfo(0xc624, "CameraCalibration2", N_("Camera Calibration 2"), N_("CameraCalibration2 defines a calibration matrix that transforms " "reference camera native space values to individual camera native " @@ -983,21 +983,21 @@ namespace Exiv2 { "swap in replacement color matrices based on UniqueCameraModel tag, " "while still taking advantage of any per-individual camera calibration " "performed by the camera manufacturer."), - ifd0Id, dngTags, signedRational, printValue), // DNG tag + ifd0Id, dngTags, signedRational, -1, printValue), // DNG tag TagInfo(0xc625, "ReductionMatrix1", N_("Reduction Matrix 1"), N_("ReductionMatrix1 defines a dimensionality reduction matrix for use as " "the first stage in converting color camera native space values to XYZ " "values, under the first calibration illuminant. This tag may only be " "used if ColorPlanes is greater than 3. The matrix is stored in row " "scan order."), - ifd0Id, dngTags, signedRational, printValue), // DNG tag + ifd0Id, dngTags, signedRational, -1, printValue), // DNG tag TagInfo(0xc626, "ReductionMatrix2", N_("Reduction Matrix 2"), N_("ReductionMatrix2 defines a dimensionality reduction matrix for use as " "the first stage in converting color camera native space values to XYZ " "values, under the second calibration illuminant. This tag may only be " "used if ColorPlanes is greater than 3. The matrix is stored in row " "scan order."), - ifd0Id, dngTags, signedRational, printValue), // DNG tag + ifd0Id, dngTags, signedRational, -1, printValue), // DNG tag TagInfo(0xc627, "AnalogBalance", N_("Analog Balance"), N_("Normally the stored raw values are not white balanced, since any " "digital white balancing will reduce the dynamic range of the final " @@ -1007,18 +1007,18 @@ namespace Exiv2 { "range of the final image. AnalogBalance defines the gain, either " "analog (recommended) or digital (not recommended) that has been " "applied the stored raw values."), - ifd0Id, dngTags, unsignedRational, printValue), // DNG tag + ifd0Id, dngTags, unsignedRational, -1, printValue), // DNG tag TagInfo(0xc628, "AsShotNeutral", N_("As Shot Neutral"), N_("Specifies the selected white balance at time of capture, encoded as " "the coordinates of a perfectly neutral color in linear reference " "space values. The inclusion of this tag precludes the inclusion of " "the AsShotWhiteXY tag."), - ifd0Id, dngTags, unsignedShort, printValue), // DNG tag + ifd0Id, dngTags, unsignedShort, -1, printValue), // DNG tag TagInfo(0xc629, "AsShotWhiteXY", N_("As Shot White XY"), N_("Specifies the selected white balance at time of capture, encoded as " "x-y chromaticity coordinates. The inclusion of this tag precludes " "the inclusion of the AsShotNeutral tag."), - ifd0Id, dngTags, unsignedRational, printValue), // DNG tag + ifd0Id, dngTags, unsignedRational, 2, printValue), // DNG tag TagInfo(0xc62a, "BaselineExposure", N_("Baseline Exposure"), N_("Camera models vary in the trade-off they make between highlight " "headroom and shadow noise. Some leave a significant amount of " @@ -1033,21 +1033,21 @@ namespace Exiv2 { "(in EV units) to move the zero point. Positive values result in " "brighter default results, while negative values result in darker " "default results."), - ifd0Id, dngTags, signedRational, printValue), // DNG tag + ifd0Id, dngTags, signedRational, 1, printValue), // DNG tag TagInfo(0xc62b, "BaselineNoise", N_("Baseline Noise"), N_("Specifies the relative noise level of the camera model at a baseline " "ISO value of 100, compared to a reference camera model. Since noise " "levels tend to vary approximately with the square root of the ISO " "value, a raw converter can use this value, combined with the current " "ISO, to estimate the relative noise level of the current image."), - ifd0Id, dngTags, unsignedRational, printValue), // DNG tag + ifd0Id, dngTags, unsignedRational, 1, printValue), // DNG tag TagInfo(0xc62c, "BaselineSharpness", N_("Baseline Sharpness"), N_("Specifies the relative amount of sharpening required for this camera " "model, compared to a reference camera model. Camera models vary in " "the strengths of their anti-aliasing filters. Cameras with weak or " "no filters require less sharpening than cameras with strong " "anti-aliasing filters."), - ifd0Id, dngTags, unsignedRational, printValue), // DNG tag + ifd0Id, dngTags, unsignedRational, 1, printValue), // DNG tag TagInfo(0xc62d, "BayerGreenSplit", N_("Bayer Green Split"), N_("Only applies to CFA images using a Bayer pattern filter array. This " "tag specifies, in arbitrary units, how closely the values of the " @@ -1056,7 +1056,7 @@ namespace Exiv2 { "of green pixels track closely, while a non-zero value means they " "sometimes diverge. The useful range for this tag is from 0 (no " "divergence) to about 5000 (quite large divergence)."), - ifd0Id, dngTags, unsignedLong, printValue), // DNG tag + ifd0Id, dngTags, unsignedLong, 1, printValue), // DNG tag TagInfo(0xc62e, "LinearResponseLimit", N_("Linear Response Limit"), N_("Some sensors have an unpredictable non-linearity in their response " "as they near the upper limit of their encoding range. This " @@ -1064,15 +1064,15 @@ namespace Exiv2 { "resulting image unless the raw converter compensates for this effect. " "LinearResponseLimit specifies the fraction of the encoding range " "above which the response may become significantly non-linear."), - ifd0Id, dngTags, unsignedRational, printValue), // DNG tag + ifd0Id, dngTags, unsignedRational, 1, printValue), // DNG tag TagInfo(0xc62f, "CameraSerialNumber", N_("Camera Serial Number"), N_("CameraSerialNumber contains the serial number of the camera or camera " "body that captured the image."), - ifd0Id, dngTags, asciiString, printValue), // DNG tag + ifd0Id, dngTags, asciiString, 0, printValue), // DNG tag TagInfo(0xc630, "LensInfo", N_("Lens Info"), N_("Contains information about the lens that captured the image. If the " "minimum f-stops are unknown, they should be encoded as 0/0."), - ifd0Id, dngTags, unsignedRational, printValue), // DNG tag + ifd0Id, dngTags, unsignedRational, 4, printValue), // DNG tag TagInfo(0xc631, "ChromaBlurRadius", N_("Chroma Blur Radius"), N_("ChromaBlurRadius provides a hint to the DNG reader about how much " "chroma blur should be applied to the image. If this tag is omitted, " @@ -1081,23 +1081,23 @@ namespace Exiv2 { "amount of chroma blur required for mosaic images is highly dependent " "on the de-mosaic algorithm, in which case the DNG reader's default " "value is likely optimized for its particular de-mosaic algorithm."), - ifd0Id, dngTags, unsignedRational, printValue), // DNG tag + ifd0Id, dngTags, unsignedRational, 1, printValue), // DNG tag TagInfo(0xc632, "AntiAliasStrength", N_("Anti Alias Strength"), N_("Provides a hint to the DNG reader about how strong the camera's " "anti-alias filter is. A value of 0.0 means no anti-alias filter " "(i.e., the camera is prone to aliasing artifacts with some subjects), " "while a value of 1.0 means a strong anti-alias filter (i.e., the " "camera almost never has aliasing artifacts)."), - ifd0Id, dngTags, unsignedRational, printValue), // DNG tag + ifd0Id, dngTags, unsignedRational, 1, printValue), // DNG tag TagInfo(0xc633, "ShadowScale", N_("Shadow Scale"), N_("This tag is used by Adobe Camera Raw to control the sensitivity of " "its 'Shadows' slider."), - ifd0Id, dngTags, signedRational, printValue), // DNG tag + ifd0Id, dngTags, signedRational, 1, printValue), // DNG tag TagInfo(0xc634, "DNGPrivateData", N_("DNG Private Data"), N_("Provides a way for camera manufacturers to store private data in the " "DNG file for use by their own raw converters, and to have that data " "preserved by programs that edit DNG files."), - ifd0Id, dngTags, unsignedByte, printValue), // DNG tag + ifd0Id, dngTags, unsignedByte, -1, printValue), // DNG tag TagInfo(0xc635, "MakerNoteSafety", N_("MakerNote Safety"), N_("MakerNoteSafety lets the DNG reader know whether the EXIF MakerNote " "tag is safe to preserve along with the rest of the EXIF data. File " @@ -1105,20 +1105,20 @@ namespace Exiv2 { "with a preserved MakerNote should be aware that any thumbnail " "image embedded in the MakerNote may be stale, and may not reflect " "the current state of the full size image."), - ifd0Id, dngTags, unsignedShort, printValue), // DNG tag + ifd0Id, dngTags, unsignedShort, 1, printValue), // DNG tag TagInfo(0xc65a, "CalibrationIlluminant1", N_("Calibration Illuminant 1"), N_("The illuminant used for the first set of color calibration tags " "(ColorMatrix1, CameraCalibration1, ReductionMatrix1). The legal " "values for this tag are the same as the legal values for the " "LightSource EXIF tag."), - ifd0Id, dngTags, unsignedShort, printValue), // DNG tag + ifd0Id, dngTags, unsignedShort, 1, printValue), // DNG tag TagInfo(0xc65b, "CalibrationIlluminant2", N_("Calibration Illuminant 2"), N_("The illuminant used for an optional second set of color calibration " "tags (ColorMatrix2, CameraCalibration2, ReductionMatrix2). The legal " "values for this tag are the same as the legal values for the " "CalibrationIlluminant1 tag; however, if both are included, neither " "is allowed to have a value of 0 (unknown)."), - ifd0Id, dngTags, unsignedShort, printValue), // DNG tag + ifd0Id, dngTags, unsignedShort, 1, printValue), // DNG tag TagInfo(0xc65c, "BestQualityScale", N_("Best Quality Scale"), N_("For some cameras, the best possible image quality is not achieved " "by preserving the total pixel count during conversion. For example, " @@ -1126,7 +1126,7 @@ namespace Exiv2 { "count is doubled. This tag specifies the amount by which the values " "of the DefaultScale tag need to be multiplied to achieve the best " "quality image size."), - ifd0Id, dngTags, unsignedRational, printValue), // DNG tag + ifd0Id, dngTags, unsignedRational, 1, printValue), // DNG tag TagInfo(0xc65d, "RawDataUniqueID", N_("Raw Data Unique ID"), N_("This tag contains a 16-byte unique identifier for the raw image data " "in the DNG file. DNG readers can use this tag to recognize a " @@ -1135,11 +1135,11 @@ namespace Exiv2 { "an identifier, it should do so using an algorithm that will ensure " "that it is very unlikely two different images will end up having the " "same identifier."), - ifd0Id, dngTags, unsignedByte, printValue), // DNG tag + ifd0Id, dngTags, unsignedByte, 16, printValue), // DNG tag TagInfo(0xc68b, "OriginalRawFileName", N_("Original Raw File Name"), N_("If the DNG file was converted from a non-DNG raw file, then this tag " "contains the file name of that original raw file."), - ifd0Id, dngTags, unsignedByte, printValue), // DNG tag + ifd0Id, dngTags, unsignedByte, 0, printValue), // DNG tag TagInfo(0xc68c, "OriginalRawFileData", N_("Original Raw File Data"), N_("If the DNG file was converted from a non-DNG raw file, then this tag " "contains the compressed contents of that original raw file. The " @@ -1150,11 +1150,11 @@ namespace Exiv2 { "also detect the case where data blocks are missing from the end of " "the sequence, and should assume a default value for all the missing " "blocks. There are no padding or alignment bytes between data blocks."), - ifd0Id, dngTags, undefined, printValue), // DNG tag + ifd0Id, dngTags, undefined, -1, printValue), // DNG tag TagInfo(0xc68d, "ActiveArea", N_("Active Area"), N_("This rectangle defines the active (non-masked) pixels of the sensor. " "The order of the rectangle coordinates is: top, left, bottom, right."), - ifd0Id, dngTags, unsignedShort, printValue), // DNG tag + ifd0Id, dngTags, unsignedShort, 4, printValue), // DNG tag TagInfo(0xc68e, "MaskedAreas", N_("Masked Areas"), N_("This tag contains a list of non-overlapping rectangle coordinates of " "fully masked pixels, which can be optionally used by DNG readers " @@ -1162,7 +1162,7 @@ namespace Exiv2 { "coordinates is: top, left, bottom, right. If the raw image data has " "already had its black encoding level subtracted, then this tag should " "not be used, since the masked pixels are no longer useful."), - ifd0Id, dngTags, unsignedShort, printValue), // DNG tag + ifd0Id, dngTags, unsignedShort, -1, printValue), // DNG tag TagInfo(0xc68f, "AsShotICCProfile", N_("As-Shot ICC Profile"), N_("This tag contains an ICC profile that, in conjunction with the " "AsShotPreProfileMatrix tag, provides the camera manufacturer with a " @@ -1174,7 +1174,7 @@ namespace Exiv2 { "means that the rendering in this profile should include any desired " "tone and gamut mapping needed to convert between scene referred " "values and output referred values."), - ifd0Id, dngTags, undefined, printValue), // DNG tag + ifd0Id, dngTags, undefined, -1, printValue), // DNG tag TagInfo(0xc690, "AsShotPreProfileMatrix", N_("As-Shot Pre-Profile Matrix"), N_("This tag is used in conjunction with the AsShotICCProfile tag. It " "specifies a matrix that should be applied to the camera color space " @@ -1184,25 +1184,25 @@ namespace Exiv2 { "matrix can (but is not required to) reduce the dimensionality of the " "color data down to three components, in which case the AsShotICCProfile " "should have three rather than ColorPlanes input components."), - ifd0Id, dngTags, signedRational, printValue), // DNG tag + ifd0Id, dngTags, signedRational, -1, printValue), // DNG tag TagInfo(0xc691, "CurrentICCProfile", N_("Current ICC Profile"), N_("This tag is used in conjunction with the CurrentPreProfileMatrix tag. " "The CurrentICCProfile and CurrentPreProfileMatrix tags have the same " "purpose and usage as the AsShotICCProfile and AsShotPreProfileMatrix " "tag pair, except they are for use by raw file editors rather than " "camera manufacturers."), - ifd0Id, dngTags, undefined, printValue), // DNG tag + ifd0Id, dngTags, undefined, -1, printValue), // DNG tag TagInfo(0xc692, "CurrentPreProfileMatrix", N_("Current Pre-Profile Matrix"), N_("This tag is used in conjunction with the CurrentICCProfile tag. " "The CurrentICCProfile and CurrentPreProfileMatrix tags have the same " "purpose and usage as the AsShotICCProfile and AsShotPreProfileMatrix " "tag pair, except they are for use by raw file editors rather than " "camera manufacturers."), - ifd0Id, dngTags, signedRational, printValue), // DNG tag + ifd0Id, dngTags, signedRational, -1, printValue), // DNG tag // End of list marker TagInfo(0xffff, "(UnknownIfdTag)", N_("Unknown IFD tag"), N_("Unknown IFD tag"), - ifdIdNotSet, sectionIdNotSet, invalidTypeId, printValue) + ifdIdNotSet, sectionIdNotSet, invalidTypeId, -1, printValue) }; const TagInfo* ifdTagList() @@ -1352,39 +1352,39 @@ namespace Exiv2 { static const TagInfo exifTagInfo[] = { TagInfo(0x829a, "ExposureTime", N_("Exposure Time"), N_("Exposure time, given in seconds (sec)."), - exifIfdId, captureCond, unsignedRational, print0x829a), + exifIfdId, captureCond, unsignedRational, 1, print0x829a), TagInfo(0x829d, "FNumber", N_("FNumber"), N_("The F number."), - exifIfdId, captureCond, unsignedRational, print0x829d), + exifIfdId, captureCond, unsignedRational, 1, print0x829d), 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, print0x8822), + exifIfdId, captureCond, unsignedShort, 1, 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 " "with the standard developed by the ASTM Technical Committee."), - exifIfdId, captureCond, asciiString, printValue), + exifIfdId, captureCond, asciiString, 0, printValue), TagInfo(0x8827, "ISOSpeedRatings", N_("ISO Speed Ratings"), N_("Indicates the ISO Speed and ISO Latitude of the camera or " "input device as specified in ISO 12232."), - exifIfdId, captureCond, unsignedShort, print0x8827), + exifIfdId, captureCond, unsignedShort, 0, print0x8827), TagInfo(0x8828, "OECF", N_("Opto-Electoric Conversion Function"), N_("Indicates the Opto-Electoric Conversion Function (OECF) " "specified in ISO 14524. is the relationship between " "the camera optical input and the image values."), - exifIfdId, captureCond, undefined, printValue), + exifIfdId, captureCond, undefined, 0, printValue), TagInfo(0x9000, "ExifVersion", N_("Exif Version"), N_("The version of this standard supported. Nonexistence of this " "field is taken to mean nonconformance to the standard."), - exifIfdId, exifVersion, undefined, printExifVersion), + exifIfdId, exifVersion, undefined, 4, printExifVersion), TagInfo(0x9003, "DateTimeOriginal", N_("Date and Time (original)"), N_("The date and time when the original image data was generated. " "For a digital still camera the date and time the picture was taken are recorded."), - exifIfdId, dateTime, asciiString, printValue), + exifIfdId, dateTime, asciiString, 20, printValue), TagInfo(0x9004, "DateTimeDigitized", N_("Date and Time (digitized)"), N_("The date and time when the image was stored as digital data."), - exifIfdId, dateTime, asciiString, printValue), + exifIfdId, dateTime, asciiString, 20, printValue), TagInfo(0x9101, "ComponentsConfiguration", N_("Components Configuration"), N_("Information specific to compressed data. The channels of " "each component are arranged in order from the 1st " @@ -1394,72 +1394,72 @@ namespace Exiv2 { "express the order of Y, Cb and Cr, this tag is provided " "for cases when compressed data uses components other than " "Y, Cb, and Cr and to enable support of other sequences."), - exifIfdId, imgConfig, undefined, print0x9101), + exifIfdId, imgConfig, undefined, 4, print0x9101), TagInfo(0x9102, "CompressedBitsPerPixel", N_("Compressed Bits per Pixel"), N_("Information specific to compressed data. The compression mode " "used for a compressed image is indicated in unit bits per pixel."), - exifIfdId, imgConfig, unsignedRational, printFloat), + exifIfdId, imgConfig, unsignedRational, 1, printFloat), TagInfo(0x9201, "ShutterSpeedValue", N_("Shutter speed"), N_("Shutter speed. The unit is the APEX (Additive System of " "Photographic Exposure) setting."), - exifIfdId, captureCond, signedRational, print0x9201), + exifIfdId, captureCond, signedRational, 1, print0x9201), TagInfo(0x9202, "ApertureValue", N_("Aperture"), N_("The lens aperture. The unit is the APEX value."), - exifIfdId, captureCond, unsignedRational, print0x9202), + exifIfdId, captureCond, unsignedRational, 1, print0x9202), TagInfo(0x9203, "BrightnessValue", N_("Brightness"), N_("The value of brightness. The unit is the APEX value. " "Ordinarily it is given in the range of -99.99 to 99.99."), - exifIfdId, captureCond, signedRational, printFloat), + exifIfdId, captureCond, signedRational, 1, printFloat), TagInfo(0x9204, "ExposureBiasValue", N_("Exposure Bias"), N_("The exposure bias. The units is the APEX value. Ordinarily " "it is given in the range of -99.99 to 99.99."), - exifIfdId, captureCond, signedRational, print0x9204), + exifIfdId, captureCond, signedRational, 1, print0x9204), TagInfo(0x9205, "MaxApertureValue", N_("Max Aperture Value"), N_("The smallest F number of the lens. The unit is the APEX value. " "Ordinarily it is given in the range of 00.00 to 99.99, " "but it is not limited to this range."), - exifIfdId, captureCond, unsignedRational, print0x9202), + exifIfdId, captureCond, unsignedRational, 1, print0x9202), TagInfo(0x9206, "SubjectDistance", N_("Subject Distance"), N_("The distance to the subject, given in meters."), - exifIfdId, captureCond, unsignedRational, print0x9206), + exifIfdId, captureCond, unsignedRational, 1, print0x9206), TagInfo(0x9207, "MeteringMode", N_("Metering Mode"), N_("The metering mode."), - exifIfdId, captureCond, unsignedShort, print0x9207), + exifIfdId, captureCond, unsignedShort, 1, print0x9207), TagInfo(0x9208, "LightSource", N_("Light Source"), N_("The kind of light source."), - exifIfdId, captureCond, unsignedShort, print0x9208), + exifIfdId, captureCond, unsignedShort, 1, print0x9208), TagInfo(0x9209, "Flash", N_("Flash"), N_("This tag is recorded when an image is taken using a strobe light (flash)."), - exifIfdId, captureCond, unsignedShort, EXV_PRINT_TAG(exifFlash)), + exifIfdId, captureCond, unsignedShort, 1, EXV_PRINT_TAG(exifFlash)), TagInfo(0x920a, "FocalLength", N_("Focal Length"), N_("The actual focal length of the lens, in mm. Conversion is not " "made to the focal length of a 35 mm film camera."), - exifIfdId, captureCond, unsignedRational, print0x920a), + exifIfdId, captureCond, unsignedRational, 1, print0x920a), TagInfo(0x9214, "SubjectArea", N_("Subject Area"), N_("This tag indicates the location and area of the main subject " "in the overall scene."), - exifIfdId, captureCond, unsignedShort, printValue), + exifIfdId, captureCond, unsignedShort, -1, printValue), TagInfo(0x927c, "MakerNote", N_("Maker Note"), N_("A tag for manufacturers of Exif writers to record any desired " "information. The contents are up to the manufacturer."), - exifIfdId, userInfo, undefined, printValue), + exifIfdId, userInfo, undefined, 0, printValue), TagInfo(0x9286, "UserComment", N_("User Comment"), N_("A tag for Exif users to write keywords or comments on the image " "besides those in , and without the " "character code limitations of the tag."), - exifIfdId, userInfo, comment, print0x9286), + exifIfdId, userInfo, comment, 0, print0x9286), TagInfo(0x9290, "SubSecTime", N_("Sub-seconds Time"), N_("A tag used to record fractions of seconds for the tag."), - exifIfdId, dateTime, asciiString, printValue), + exifIfdId, dateTime, asciiString, 0, printValue), TagInfo(0x9291, "SubSecTimeOriginal", N_("Sub-seconds Time Original"), N_("A tag used to record fractions of seconds for the tag."), - exifIfdId, dateTime, asciiString, printValue), + exifIfdId, dateTime, asciiString, 0, printValue), TagInfo(0x9292, "SubSecTimeDigitized", N_("Sub-seconds Time Digitized"), N_("A tag used to record fractions of seconds for the tag."), - exifIfdId, dateTime, asciiString, printValue), + exifIfdId, dateTime, asciiString, 0, printValue), TagInfo(0xa000, "FlashpixVersion", N_("FlashPix Version"), N_("The FlashPix format version supported by a FPXR file."), - exifIfdId, exifVersion, undefined, printExifVersion), + exifIfdId, exifVersion, undefined, 4, printExifVersion), TagInfo(0xa001, "ColorSpace", N_("Color Space"), N_("The color space information tag is always " "recorded as the color space specifier. Normally sRGB " @@ -1468,14 +1468,14 @@ 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, print0xa001), + exifIfdId, imgCharacter, unsignedShort, 1, 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 " "meaningful image must be recorded in this tag, whether or " "not there is padding data or a restart marker. This tag " "should not exist in an uncompressed file."), - exifIfdId, imgConfig, unsignedLong, printValue), + exifIfdId, imgConfig, unsignedLong, 1, printValue), TagInfo(0xa003, "PixelYDimension", N_("Pixel Y Dimension"), N_("Information specific to compressed data. When a compressed " "file is recorded, the valid height of the meaningful image " @@ -1484,14 +1484,14 @@ namespace Exiv2 { "uncompressed file. Since data padding is unnecessary in the vertical " "direction, the number of lines recorded in this valid image height tag " "will in fact be the same as that recorded in the SOF."), - exifIfdId, imgConfig, unsignedLong, printValue), + exifIfdId, imgConfig, unsignedLong, 1, printValue), TagInfo(0xa004, "RelatedSoundFile", N_("Related Sound File"), N_("This tag is used to record the name of an audio file related " "to the image data. The only relational information " "recorded here is the Exif audio file name and extension (an " "ASCII string consisting of 8 characters + '.' + 3 " "characters). The path is not recorded."), - exifIfdId, relatedFile, asciiString, printValue), + exifIfdId, relatedFile, asciiString, 13, printValue), TagInfo(0xa005, "InteroperabilityTag", N_("Interoperability IFD Pointer"), N_("Interoperability IFD is composed of tags which stores the " "information to ensure the Interoperability and pointed " @@ -1499,119 +1499,119 @@ namespace Exiv2 { "The Interoperability structure of Interoperability IFD is " "the same as TIFF defined IFD structure but does not contain the " "image data characteristically compared with normal TIFF IFD."), - exifIfdId, exifFormat, unsignedLong, printValue), + exifIfdId, exifFormat, unsignedLong, 1, printValue), TagInfo(0xa20b, "FlashEnergy", N_("Flash Energy"), N_("Indicates the strobe energy at the time the image is " "captured, as measured in Beam Candle Power Seconds (BCPS)."), - exifIfdId, captureCond, unsignedRational, printValue), + exifIfdId, captureCond, unsignedRational, 1, printValue), TagInfo(0xa20c, "SpatialFrequencyResponse", N_("Spatial Frequency Response"), N_("This tag records the camera or input device spatial frequency " "table and SFR values in the direction of image width, " "image height, and diagonal direction, as specified in ISO 12233."), - exifIfdId, captureCond, undefined, printValue), + exifIfdId, captureCond, undefined, 0, printValue), TagInfo(0xa20e, "FocalPlaneXResolution", N_("Focal Plane X-Resolution"), N_("Indicates the number of pixels in the image width (X) direction " "per on the camera focal plane."), - exifIfdId, captureCond, unsignedRational, printFloat), + exifIfdId, captureCond, unsignedRational, 1, printFloat), TagInfo(0xa20f, "FocalPlaneYResolution", N_("Focal Plane Y-Resolution"), N_("Indicates the number of pixels in the image height (V) direction " "per on the camera focal plane."), - exifIfdId, captureCond, unsignedRational, printFloat), + exifIfdId, captureCond, unsignedRational, 1, printFloat), TagInfo(0xa210, "FocalPlaneResolutionUnit", N_("Focal Plane Resolution Unit"), N_("Indicates the unit for measuring and " ". This value is the same as the ."), - exifIfdId, captureCond, unsignedShort, printExifUnit), + exifIfdId, captureCond, unsignedShort, 1, printExifUnit), TagInfo(0xa214, "SubjectLocation", N_("Subject Location"), N_("Indicates the location of the main subject in the scene. The " "value of this tag represents the pixel at the center of the " "main subject relative to the left edge, prior to rotation " "processing as per the tag. The first value " "indicates the X column number and second indicates the Y row number."), - exifIfdId, captureCond, unsignedShort, printValue), + exifIfdId, captureCond, unsignedShort, 2, printValue), TagInfo(0xa215, "ExposureIndex", N_("Exposure index"), N_("Indicates the exposure index selected on the camera or " "input device at the time the image is captured."), - exifIfdId, captureCond, unsignedRational, printValue), + exifIfdId, captureCond, unsignedRational, 1, printValue), TagInfo(0xa217, "SensingMethod", N_("Sensing Method"), N_("Indicates the image sensor type on the camera or input device."), - exifIfdId, captureCond, unsignedShort, print0xa217), + exifIfdId, captureCond, unsignedShort, 1, print0xa217), TagInfo(0xa300, "FileSource", N_("File Source"), N_("Indicates the image source. If a DSC recorded the image, " "this tag value of this tag always be set to 3, indicating " "that the image was recorded on a DSC."), - exifIfdId, captureCond, undefined, print0xa300), + exifIfdId, captureCond, undefined, 1, print0xa300), TagInfo(0xa301, "SceneType", N_("Scene Type"), N_("Indicates the type of scene. If a DSC recorded the image, " "this tag value must always be set to 1, indicating that the " "image was directly photographed."), - exifIfdId, captureCond, undefined, print0xa301), + exifIfdId, captureCond, undefined, 1, print0xa301), TagInfo(0xa302, "CFAPattern", N_("Color Filter Array Pattern"), N_("Indicates the color filter array (CFA) geometric pattern of the " "image sensor when a one-chip color area sensor is used. " "It does not apply to all sensing methods."), - exifIfdId, captureCond, undefined, printValue), + exifIfdId, captureCond, undefined, 0, printValue), TagInfo(0xa401, "CustomRendered", N_("Custom Rendered"), N_("This tag indicates the use of special processing on image " "data, such as rendering geared to output. When special " "processing is performed, the reader is expected to disable " "or minimize any further processing."), - exifIfdId, captureCond, unsignedShort, print0xa401), + exifIfdId, captureCond, unsignedShort, 1, print0xa401), TagInfo(0xa402, "ExposureMode", N_("Exposure Mode"), N_("This tag indicates the exposure mode set when the image was " "shot. In auto-bracketing mode, the camera shoots a series of " "frames of the same scene at different exposure settings."), - exifIfdId, captureCond, unsignedShort, print0xa402), + exifIfdId, captureCond, unsignedShort, 1, print0xa402), TagInfo(0xa403, "WhiteBalance", N_("White Balance"), N_("This tag indicates the white balance mode set when the image was shot."), - exifIfdId, captureCond, unsignedShort, print0xa403), + exifIfdId, captureCond, unsignedShort, 1, print0xa403), TagInfo(0xa404, "DigitalZoomRatio", N_("Digital Zoom Ratio"), N_("This tag indicates the digital zoom ratio when the image was " "shot. If the numerator of the recorded value is 0, this " "indicates that digital zoom was not used."), - exifIfdId, captureCond, unsignedRational, print0xa404), + exifIfdId, captureCond, unsignedRational, 1, print0xa404), TagInfo(0xa405, "FocalLengthIn35mmFilm", N_("Focal Length In 35mm Film"), N_("This tag indicates the equivalent focal length assuming a " "35mm film camera, in mm. A value of 0 means the focal " "length is unknown. Note that this tag differs from the " " tag."), - exifIfdId, captureCond, unsignedShort, print0xa405), + exifIfdId, captureCond, unsignedShort, 1, print0xa405), TagInfo(0xa406, "SceneCaptureType", N_("Scene Capture Type"), N_("This tag indicates the type of scene that was shot. It can " "also be used to record the mode in which the image was " "shot. Note that this differs from the tag."), - exifIfdId, captureCond, unsignedShort, print0xa406), + exifIfdId, captureCond, unsignedShort, 1, print0xa406), TagInfo(0xa407, "GainControl", N_("Gain Control"), N_("This tag indicates the degree of overall image gain adjustment."), - exifIfdId, captureCond, unsignedShort, print0xa407), + exifIfdId, captureCond, unsignedShort, 1, print0xa407), TagInfo(0xa408, "Contrast", N_("Contrast"), N_("This tag indicates the direction of contrast processing " "applied by the camera when the image was shot."), - exifIfdId, captureCond, unsignedShort, printNormalSoftHard), + exifIfdId, captureCond, unsignedShort, 1, printNormalSoftHard), TagInfo(0xa409, "Saturation", N_("Saturation"), N_("This tag indicates the direction of saturation processing " "applied by the camera when the image was shot."), - exifIfdId, captureCond, unsignedShort, print0xa409), + exifIfdId, captureCond, unsignedShort, 1, print0xa409), TagInfo(0xa40a, "Sharpness", N_("Sharpness"), N_("This tag indicates the direction of sharpness processing " "applied by the camera when the image was shot."), - exifIfdId, captureCond, unsignedShort, printNormalSoftHard), + exifIfdId, captureCond, unsignedShort, 1, printNormalSoftHard), TagInfo(0xa40b, "DeviceSettingDescription", N_("Device Setting Description"), N_("This tag indicates information on the picture-taking " "conditions of a particular camera model. The tag is used " "only to indicate the picture-taking conditions in the reader."), - exifIfdId, captureCond, undefined, printValue), + exifIfdId, captureCond, undefined, 0, printValue), TagInfo(0xa40c, "SubjectDistanceRange", N_("Subject Distance Range"), N_("This tag indicates the distance to the subject."), - exifIfdId, captureCond, unsignedShort, print0xa40c), + exifIfdId, captureCond, unsignedShort, 1, print0xa40c), TagInfo(0xa420, "ImageUniqueID", N_("Image Unique ID"), N_("This tag indicates an identifier assigned uniquely to " "each image. It is recorded as an ASCII string equivalent " "to hexadecimal notation and 128-bit fixed length."), - exifIfdId, otherTags, asciiString, printValue), + exifIfdId, otherTags, asciiString, 33, printValue), // End of list marker TagInfo(0xffff, "(UnknownExifTag)", N_("Unknown Exif tag"), N_("Unknown Exif tag"), - ifdIdNotSet, sectionIdNotSet, invalidTypeId, printValue) + ifdIdNotSet, sectionIdNotSet, invalidTypeId, -1, printValue) }; const TagInfo* exifTagList() @@ -1683,11 +1683,11 @@ namespace Exiv2 { "present. (Note: The tag is given in bytes, " "unlike the tag. When the version is " "2.0.0.0, the tag value is 02000000.H)."), - gpsIfdId, gpsTags, unsignedByte, print0x0000), + gpsIfdId, gpsTags, unsignedByte, 4, print0x0000), TagInfo(0x0001, "GPSLatitudeRef", N_("GPS Latitude Reference"), N_("Indicates whether the latitude is north or south latitude. The " "ASCII value 'N' indicates north latitude, and 'S' is south latitude."), - gpsIfdId, gpsTags, asciiString, EXV_PRINT_TAG(exifGPSLatitudeRef)), + gpsIfdId, gpsTags, asciiString, 2, EXV_PRINT_TAG(exifGPSLatitudeRef)), TagInfo(0x0002, "GPSLatitude", N_("GPS Latitude"), N_("Indicates the latitude. The latitude is expressed as three " "RATIONAL values giving the degrees, minutes, and seconds, " @@ -1695,11 +1695,11 @@ namespace Exiv2 { "the format is dd/1,mm/1,ss/1. When degrees and minutes are used " "and, for example, fractions of minutes are given up to two " "decimal places, the format is dd/1,mmmm/100,0/1."), - gpsIfdId, gpsTags, unsignedRational, printDegrees), + gpsIfdId, gpsTags, unsignedRational, 3, printDegrees), TagInfo(0x0003, "GPSLongitudeRef", N_("GPS Longitude Reference"), N_("Indicates whether the longitude is east or west longitude. " "ASCII 'E' indicates east longitude, and 'W' is west longitude."), - gpsIfdId, gpsTags, asciiString, EXV_PRINT_TAG(exifGPSLongitudeRef)), + gpsIfdId, gpsTags, asciiString, 2, EXV_PRINT_TAG(exifGPSLongitudeRef)), TagInfo(0x0004, "GPSLongitude", N_("GPS Longitude"), N_("Indicates the longitude. The longitude is expressed as three " "RATIONAL values giving the degrees, minutes, and seconds, " @@ -1707,7 +1707,7 @@ namespace Exiv2 { "the format is ddd/1,mm/1,ss/1. When degrees and minutes are " "used and, for example, fractions of minutes are given up to " "two decimal places, the format is ddd/1,mmmm/100,0/1."), - gpsIfdId, gpsTags, unsignedRational, printDegrees), + gpsIfdId, gpsTags, unsignedRational, 3, printDegrees), TagInfo(0x0005, "GPSAltitudeRef", N_("GPS Altitude Reference"), N_("Indicates the altitude used as the reference altitude. If the " "reference is sea level and the altitude is above sea level, 0 " @@ -1715,67 +1715,67 @@ namespace Exiv2 { "and the altitude is indicated as an absolute value in the " "GSPAltitude tag. The reference unit is meters. Note that this tag " "is BYTE type, unlike other reference tags."), - gpsIfdId, gpsTags, unsignedByte, print0x0005), + gpsIfdId, gpsTags, unsignedByte, 1, print0x0005), TagInfo(0x0006, "GPSAltitude", N_("GPS Altitude"), N_("Indicates the altitude based on the reference in GPSAltitudeRef. " "Altitude is expressed as one RATIONAL value. The reference unit is meters."), - gpsIfdId, gpsTags, unsignedRational, print0x0006), + gpsIfdId, gpsTags, unsignedRational, 1, print0x0006), TagInfo(0x0007, "GPSTimeStamp", N_("GPS Time Stamp"), N_("Indicates the time as UTC (Coordinated Universal Time). " " is expressed as three RATIONAL values " "giving the hour, minute, and second (atomic clock)."), - gpsIfdId, gpsTags, unsignedRational, print0x0007), + gpsIfdId, gpsTags, unsignedRational, 3, print0x0007), TagInfo(0x0008, "GPSSatellites", N_("GPS Satellites"), N_("Indicates the GPS satellites used for measurements. This tag can be used " "to describe the number of satellites, their ID number, angle of elevation, " "azimuth, SNR and other information in ASCII notation. The format is not " "specified. If the GPS receiver is incapable of taking measurements, value " "of the tag is set to NULL."), - gpsIfdId, gpsTags, asciiString, printValue), + gpsIfdId, gpsTags, asciiString, 0, printValue), TagInfo(0x0009, "GPSStatus", N_("GPS Status"), N_("Indicates the status of the GPS receiver when the image is recorded. " "\"A\" means measurement is in progress, and \"V\" means the measurement " "is Interoperability."), - gpsIfdId, gpsTags, asciiString, print0x0009), + gpsIfdId, gpsTags, asciiString, 2, print0x0009), TagInfo(0x000a, "GPSMeasureMode", N_("GPS Measure Mode"), N_("Indicates the GPS measurement mode. \"2\" means two-dimensional measurement and \"3\" " "means three-dimensional measurement is in progress."), - gpsIfdId, gpsTags, asciiString, print0x000a), + gpsIfdId, gpsTags, asciiString, 2, print0x000a), TagInfo(0x000b, "GPSDOP", N_("GPS Data Degree of Precision"), N_("Indicates the GPS DOP (data degree of precision). An HDOP value is written " "during two-dimensional measurement, and PDOP during three-dimensional measurement."), - gpsIfdId, gpsTags, unsignedRational, printValue), + gpsIfdId, gpsTags, unsignedRational, 1, printValue), TagInfo(0x000c, "GPSSpeedRef", N_("GPS Speed Reference"), N_("Indicates the unit used to express the GPS receiver speed of movement. " "\"K\" \"M\" and \"N\" represents kilometers per hour, miles per hour, and knots."), - gpsIfdId, gpsTags, asciiString, print0x000c), + gpsIfdId, gpsTags, asciiString, 2, print0x000c), TagInfo(0x000d, "GPSSpeed", N_("GPS Speed"), N_("Indicates the speed of GPS receiver movement."), - gpsIfdId, gpsTags, unsignedRational, printValue), + gpsIfdId, gpsTags, unsignedRational, 1, printValue), TagInfo(0x000e, "GPSTrackRef", N_("GPS Track Ref"), N_("Indicates the reference for giving the direction of GPS receiver movement. " "\"T\" denotes true direction and \"M\" is magnetic direction."), - gpsIfdId, gpsTags, asciiString, printGPSDirRef), + gpsIfdId, gpsTags, asciiString, 2, printGPSDirRef), TagInfo(0x000f, "GPSTrack", N_("GPS Track"), N_("Indicates the direction of GPS receiver movement. The range of values is " "from 0.00 to 359.99."), - gpsIfdId, gpsTags, unsignedRational, printValue), + gpsIfdId, gpsTags, unsignedRational, 1, printValue), TagInfo(0x0010, "GPSImgDirectionRef", N_("GPS Image Direction Reference"), N_("Indicates the reference for giving the direction of the image when it is captured. " "\"T\" denotes true direction and \"M\" is magnetic direction."), - gpsIfdId, gpsTags, asciiString, printGPSDirRef), + gpsIfdId, gpsTags, asciiString, 2, printGPSDirRef), TagInfo(0x0011, "GPSImgDirection", N_("GPS Image Direction"), N_("Indicates the direction of the image when it was captured. The range of values " "is from 0.00 to 359.99."), - gpsIfdId, gpsTags, unsignedRational, printValue), + gpsIfdId, gpsTags, unsignedRational, 1, printValue), TagInfo(0x0012, "GPSMapDatum", N_("GPS Map Datum"), N_("Indicates the geodetic survey data used by the GPS receiver. If the survey data " "is restricted to Japan, the value of this tag is \"TOKYO\" or \"WGS-84\"."), - gpsIfdId, gpsTags, asciiString, printValue), + gpsIfdId, gpsTags, asciiString, 0, printValue), TagInfo(0x0013, "GPSDestLatitudeRef", N_("GPS Destination Latitude Refeference"), N_("Indicates whether the latitude of the destination point is north or south latitude. " "The ASCII value \"N\" indicates north latitude, and \"S\" is south latitude."), - gpsIfdId, gpsTags, asciiString, EXV_PRINT_TAG(exifGPSLatitudeRef)), + gpsIfdId, gpsTags, asciiString, 2, EXV_PRINT_TAG(exifGPSLatitudeRef)), TagInfo(0x0014, "GPSDestLatitude", N_("GPS Destination Latitude"), N_("Indicates the latitude of the destination point. The latitude is expressed as " "three RATIONAL values giving the degrees, minutes, and seconds, respectively. " @@ -1783,53 +1783,53 @@ namespace Exiv2 { "be dd/1,mm/1,ss/1. When degrees and minutes are used and, for example, " "fractions of minutes are given up to two decimal places, the format would be " "dd/1,mmmm/100,0/1."), - gpsIfdId, gpsTags, unsignedRational, printDegrees), + gpsIfdId, gpsTags, unsignedRational, 3, printDegrees), TagInfo(0x0015, "GPSDestLongitudeRef", N_("GPS Destination Longitude Reference"), N_("Indicates whether the longitude of the destination point is east or west longitude. " "ASCII \"E\" indicates east longitude, and \"W\" is west longitude."), - gpsIfdId, gpsTags, asciiString, EXV_PRINT_TAG(exifGPSLongitudeRef)), + gpsIfdId, gpsTags, asciiString, 2, EXV_PRINT_TAG(exifGPSLongitudeRef)), TagInfo(0x0016, "GPSDestLongitude", N_("GPS Destination Longitude"), N_("Indicates the longitude of the destination point. The longitude is expressed " "as three RATIONAL values giving the degrees, minutes, and seconds, respectively. " "If longitude is expressed as degrees, minutes and seconds, a typical format would be " "ddd/1,mm/1,ss/1. When degrees and minutes are used and, for example, fractions of " "minutes are given up to two decimal places, the format would be ddd/1,mmmm/100,0/1."), - gpsIfdId, gpsTags, unsignedRational, printDegrees), + gpsIfdId, gpsTags, unsignedRational, 3, printDegrees), TagInfo(0x0017, "GPSDestBearingRef", N_("GPS Destination Bearing Reference"), N_("Indicates the reference used for giving the bearing to the destination point. " "\"T\" denotes true direction and \"M\" is magnetic direction."), - gpsIfdId, gpsTags, asciiString, printGPSDirRef), + gpsIfdId, gpsTags, asciiString, 2, printGPSDirRef), TagInfo(0x0018, "GPSDestBearing", N_("GPS Destination Bearing"), N_("Indicates the bearing to the destination point. The range of values is from " "0.00 to 359.99."), - gpsIfdId, gpsTags, unsignedRational, printValue), + gpsIfdId, gpsTags, unsignedRational, 1, printValue), TagInfo(0x0019, "GPSDestDistanceRef", N_("GPS Destination Distance Reference"), N_("Indicates the unit used to express the distance to the destination point. " "\"K\", \"M\" and \"N\" represent kilometers, miles and knots."), - gpsIfdId, gpsTags, asciiString, print0x0019), + gpsIfdId, gpsTags, asciiString, 2, print0x0019), TagInfo(0x001a, "GPSDestDistance", N_("GPS Destination Distance"), N_("Indicates the distance to the destination point."), - gpsIfdId, gpsTags, unsignedRational, printValue), + gpsIfdId, gpsTags, unsignedRational, 1, printValue), TagInfo(0x001b, "GPSProcessingMethod", N_("GPS Processing Method"), N_("A character string recording the name of the method used for location finding. " "The first byte indicates the character code used, and this is followed by the name " "of the method."), - gpsIfdId, gpsTags, undefined, printValue), + gpsIfdId, gpsTags, undefined, 0, printValue), TagInfo(0x001c, "GPSAreaInformation", N_("GPS Area Information"), N_("A character string recording the name of the GPS area. The first byte indicates " "the character code used, and this is followed by the name of the GPS area."), - gpsIfdId, gpsTags, undefined, printValue), + gpsIfdId, gpsTags, undefined, 0, printValue), TagInfo(0x001d, "GPSDateStamp", N_("GPS Date Stamp"), N_("A character string recording date and time information relative to UTC " "(Coordinated Universal Time). The format is \"YYYY:MM:DD.\"."), - gpsIfdId, gpsTags, asciiString, printValue), + gpsIfdId, gpsTags, asciiString, 11, printValue), TagInfo(0x001e, "GPSDifferential", N_("GPS Differential"), N_("Indicates whether differential correction is applied to the GPS receiver."), - gpsIfdId, gpsTags, unsignedShort, print0x001e), + gpsIfdId, gpsTags, unsignedShort, 1, print0x001e), // End of list marker TagInfo(0xffff, "(UnknownGpsTag)", N_("Unknown GPSInfo tag"), N_("Unknown GPSInfo tag"), - ifdIdNotSet, sectionIdNotSet, invalidTypeId, printValue) + ifdIdNotSet, sectionIdNotSet, invalidTypeId, -1, printValue) }; const TagInfo* gpsTagList() @@ -1845,23 +1845,23 @@ namespace Exiv2 { "including the termination code (NULL). see the separate " "volume of Recommended Exif Interoperability Rules (ExifR98) " "for other tags used for ExifR98."), - iopIfdId, iopTags, asciiString, printValue), + iopIfdId, iopTags, asciiString, 0, printValue), TagInfo(0x0002, "InteroperabilityVersion", N_("Interoperability Version"), N_("Interoperability version"), - iopIfdId, iopTags, undefined, printExifVersion), + iopIfdId, iopTags, undefined, -1, printExifVersion), TagInfo(0x1000, "RelatedImageFileFormat", N_("Related Image File Format"), N_("File format of image file"), - iopIfdId, iopTags, asciiString, printValue), + iopIfdId, iopTags, asciiString, 0, printValue), TagInfo(0x1001, "RelatedImageWidth", N_("Related Image Width"), N_("Image width"), - iopIfdId, iopTags, unsignedLong, printValue), + iopIfdId, iopTags, unsignedLong, 1, printValue), TagInfo(0x1002, "RelatedImageLength", N_("Related Image Length"), N_("Image height"), - iopIfdId, iopTags, unsignedLong, printValue), + iopIfdId, iopTags, unsignedLong, 1, printValue), // End of list marker TagInfo(0xffff, "(UnknownIopTag)", N_("Unknown Exif Interoperability tag"), N_("Unknown Exif Interoperability tag"), - ifdIdNotSet, sectionIdNotSet, invalidTypeId, printValue) + ifdIdNotSet, sectionIdNotSet, invalidTypeId, -1, printValue) }; const TagInfo* iopTagList() @@ -1873,14 +1873,14 @@ namespace Exiv2 { static const TagInfo mnTagInfo[] = { TagInfo(0x0001, "Offset", N_("Offset"), N_("Offset of the makernote from the start of the TIFF header."), - mnIfdId, makerTags, unsignedLong, printValue), + mnIfdId, makerTags, unsignedLong, 1, printValue), TagInfo(0x0002, "ByteOrder", N_("Byte Order"), N_("Byte order used to encode MakerNote tags, 'MM' (big-endian) or 'II' (little-endian)."), - mnIfdId, makerTags, asciiString, printValue), + mnIfdId, makerTags, asciiString, 0, printValue), // End of list marker TagInfo(0xffff, "(UnknownMnTag)", N_("Unknown Exiv2 Makernote info tag"), N_("Unknown Exiv2 Makernote info tag"), - ifdIdNotSet, sectionIdNotSet, invalidTypeId, printValue) + ifdIdNotSet, sectionIdNotSet, invalidTypeId, -1, printValue) }; const TagInfo* mnTagList() @@ -1891,7 +1891,7 @@ namespace Exiv2 { // Unknown Tag static const TagInfo unknownTag(0xffff, "Unknown tag", N_("Unknown tag"), N_("Unknown tag"), - ifdIdNotSet, sectionIdNotSet, asciiString, printValue); + ifdIdNotSet, sectionIdNotSet, asciiString, -1, printValue); std::ostream& printValue(std::ostream& os, const Value& value, const ExifData*) { @@ -2627,10 +2627,11 @@ namespace Exiv2 { int ifdId, int sectionId, TypeId typeId, + int16_t count, PrintFct printFct ) : tag_(tag), name_(name), title_(title), desc_(desc), ifdId_(ifdId), - sectionId_(sectionId), typeId_(typeId), printFct_(printFct) + sectionId_(sectionId), typeId_(typeId), count_(count), printFct_(printFct) { } diff --git a/src/tags.hpp b/src/tags.hpp index aa360e2d..aa7aca44 100644 --- a/src/tags.hpp +++ b/src/tags.hpp @@ -89,15 +89,17 @@ namespace Exiv2 { int ifdId, int sectionId, TypeId typeId, + int16_t count, PrintFct printFct ); uint16_t tag_; //!< Tag const char* name_; //!< One word tag label const char* title_; //!< Tag title const char* desc_; //!< Short tag description - int ifdId_; //!< Link to the (prefered) IFD + int ifdId_; //!< Link to the (preferred) IFD int sectionId_; //!< Section id TypeId typeId_; //!< Type id + int16_t count_; //!< The number of values (not bytes!), 0=any, -1=count not known. PrintFct printFct_; //!< Pointer to tag print function }; // struct TagInfo