diff options
author | Hubert Figuière <hub@figuiere.net> | 2022-02-14 15:49:10 -0500 |
---|---|---|
committer | Hubert Figuière <hub@figuiere.net> | 2022-02-14 15:49:10 -0500 |
commit | 1a76f72ccbb989fec947fcce0d733286da5d44e8 (patch) | |
tree | 9d5024d2328d9f3b2d74b71c696b0ba138dddb65 | |
parent | 7e3793ccad7d80f3ca43ca08be2057980711683a (diff) |
Build with -Werror=missing-field-initializers
-rw-r--r-- | XMPFiles/source/FormatSupport/AIFF/AIFFReconcile.cpp | 2 | ||||
-rw-r--r-- | XMPFiles/source/FormatSupport/RIFF.hpp | 4 | ||||
-rw-r--r-- | XMPFiles/source/FormatSupport/ReconcileTIFF.cpp | 6 | ||||
-rw-r--r-- | XMPFiles/source/FormatSupport/WAVE/WAVEReconcile.cpp | 10 | ||||
-rw-r--r-- | configure.ac | 1 |
5 files changed, 12 insertions, 11 deletions
diff --git a/XMPFiles/source/FormatSupport/AIFF/AIFFReconcile.cpp b/XMPFiles/source/FormatSupport/AIFF/AIFFReconcile.cpp index 3f95a16..f931818 100644 --- a/XMPFiles/source/FormatSupport/AIFF/AIFFReconcile.cpp +++ b/XMPFiles/source/FormatSupport/AIFF/AIFFReconcile.cpp @@ -27,7 +27,7 @@ static const MetadataPropertyInfo kAIFFProperties[] = { kXMP_NS_DC, "creator", AIFFMetadata::kAuthor, kNativeType_StrUTF8, kXMPType_Array, true, false, kExport_Always }, // dc:creator <-> FORM:AIFF/AUTH { kXMP_NS_DC, "rights", AIFFMetadata::kCopyright, kNativeType_StrUTF8, kXMPType_Localized, true, false, kExport_Always }, // dc:rights <-> FORM:AIFF/(c) { kXMP_NS_DM, "logComment", AIFFMetadata::kAnnotation, kNativeType_StrUTF8, kXMPType_Simple, true, false, kExport_Always }, // xmpDM:logComment <-> FORM:AIFF/ANNO - { NULL } + { NULL, nullptr, 0, kNativeType_Str, kXMPType_Simple, false, false, kExport_Never } }; XMP_Bool AIFFReconcile::importToXMP( SXMPMeta& outXMP, const MetadataSet& inMetaData ) diff --git a/XMPFiles/source/FormatSupport/RIFF.hpp b/XMPFiles/source/FormatSupport/RIFF.hpp index 68db6d4..7a047fe 100644 --- a/XMPFiles/source/FormatSupport/RIFF.hpp +++ b/XMPFiles/source/FormatSupport/RIFF.hpp @@ -160,7 +160,7 @@ namespace RIFF { //{ kPropChunkISRC, to be decided, "" , prop_SIMPLE }, //{ kPropChunkITCH, to be decided, "" , prop_SIMPLE }, - { 0, 0, 0 } // sentinel + { 0, 0, 0, prop_SIMPLE } // sentinel }; static Mapping listTdatProps[] = { @@ -169,7 +169,7 @@ namespace RIFF { { kPropChunk_tc_A, kXMP_NS_DM, "altTimecode" , prop_TIMEVALUE }, // special: must end up in dm:timeValue child { kPropChunk_rn_O, kXMP_NS_DM, "tapeName" , prop_SIMPLE }, { kPropChunk_rn_A, kXMP_NS_DM, "altTapeName" , prop_SIMPLE }, - { 0, 0, 0 } // sentinel + { 0, 0, 0, prop_SIMPLE } // sentinel }; // ================================================================================================= diff --git a/XMPFiles/source/FormatSupport/ReconcileTIFF.cpp b/XMPFiles/source/FormatSupport/ReconcileTIFF.cpp index 96deafb..0435f61 100644 --- a/XMPFiles/source/FormatSupport/ReconcileTIFF.cpp +++ b/XMPFiles/source/FormatSupport/ReconcileTIFF.cpp @@ -98,7 +98,7 @@ static const TIFF_MappingToXMP sPrimaryIFDMappings[] = { // A blank name indicat { /* 305 */ kTIFF_Software, kTIFF_ASCIIType, kAnyCount, kExport_Always, kXMP_NS_TIFF, "Software" }, // Has alias to xmp:CreatorTool. { /* 315 */ kTIFF_Artist, kTIFF_ASCIIType, kAnyCount, kExport_Always, "", "" }, // ! Has a special mapping. { /* 33432 */ kTIFF_Copyright, kTIFF_ASCIIType, kAnyCount, kExport_Always, "", "" }, // ! Has a special mapping. - { 0xFFFF, 0, 0, 0 } // ! Must end with sentinel. + { 0xFFFF, 0, 0, 0, nullptr, nullptr } // ! Must end with sentinel. }; static const TIFF_MappingToXMP sExifIFDMappings[] = { @@ -175,7 +175,7 @@ static const TIFF_MappingToXMP sExifIFDMappings[] = { { /* 41995 */ kTIFF_DeviceSettingDescription, kTIFF_UndefinedType, kAnyCount, kExport_InjectOnly, "", "" }, // ! Has a special mapping. { /* 41996 */ kTIFF_SubjectDistanceRange, kTIFF_ShortType, 1, kExport_InjectOnly, kXMP_NS_EXIF, "SubjectDistanceRange" }, - { 0xFFFF, 0, 0, 0 } // ! Must end with sentinel. + { 0xFFFF, 0, 0, 0, 0, nullptr } // ! Must end with sentinel. }; static const TIFF_MappingToXMP sGPSInfoIFDMappings[] = { @@ -206,7 +206,7 @@ static const TIFF_MappingToXMP sGPSInfoIFDMappings[] = { { /* 28 */ kTIFF_GPSAreaInformation, kTIFF_UndefinedType, kAnyCount, kExport_InjectOnly, "", "" }, // ! Has a special mapping. { /* 30 */ kTIFF_GPSDifferential, kTIFF_ShortType, 1, kExport_InjectOnly, kXMP_NS_EXIF, "GPSDifferential" }, { /* 31 */ kTIFF_GPSHPositioningError, kTIFF_RationalType, 1, kExport_InjectOnly, kXMP_NS_ExifEX, "GPSHPositioningError" }, - { 0xFFFF, 0, 0, 0 } // ! Must end with sentinel. + { 0xFFFF, 0, 0, 0, 0, nullptr } // ! Must end with sentinel. }; // ================================================================================================= diff --git a/XMPFiles/source/FormatSupport/WAVE/WAVEReconcile.cpp b/XMPFiles/source/FormatSupport/WAVE/WAVEReconcile.cpp index a2f23e9..38f1812 100644 --- a/XMPFiles/source/FormatSupport/WAVE/WAVEReconcile.cpp +++ b/XMPFiles/source/FormatSupport/WAVE/WAVEReconcile.cpp @@ -57,7 +57,7 @@ static const MetadataPropertyInfo kBextProperties[] = { kXMP_NS_BWF, kBWF_version, BEXTMetadata::kVersion, kNativeType_Uns16, kXMPType_Simple, false, false, kExport_Never }, // bext:version <-> BEXT:version // special case: bext:umid <-> BEXT:UMID { kXMP_NS_BWF, kBWF_codingHistory, BEXTMetadata::kCodingHistory, kNativeType_StrLocal, kXMPType_Simple, false, false, kExport_Always }, // bext:codingHistory <-> BEXT:codingHistory - { NULL } + { NULL, nullptr, 0, kNativeType_Str, kXMPType_Simple, false, false, kExport_Never } }; static const char * kDM_shotNumber = "shotNumber"; @@ -102,7 +102,7 @@ static const MetadataPropertyInfo kiXMLProperties[] = // special case for startTimeCode // xmpDM:startTimecode <-> iXML:TIMECODE_RATE, iXML:TIMECODE_FLAG and bext:timeReference. { kXMP_NS_BWF, kBWF_timeStampSampleRate, iXMLMetadata::kTimeStampSampleRate, kNativeType_Uns64, kXMPType_Simple, false, false, kExport_NoDelete }, // bext::timeStampSampleRate <-> iXML // special case for TRACK_LIST // ixml:Track_List <-> ixml:trackList - { NULL } + { NULL, nullptr, 0, kNativeType_Str, kXMPType_Simple, false, false, kExport_Never } }; static const MetadataPropertyInfo kINFOProperties[] = @@ -129,7 +129,7 @@ static const MetadataPropertyInfo kINFOProperties[] = { kXMP_NS_RIFFINFO, "source", INFOMetadata::kSource, kNativeType_StrUTF8, kXMPType_Simple, true, false, kExport_Always }, // riffinfo:source <-> ISRC { kXMP_NS_RIFFINFO, "technician", INFOMetadata::kTechnican, kNativeType_StrUTF8, kXMPType_Simple, true, false, kExport_Always }, // riffinfo:technician <-> ITCH - { NULL } + { NULL, nullptr, 0, kNativeType_Str, kXMPType_Simple, false, false, kExport_Never } }; static const MetadataPropertyInfo kDISPProperties[] = @@ -137,7 +137,7 @@ static const MetadataPropertyInfo kDISPProperties[] = // XMP NS XMP Property Name Native Metadata Identifier Datatype Datatype Delete Priority ExportPolicy { kXMP_NS_DC, "title", DISPMetadata::kTitle, kNativeType_StrUTF8, kXMPType_Localized, false, true, kExport_Always }, // dc:title <-> DISP // Special case: DISP will overwrite LIST/INFO:INAM in dc:title if existing - { NULL } + { NULL, nullptr, 0, kNativeType_Str, kXMPType_Simple, false, false, kExport_Never } }; static const MetadataPropertyInfo kCartProperties[] = @@ -162,7 +162,7 @@ static const MetadataPropertyInfo kCartProperties[] = { kXMP_NS_AEScart, "TagText", CartMetadata::kTagText, kNativeType_StrLocal, kXMPType_Simple, true, false, kExport_Always }, { kXMP_NS_AEScart, "LevelReference", CartMetadata::kLevelReference, kNativeType_Int32, kXMPType_Simple, true, false, kExport_Always }, // Special case Post Timer - { NULL } + { NULL, nullptr, 0, kNativeType_Str, kXMPType_Simple, false, false, kExport_Never } }; // cr8r is not yet required for WAVE diff --git a/configure.ac b/configure.ac index 681bc28..acd5c18 100644 --- a/configure.ac +++ b/configure.ac @@ -246,6 +246,7 @@ dnl -Wformat-nonliteral \ -Wlogical-not-parentheses \ -Werror=misleading-indentation \ -Wmissing-noreturn \ + -Werror=missing-field-initializers \ -Woverloaded-virtual \ -Wpointer-arith \ dnl -Wredundant-decls \ |