Project

General

Profile

Feature #1040 » mwg-kw.patch

Alan Pater, 12 Mar 2015 20:40

View differences:

src/properties.cpp (working copy)
96 96
    extern const XmpPropertyInfo xmpMicrosoftPhotoRegionInfoInfo[];
97 97
    extern const XmpPropertyInfo xmpMicrosoftPhotoRegionInfo[];
98 98
    extern const XmpPropertyInfo xmpMWGRegionsInfo[];
99
    extern const XmpPropertyInfo xmpMWGKeywordInfo[];
99 100
    extern const XmpPropertyInfo xmpVideoInfo[];
100 101
    extern const XmpPropertyInfo xmpAudioInfo[];
101 102
    extern const XmpPropertyInfo xmpDwCInfo[];
......
130 131
        { "http://ns.microsoft.com/photo/1.2/",              "MP",    xmpMicrosoftPhotoInfo,           N_("Microsoft Photo 1.2 schema")       },
131 132
        { "http://ns.microsoft.com/photo/1.2/t/RegionInfo#", "MPRI",  xmpMicrosoftPhotoRegionInfoInfo, N_("Microsoft Photo RegionInfo schema")},
132 133
        { "http://ns.microsoft.com/photo/1.2/t/Region#",     "MPReg", xmpMicrosoftPhotoRegionInfo,     N_("Microsoft Photo Region schema")    },
133
        { "http://www.metadataworkinggroup.com/schemas/regions/", "mwg-rs", xmpMWGRegionsInfo,N_("Metadata Working Group Regions schema")     },
134
        { "http://www.metadataworkinggroup.com/schemas/regions/",  "mwg-rs", xmpMWGRegionsInfo, N_("Metadata Working Group Regions schema")   },
135
        { "http://www.metadataworkinggroup.com/schemas/keywords/", "mwg-kw", xmpMWGKeywordInfo, N_("Metadata Working Group Keywords schema")  },
134 136
        { "http://www.video",                                  "video",          xmpVideoInfo,     N_("XMP Extended Video schema")            },
135 137
        { "http://www.audio",                                  "audio",          xmpAudioInfo,     N_("XMP Extended Audio schema")            },
136 138
        { "http://rs.tdwg.org/dwc/index.htm",                     "dwc",            xmpDwCInfo,       N_("XMP Darwin Core schema")     		  },
......
1003 1005
        { 0, 0, 0, invalidTypeId, xmpInternal, 0 }
1004 1006
    };
1005 1007

  
1008
    extern const XmpPropertyInfo xmpMWGKeywordInfo[] = {
1009
        { "Keywords",       N_("Keywords"),     "KeywordInfo",          xmpText, xmpInternal,   N_("Main structure containing keyword based information")   },
1010
        { "Hierarchy",      N_("Hierarchy"),    "bag KeywordStruct",    xmpBag,  xmpExternal,   N_("List of root keyword structures")   },
1011
        { "Keyword",        N_("Keyword"),      "Text",                 xmpText, xmpExternal,   N_("Name of keyword (-node)")   },
1012
        { "Applied",        N_("Applied"),      "Boolean",              xmpText, xmpExternal,   N_("True if this keyword has been applied, False otherwise. If missing, mwg-kw:Applied is presumed True for leaf nodes and False for ancestor nodes")   },
1013
        { "Children",       N_("Children"),     "bag KeywordStruct",    xmpBag,  xmpExternal,   N_("List of children keyword structures")   },
1014

  
1015
        // End of list marker
1016
        { 0, 0, 0, invalidTypeId, xmpInternal, 0 }
1017
    };
1018

  
1019

  
1006 1020
    extern const XmpPropertyInfo xmpVideoInfo[] = {
1007 1021
        { "Album",                  N_("Album"),                            "Text",                     xmpText, xmpExternal, N_("The name of the album.")   },
1008 1022
        { "ArchivalLocation",       N_("Archival Location"),                "Text",                     xmpText, xmpExternal, N_("Information about the Archival Location.")   },
src/xmp.cpp (working copy)
416 416
            SXMPMeta::RegisterNamespace("http://ns.microsoft.com/photo/1.2/t/RegionInfo#", "MPRI");
417 417
            SXMPMeta::RegisterNamespace("http://ns.microsoft.com/photo/1.2/t/Region#", "MPReg");
418 418
            SXMPMeta::RegisterNamespace("http://www.metadataworkinggroup.com/schemas/regions/", "mwg-rs");
419
	        SXMPMeta::RegisterNamespace("http://www.metadataworkinggroup.com/schemas/keywords/", "mwg-kw");
419 420
            SXMPMeta::RegisterNamespace("http://ns.adobe.com/xmp/sType/Area#", "stArea");
421
            
420 422
#else
421 423
            initialized_ = true;
422 424
#endif
(1-1/2)