Project

General

Profile

Patch #798 ยป RegionTagging.diff

Benjamin H., 11 Jan 2012 04:09

View differences:

trunk/src/properties.cpp (Arbeitskopie)
91 91
    extern const XmpPropertyInfo xmpPlusInfo[];
92 92
    extern const XmpPropertyInfo xmpMediaProInfo[];
93 93
    extern const XmpPropertyInfo xmpExpressionMediaInfo[];
94
    extern const XmpPropertyInfo xmpMicrosoftPhotoInfo[];
95
    extern const XmpPropertyInfo xmpMicrosoftPhotoRegionInfoInfo[];
96
    extern const XmpPropertyInfo xmpMicrosoftPhotoRegionInfo[];
97
    extern const XmpPropertyInfo xmpMWGRegionsInfo[];
94 98

  
95 99
    extern const XmpNsInfo xmpNsInfo[] = {
96 100
        // Schemas   -   NOTE: Schemas which the XMP-SDK doesn't know must be registered in XmpParser::initialize - Todo: Automate this
......
117 121
        { "http://ns.useplus.org/ldf/xmp/1.0/",           "plus",           xmpPlusInfo,      N_("PLUS License Data Format schema")           },
118 122
        { "http://ns.iview-multimedia.com/mediapro/1.0/", "mediapro",       xmpMediaProInfo,  N_("iView Media Pro schema")                    },
119 123
        { "http://ns.microsoft.com/expressionmedia/1.0/", "expressionmedia",xmpExpressionMediaInfo, N_("Expression Media schema")             },
124
        { "http://ns.microsoft.com/photo/1.2/",              "MP",    xmpMicrosoftPhotoInfo,           N_("Microsoft Photo 1.2 schema")       },
125
        { "http://ns.microsoft.com/photo/1.2/t/RegionInfo#", "MPRI",  xmpMicrosoftPhotoRegionInfoInfo, N_("Microsoft Photo RegionInfo schema")},
126
        { "http://ns.microsoft.com/photo/1.2/t/Region#",     "MPReg", xmpMicrosoftPhotoRegionInfo,     N_("Microsoft Photo Region schema")    },
127
        { "http://www.metadataworkinggroup.com/schemas/regions/", "mwg-rs", xmpMWGRegionsInfo,N_("Metadata Working Group Regions schema")     },
120 128

  
121 129
        // Structures
122 130
        { "http://ns.adobe.com/xap/1.0/g/",                   "xapG",    0, N_("Colorant structure")           },
......
127 135
        { "http://ns.adobe.com/xap/1.0/sType/ResourceRef#",   "stRef",   0, N_("ResourceRef structure")        },
128 136
        { "http://ns.adobe.com/xap/1.0/sType/Version#",       "stVer",   0, N_("Version structure")            },
129 137
        { "http://ns.adobe.com/xap/1.0/sType/Job#",           "stJob",   0, N_("Basic Job/Workflow structure") },
138
        { "http://ns.adobe.com/xmp/sType/Area#",              "stArea",  0, N_("Area structure")               },
130 139

  
131 140
        // Qualifiers
132 141
        { "http://ns.adobe.com/xmp/Identifier/qual/1.0/", "xmpidq", 0, N_("Qualifier for xmp:Identifier") }
......
937 946
        { 0, 0, 0, invalidTypeId, xmpInternal, 0 }
938 947
    };
939 948

  
949
    extern const XmpPropertyInfo xmpMicrosoftPhotoInfo[] = {
950
        { "RegionInfo", N_("RegionInfo"), "RegionInfo", xmpText, xmpInternal, N_("Microsoft Photo people-tagging metadata root") },
951
        // End of list marker
952
        { 0, 0, 0, invalidTypeId, xmpInternal, 0 }
953
    };
954

  
955
    extern const XmpPropertyInfo xmpMicrosoftPhotoRegionInfoInfo[] = {
956
        { "DateRegionsValid", N_("DateRegionsValid"), "Date",       xmpText, xmpExternal, N_("Date the last region was created")  },
957
        { "Regions",          N_("Regions"),          "bag Region", xmpBag,  xmpExternal, N_("Contains Regions/person tags") },
958
        // End of list marker
959
        { 0, 0, 0, invalidTypeId, xmpInternal, 0 }
960
    };
961

  
962
    extern const XmpPropertyInfo xmpMicrosoftPhotoRegionInfo[] = {
963
        { "PersonDisplayName", N_("PersonDisplayName"), "Text", xmpText, xmpExternal, N_("Name of the person (in the given rectangle)")                               },
964
        { "Rectangle",         N_("Rectangle"),         "Text", xmpText, xmpExternal, N_("Rectangle that identifies the person within the photo")                     },
965
        { "PersonEmailDigest", N_("PersonEmailDigest"), "Text", xmpText, xmpExternal, N_("SHA-1 encrypted message hash of the person's Windows Live e-mail address"), },
966
        { "PersonLiveCID",     N_("PersonLiveCID"),     "Text", xmpText, xmpExternal, N_("Signed decimal representation of the person's Windows Live CID")            },
967
        // End of list marker
968
        { 0, 0, 0, invalidTypeId, xmpInternal, 0 }
969
    };
970

  
971
    extern const XmpPropertyInfo xmpMWGRegionsInfo[] = {
972
        { "Regions",             N_("Regions"),             "RegionInfo",       xmpText, xmpInternal,        N_("Main structure containing region based information")   },
973
        { "AppliedToDimensions", N_("AppliedToDimensions"), "Dimensions",       xmpText, xmpExternal,        N_("Width and height of image when storing region data")   },
974
        { "RegionList",          N_("RegionList"),          "bag RegionStruct", xmpBag,  xmpExternal,        N_("List of Region structures")                            },
975
        { "Area",                N_("Area"),                "Area",             xmpText, xmpExternal,        N_("Descriptive markers of catalog items by content")      },
976
        { "Type",                N_("Type"),                "closed Choice of Text", xmpText, xmpExternal,   N_("Type purpose of region (Face|Pet|Focus|BarCode)")      },
977
        { "Name",                N_("Name"),                "Text",             xmpText, xmpExternal,        N_("Name/ short description of content in image region")   },
978
        { "Description",         N_("Description"),         "Text",             xmpText, xmpExternal,        N_("Usage scenario for a given focus area (EvaluatedUsed|EvaluatedNotUsed|NotEvaluatedNotUsed)") },
979
        { "FocusUsage",          N_("FocusUsage"),          "closed Choice of Text", xmpText, xmpExternal,   N_("Descriptive markers of catalog items by content")      },
980
        { "BarCodeValue",        N_("BarCodeValue"),        "Text",             xmpText, xmpExternal,        N_("Decoded BarCode value string")                         },
981
        { "Extensions",          N_("Extensions"),          "Text",             undefined, xmpInternal, N_("Any top level XMP property to describe the region content") },
982
        // End of list marker
983
        { 0, 0, 0, invalidTypeId, xmpInternal, 0 }
984
    };
985

  
940 986
    extern const XmpPrintInfo xmpPrintInfo[] = {
941 987
        {"Xmp.crs.CropUnits",                 EXV_PRINT_TAG(crsCropUnits)   },
942 988
        {"Xmp.exif.ApertureValue",            print0x9202                   },
trunk/src/xmp.cpp (Arbeitskopie)
410 410
            SXMPMeta::RegisterNamespace("http://ns.useplus.org/ldf/xmp/1.0/", "plus");
411 411
            SXMPMeta::RegisterNamespace("http://ns.iview-multimedia.com/mediapro/1.0/", "mediapro");
412 412
            SXMPMeta::RegisterNamespace("http://ns.microsoft.com/expressionmedia/1.0/", "expressionmedia");
413
            SXMPMeta::RegisterNamespace("http://ns.microsoft.com/photo/1.2/", "MP");
414
            SXMPMeta::RegisterNamespace("http://ns.microsoft.com/photo/1.2/t/RegionInfo#", "MPRI");
415
            SXMPMeta::RegisterNamespace("http://ns.microsoft.com/photo/1.2/t/Region#", "MPReg");
416
            SXMPMeta::RegisterNamespace("http://www.metadataworkinggroup.com/schemas/regions/", "mwg-rs");
417
            SXMPMeta::RegisterNamespace("http://ns.adobe.com/xmp/sType/Area#", "stArea");
413 418
#else
414 419
            initialized_ = true;
415 420
#endif
trunk/src/doxygen.hpp.in (Arbeitskopie)
78 78
  - <a href="tags-xmp-MicrosoftPhoto.html">MicrosoftPhoto schema</a>
79 79
  - <a href="tags-xmp-mediapro.html">iView Media Pro schema</a>
80 80
  - <a href="tags-xmp-expressionmedia.html">Microsoft Expression Media schema</a>
81
  - <a href="tags-xmp-MP.html">Microsoft Photo 1.2 schema</a>
82
  - <a href="tags-xmp-MPRI.html">Microsoft Photo RegionInfo schema</a>
83
  - <a href="tags-xmp-MPReg.html">Microsoft Photo Region schema</a>
84
  - <a href="tags-xmp-mwg-rs.html">Metadata Working Group Regions schema</a>
81 85

  
82 86
  @section formats File Formats
83 87

  
trunk/doc/ChangeLog (Arbeitskopie)
6 6
	         - Added version hex number to the output of "exiv2 -V".
7 7

  
8 8
* Exiv2 library
9
        - 0000798: Added people/photo region tagging schemas
10
	           MS Photo 1.2 RegionInfo and MWG Regions
11
		   (Benjamin Henne)
9 12
	- 0000785: Exif version 2.3 missing tag codes. (Patch by Jens Mueller)
10 13
	- 0000782: Tamron 18-270mm lens. (Patch by Jens Mueller)
11 14
	- 0000781: Exif 2.3 & DNG 1.2/1.3 tags. (Patch by Jens Mueller)
trunk/doc/templates/Makefile (Arbeitskopie)
130 130
         xmp_iptcExt \
131 131
         xmp_plus \
132 132
         xmp_mediapro \
133
         xmp_expressionmedia
133
         xmp_expressionmedia \
134
         xmp_MP \
135
         xmp_MPRI \
136
         xmp_MPReg \
137
         xmp_mwg-rs
134 138

  
135 139
TAGLIST = ../../src/taglist
136 140

  
trunk/doc/templates/__index2__ (Arbeitskopie)
43 43
    <li><a href="tags-xmp-MicrosoftPhoto.html"><span>MicrosoftPhoto</span></a></li>
44 44
    <li><a href="tags-xmp-mediapro.html"><span>mediapro</span></a></li>
45 45
    <li><a href="tags-xmp-expressionmedia.html"><span>expressionmedia</span></a></li>
46
    <li><a href="tags-xmp-MP.html"><span>MP</span></a></li>
47
    <li><a href="tags-xmp-MPRI.html"><span>MPRI</span></a></li>
48
    <li><a href="tags-xmp-MPReg.html"><span>MPReg</span></a></li>
49
    <li><a href="tags-xmp-mwg-rs.html"><span>mwg-rs</span></a></li>
46 50
  </ul>
47 51
</div>
48 52

  
    (1-1/1)