exiv2.diff

Proposed patch to add Microsoft Photo 1.2 Schema - Leif Huhn, 13 Jul 2011 15:09

Download (3.7 KB)

View differences:

exiv2-0.21.1-mp/src/properties.cpp 2011-07-13 21:34:27.399696666 +0000
91 91
    extern const XmpPropertyInfo xmpPlusInfo[];
92 92
    extern const XmpPropertyInfo xmpMediaProInfo[];
93 93
    extern const XmpPropertyInfo xmpExpressionMediaInfo[];
94
    extern const XmpPropertyInfo xmpMPRegionInfo[];
95
    extern const XmpPropertyInfo xmpMPRegions[];
94 96

  
95 97
    extern const XmpNsInfo xmpNsInfo[] = {
96 98
        // Schemas   -   NOTE: Schemas which the XMP-SDK doesn't know must be registered in XmpParser::initialize - Todo: Automate this
......
117 119
        { "http://ns.useplus.org/ldf/xmp/1.0/",           "plus",           xmpPlusInfo,      N_("PLUS License Data Format schema")           },
118 120
        { "http://ns.iview-multimedia.com/mediapro/1.0/", "mediapro",       xmpMediaProInfo,  N_("iView Media Pro schema")                    },
119 121
        { "http://ns.microsoft.com/expressionmedia/1.0/", "expressionmedia",xmpExpressionMediaInfo, N_("Expression Media schema")             },
122
        { "http://ns.microsoft.com/photo/1.2/",           "MP",             0,                N_("Microsoft MP schema")                       },
123
        { "http://ns.microsoft.com/photo/1.2/t/RegionInfo#","MPRI",         xmpMPRegionInfo,  N_("MP Region Info") },
124
        { "http://ns.microsoft.com/photo/1.2/t/Region#",  "MPReg",          xmpMPRegions,     N_("MP Regions") },
120 125

  
121 126
        // Structures
122 127
        { "http://ns.adobe.com/xap/1.0/g/",                   "xapG",    0, N_("Colorant structure")           },
......
935 940
        // End of list marker
936 941
        { 0, 0, 0, invalidTypeId, xmpInternal, 0 }
937 942
    };
943

  
944
    extern const XmpPropertyInfo xmpMPRegionInfo[] = {
945
        // End of list marker
946
        { "MPRI:Regions",      N_("MPRI:Regions"),      "Text", xmpBag,  xmpExternal, N_("Bag of MPReg") },
947
        { "DateRegionsValid",  N_("DateRegionsValid"),  "Text", xmpText, xmpExternal, N_("Date the last rectangle was created") },
948
        { 0, 0, 0, invalidTypeId, xmpInternal, 0 }
949
    };
950

  
951
    extern const XmpPropertyInfo xmpMPRegions[] = {
952
        { "PersonDisplayName", N_("PersonDisplayName"), "Text", xmpText, xmpExternal, N_("Name") },
953
        { "Rectangle",         N_("Rectangle"),         "Text", xmpText, xmpExternal, N_("Face rectangle in the format X.XX Y.YY W.WW H.HH") },
954
        { "PersonEmailDigest", N_("PersonEmailDigest"), "Text", xmpText, xmpExternal, N_("SHA-1 digest of person's email") },
955
        { "PersonLiveCID",     N_("PersonLiveCID"),     "Text", xmpText, xmpExternal, N_("Person's Windows Live CID") },
956
        // End of list marker
957
        { 0, 0, 0, invalidTypeId, xmpInternal, 0 }
958
    };
938 959

  
939 960
    extern const XmpPrintInfo xmpPrintInfo[] = {
940 961
        {"Xmp.crs.CropUnits",                 EXV_PRINT_TAG(crsCropUnits)   },
exiv2-0.21.1-mp/src/xmp.cpp 2011-07-13 20:49:40.538373001 +0000
388 388
            SXMPMeta::RegisterNamespace("http://ns.useplus.org/ldf/xmp/1.0/", "plus");
389 389
            SXMPMeta::RegisterNamespace("http://ns.iview-multimedia.com/mediapro/1.0/", "mediapro");
390 390
            SXMPMeta::RegisterNamespace("http://ns.microsoft.com/expressionmedia/1.0/", "expressionmedia");
391
            SXMPMeta::RegisterNamespace("http://ns.microsoft.com/photo/1.2/", "MP");
392
            SXMPMeta::RegisterNamespace("http://ns.microsoft.com/photo/1.2/t/RegionInfo#", "MPRI");
393
            SXMPMeta::RegisterNamespace("http://ns.microsoft.com/photo/1.2/t/Region#", "MPReg");
391 394
#else
392 395
            initialized_ = true;
393 396
#endif
Redmine Appliance - Powered by TurnKey Linux