xymp
/
exiv2
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

extern to static

Browse Source 
Signed-off-by: Rosen Penev <rosenp@gmail.com>
main
Rosen Penev 2 years ago
parent ca95edc6bd
commit 1f3d1f066f
2 changed files with 119 additions and 77 deletions
Show Stats Download Patch File Download Diff File

2
src/minoltamn_int.cpp
Unescape Escape View File

@ -1031,7 +1031,7 @@ const TagInfo* MinoltaMakerNote::tagListCsA100() {
25720/25721, 25790/25791, 25960/25961, 25980/25981, 26150/26151 25720/25721, 25790/25791, 25960/25961, 25980/25981, 26150/26151
- No need to i18n these string. - No need to i18n these string.
*/ */
extern TagDetails const minoltaSonyLensID[] = { static constexpr TagDetails minoltaSonyLensID[] = {
{0, "Minolta AF 28-85mm F3.5-4.5 New"}, {0, "Minolta AF 28-85mm F3.5-4.5 New"},
{1, "Minolta AF 80-200mm F2.8 HS-APO G"}, {1, "Minolta AF 80-200mm F2.8 HS-APO G"},
{2, "Minolta AF 28-70mm F2.8 G"}, {2, "Minolta AF 28-70mm F2.8 G"},

194
src/quicktimevideo.cpp
Unescape Escape View File

@ -39,7 +39,7 @@
// class member definitions // class member definitions
namespace Exiv2::Internal { namespace Exiv2::Internal {
extern const TagVocabulary qTimeFileType[] = { static constexpr TagVocabulary qTimeFileType[] = {
{"3g2a", "3GPP2 Media (.3G2) compliant with 3GPP2 C.S0050-0 V1.0"}, {"3g2a", "3GPP2 Media (.3G2) compliant with 3GPP2 C.S0050-0 V1.0"},
{"3g2b", "3GPP2 Media (.3G2) compliant with 3GPP2 C.S0050-A V1.0.0"}, {"3g2b", "3GPP2 Media (.3G2) compliant with 3GPP2 C.S0050-A V1.0.0"},
{"3g2c", "3GPP2 Media (.3G2) compliant with 3GPP2 C.S0050-B v1.0"}, {"3g2c", "3GPP2 Media (.3G2) compliant with 3GPP2 C.S0050-B v1.0"},
@ -125,66 +125,93 @@ extern const TagVocabulary qTimeFileType[] = {
{"qt ", "Apple QuickTime (.MOV/QT)"}, {"qt ", "Apple QuickTime (.MOV/QT)"},
{"sdv ", "SD Memory Card Video"}, {"sdv ", "SD Memory Card Video"},
{"ssc1", "Samsung stereoscopic, single stream"}, {"ssc1", "Samsung stereoscopic, single stream"},
{"ssc2", "Samsung stereoscopic, dual stream"}}; {"ssc2", "Samsung stereoscopic, dual stream"},
};
extern const TagVocabulary handlerClassTags[] = {{"dhlr", "Data Handler"}, {"mhlr", "Media Handler"}};
static constexpr TagVocabulary handlerClassTags[] = {
extern const TagVocabulary handlerTypeTags[] = {{"alis", "Alias Data"}, {"dhlr", "Data Handler"},
{"crsm", "Clock Reference"}, {"mhlr", "Media Handler"},
{"hint", "Hint Track"}, };
{"ipsm", "IPMP"},
{"m7sm", "MPEG-7 Stream"}, static constexpr TagVocabulary handlerTypeTags[] = {
{"mdir", "Metadata"}, {"alis", "Alias Data"},
{"mdta", "Metadata Tags"}, {"crsm", "Clock Reference"},
{"mjsm", "MPEG-J"}, {"hint", "Hint Track"},
{"ocsm", "Object Content"}, {"ipsm", "IPMP"},
{"odsm", "Object Descriptor"}, {"m7sm", "MPEG-7 Stream"},
{"sdsm", "Scene Description"}, {"mdir", "Metadata"},
{"soun", "Audio Track"}, {"mdta", "Metadata Tags"},
{"text", "Text"}, {"mjsm", "MPEG-J"},
{"tmcd", "Time Code"}, {"ocsm", "Object Content"},
{"url ", "URL"}, {"odsm", "Object Descriptor"},
{"vide", "Video Track"}}; {"sdsm", "Scene Description"},
{"soun", "Audio Track"},
extern const TagVocabulary vendorIDTags[] = {{"FFMP", "FFmpeg"}, {"text", "Text"},
{"appl", "Apple"}, {"tmcd", "Time Code"},
{"olym", "Olympus"}, {"url ", "URL"},
{"GIC ", "General Imaging Co."}, {"vide", "Video Track"},
{"fe20", "Olympus (fe20)"}, };
{"pana", "Panasonic"},
{"KMPI", "Konica-Minolta"}, static constexpr TagVocabulary vendorIDTags[] = {
{"kdak", "Kodak"}, {"FFMP", "FFmpeg"},
{"pent", "Pentax"}, {"appl", "Apple"},
{"NIKO", "Nikon"}, {"olym", "Olympus"},
{"leic", "Leica"}, {"GIC ", "General Imaging Co."},
{"pr01", "Olympus (pr01)"}, {"fe20", "Olympus (fe20)"},
{"SMI ", "Sorenson Media Inc."}, {"pana", "Panasonic"},
{"mino", "Minolta"}, {"KMPI", "Konica-Minolta"},
{"sany", "Sanyo"}, {"kdak", "Kodak"},
{"ZORA", "Zoran Corporation"}, {"pent", "Pentax"},
{"niko", "Nikon"}}; {"NIKO", "Nikon"},
{"leic", "Leica"},
extern const TagVocabulary cameraByteOrderTags[] = {{"II", "Little-endian (Intel, II)"}, {"pr01", "Olympus (pr01)"},
{"MM", "Big-endian (Motorola, MM)"}}; {"SMI ", "Sorenson Media Inc."},
{"mino", "Minolta"},
extern const TagDetails graphicsModetags[] = {{0x0, "srcCopy"}, {0x1, "srcOr"}, {"sany", "Sanyo"},
{0x2, "srcXor"}, {0x3, "srcBic"}, {"ZORA", "Zoran Corporation"},
{0x4, "notSrcCopy"}, {0x5, "notSrcOr"}, {"niko", "Nikon"},
{0x6, "notSrcXor"}, {0x7, "notSrcBic"}, };
{0x8, "patCopy"}, {0x9, "patOr"},
{0xa, "patXor"}, {0xb, "patBic"}, static constexpr TagVocabulary cameraByteOrderTags[] = {
{0xc, "notPatCopy"}, {0xd, "notPatOr"}, {"II", "Little-endian (Intel, II)"},
{0xe, "notPatXor"}, {0xf, "notPatBic"}, {"MM", "Big-endian (Motorola, MM)"},
{0x20, "blend"}, {0x21, "addPin"}, };
{0x22, "addOver"}, {0x23, "subPin"},
{0x24, "transparent"}, {0x25, "addMax"}, static constexpr TagDetails graphicsModetags[] = {
{0x26, "subOver"}, {0x27, "addMin"}, {0x0, "srcCopy"},
{0x31, "grayishTextOr"}, {0x32, "hilite"}, {0x1, "srcOr"},
{0x40, "ditherCopy"}, {0x100, "Alpha"}, {0x2, "srcXor"},
{0x101, "White Alpha"}, {0x102, "Pre-multiplied Black Alpha"}, {0x3, "srcBic"},
{0x110, "Component Alpha"}}; {0x4, "notSrcCopy"},
{0x5, "notSrcOr"},
extern const TagVocabulary userDatatags[] = { {0x6, "notSrcXor"},
{0x7, "notSrcBic"},
{0x8, "patCopy"},
{0x9, "patOr"},
{0xa, "patXor"},
{0xb, "patBic"},
{0xc, "notPatCopy"},
{0xd, "notPatOr"},
{0xe, "notPatXor"},
{0xf, "notPatBic"},
{0x20, "blend"},
{0x21, "addPin"},
{0x22, "addOver"},
{0x23, "subPin"},
{0x24, "transparent"},
{0x25, "addMax"},
{0x26, "subOver"},
{0x27, "addMin"},
{0x31, "grayishTextOr"},
{0x32, "hilite"},
{0x40, "ditherCopy"},
{0x100, "Alpha"},
{0x101, "White Alpha"},
{0x102, "Pre-multiplied Black Alpha"},
{0x110, "Component Alpha"},
};
static constexpr TagVocabulary userDatatags[] = {
{"AllF", "PlayAllFrames"}, {"AllF", "PlayAllFrames"},
{"CNCV", "CompressorVersion"}, {"CNCV", "CompressorVersion"},
{"CNFV", "FirmwareVersion"}, {"CNFV", "FirmwareVersion"},
@ -219,7 +246,7 @@ extern const TagVocabulary userDatatags[] = {
{"thmb", "MakerNotePentax5a/OlympusThumbnail"}, {"thmb", "MakerNotePentax5a/OlympusThumbnail"},
}; };
extern const TagVocabulary userDataReferencetags[] = { static constexpr TagVocabulary userDataReferencetags[] = {
{"CNCV", "Xmp.video.CompressorVersion"}, {"CNCV", "Xmp.video.CompressorVersion"},
{"CNFV", "Xmp.video.FirmwareVersion"}, {"CNFV", "Xmp.video.FirmwareVersion"},
{"CNMN", "Xmp.video.Model"}, {"CNMN", "Xmp.video.Model"},
@ -283,7 +310,7 @@ extern const TagVocabulary userDataReferencetags[] = {
{"Cmbo", "Xmp.video.CameraByteOrder"}, {"Cmbo", "Xmp.video.CameraByteOrder"},
}; };
extern const TagDetails NikonNCTGTags[] = { static constexpr TagDetails NikonNCTGTags[] = {
{0x0001, "Xmp.video.Make"}, {0x0001, "Xmp.video.Make"},
{0x0002, "Xmp.video.Model"}, {0x0002, "Xmp.video.Model"},
{0x0003, "Xmp.video.Software"}, {0x0003, "Xmp.video.Software"},
@ -327,21 +354,21 @@ extern const TagDetails NikonNCTGTags[] = {
{0x20000ab, "Xmp.video.VariProgram"}, {0x20000ab, "Xmp.video.VariProgram"},
}; };
extern const TagDetails NikonColorSpace[] = { [[maybe_unused]] static constexpr TagDetails NikonColorSpace[] = {
{1, "sRGB"}, {1, "sRGB"},
{2, "Adobe RGB"}, {2, "Adobe RGB"},
}; };
extern const TagVocabulary NikonGPS_Latitude_Longitude_ImgDirection_Reference[] = { [[maybe_unused]] static constexpr TagVocabulary NikonGPS_Latitude_Longitude_ImgDirection_Reference[] = {
{"N", "North"}, {"S", "South"}, {"E", "East"}, {"W", "West"}, {"M", "Magnetic North"}, {"T", "True North"}, {"N", "North"}, {"S", "South"}, {"E", "East"}, {"W", "West"}, {"M", "Magnetic North"}, {"T", "True North"},
}; };
extern const TagDetails NikonGPSAltitudeRef[] = { [[maybe_unused]] static constexpr TagDetails NikonGPSAltitudeRef[] = {
{0, "Above Sea Level"}, {0, "Above Sea Level"},
{1, "Below Sea Level"}, {1, "Below Sea Level"},
}; };
extern const TagDetails NikonExposureProgram[] = { [[maybe_unused]] static constexpr TagDetails NikonExposureProgram[] = {
{0, "Not Defined"}, {0, "Not Defined"},
{1, "Manual"}, {1, "Manual"},
{2, "Program AE"}, {2, "Program AE"},
@ -353,41 +380,56 @@ extern const TagDetails NikonExposureProgram[] = {
{8, "Landscape"}, {8, "Landscape"},
}; };
extern const TagDetails NikonMeteringMode[] = { [[maybe_unused]] static constexpr TagDetails NikonMeteringMode[] = {
{0, "Unknown"}, {1, "Average"}, {2, "Center-weighted average"}, {0, "Unknown"}, {1, "Average"}, {2, "Center-weighted average"},
{3, "Spot"}, {4, "Multi-spot"}, {5, "Multi-segment"}, {3, "Spot"}, {4, "Multi-spot"}, {5, "Multi-segment"},
{6, "Partial"}, {255, "Other"}, {6, "Partial"}, {255, "Other"},
}; };
extern const TagDetails PictureControlAdjust[] = { static constexpr TagDetails PictureControlAdjust[] = {
{0, "Default Settings"}, {0, "Default Settings"},
{1, "Quick Adjust"}, {1, "Quick Adjust"},
{2, "Full Control"}, {2, "Full Control"},
}; };
//! Contrast and Sharpness //! Contrast and Sharpness
extern const TagDetails NormalSoftHard[] = {{0, "Normal"}, {1, "Soft"}, {2, "Hard"}}; static constexpr TagDetails NormalSoftHard[] = {
{0, "Normal"},
{1, "Soft"},
{2, "Hard"},
};
//! Saturation //! Saturation
extern const TagDetails Saturation[] = {{0, "Normal"}, {1, "Low"}, {2, "High"}}; static constexpr TagDetails Saturation[] = {
{0, "Normal"},
{1, "Low"},
{2, "High"},
};
//! YesNo, used for DaylightSavings //! YesNo, used for DaylightSavings
extern const TagDetails YesNo[] = {{0, "No"}, {1, "Yes"}}; static constexpr TagDetails YesNo[] = {
{0, "No"},
{1, "Yes"},
};
//! DateDisplayFormat //! DateDisplayFormat
extern const TagDetails DateDisplayFormat[] = {{0, "Y/M/D"}, {1, "M/D/Y"}, {2, "D/M/Y"}}; static constexpr TagDetails DateDisplayFormat[] = {
{0, "Y/M/D"},
{1, "M/D/Y"},
{2, "D/M/Y"},
};
extern const TagDetails FilterEffect[] = { static constexpr TagDetails FilterEffect[] = {
{0x80, "Off"}, {0x81, "Yellow"}, {0x82, "Orange"}, {0x83, "Red"}, {0x84, "Green"}, {0xff, "n/a"}, {0x80, "Off"}, {0x81, "Yellow"}, {0x82, "Orange"}, {0x83, "Red"}, {0x84, "Green"}, {0xff, "n/a"},
}; };
extern const TagDetails ToningEffect[] = { static constexpr TagDetails ToningEffect[] = {
{0x80, "B&W"}, {0x81, "Sepia"}, {0x82, "Cyanotype"}, {0x83, "Red"}, {0x80, "B&W"}, {0x81, "Sepia"}, {0x82, "Cyanotype"}, {0x83, "Red"},
{0x84, "Yellow"}, {0x85, "Green"}, {0x86, "Blue-green"}, {0x87, "Blue"}, {0x84, "Yellow"}, {0x85, "Green"}, {0x86, "Blue-green"}, {0x87, "Blue"},
{0x88, "Purple-blue"}, {0x89, "Red-purple"}, {0xff, "n/a"}, {0x88, "Purple-blue"}, {0x89, "Red-purple"}, {0xff, "n/a"},
}; };
extern const TagDetails whiteBalance[] = { static constexpr TagDetails whiteBalance[] = {
{0, "Auto"}, {1, "Daylight"}, {2, "Shade"}, {3, "Fluorescent"}, {4, "Tungsten"}, {5, "Manual"}, {0, "Auto"}, {1, "Daylight"}, {2, "Shade"}, {3, "Fluorescent"}, {4, "Tungsten"}, {5, "Manual"},
}; };

Write Preview
Loading…
Cancel
Save