From be6575c39673b06bd51215e47fea86de5f1ee746 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Tue, 2 Apr 2013 21:29:05 +0200 Subject: Replaced some forgotten old casting macros. All object files are first compiled into a static library and then Inkscape and Inkview are linked against this library. Thus the linker omits some global function calls that are necessary for class registration. This intermediate step was removed so that both executables are directly linked against all object files. (bzr r11608.1.71) --- src/sp-object-repr.cpp | 156 ++++++++++++++++++++++++------------------------- 1 file changed, 78 insertions(+), 78 deletions(-) (limited to 'src/sp-object-repr.cpp') diff --git a/src/sp-object-repr.cpp b/src/sp-object-repr.cpp index c3d60c5e8..1b6eb87a6 100644 --- a/src/sp-object-repr.cpp +++ b/src/sp-object-repr.cpp @@ -135,84 +135,84 @@ populate_dtables() { struct NameTypeEntry { char const *const name; GType const type_id; }; NameTypeEntry const repr_name_entries[] = { - { "svg:a", SP_TYPE_ANCHOR }, - //{ "svg:animate", SP_TYPE_ANIMATE }, - { "svg:circle", SP_TYPE_CIRCLE }, - { "svg:color-profile", COLORPROFILE_TYPE }, - { "svg:clipPath", SP_TYPE_CLIPPATH }, - { "svg:defs", SP_TYPE_DEFS }, - { "svg:desc", SP_TYPE_DESC }, - { "svg:ellipse", SP_TYPE_ELLIPSE }, - { "svg:filter", SP_TYPE_FILTER }, - /* Note: flow* elements are proposed additions for SVG 1.2, they aren't in - SVG 1.1. */ - { "svg:flowDiv", SP_TYPE_FLOWDIV }, - { "svg:flowLine", SP_TYPE_FLOWLINE }, - { "svg:flowPara", SP_TYPE_FLOWPARA }, - { "svg:flowRegion", SP_TYPE_FLOWREGION }, - { "svg:flowRegionBreak", SP_TYPE_FLOWREGIONBREAK }, - { "svg:flowRegionExclude", SP_TYPE_FLOWREGIONEXCLUDE }, - { "svg:flowRoot", SP_TYPE_FLOWTEXT }, - { "svg:flowSpan", SP_TYPE_FLOWTSPAN }, - { "svg:font", SP_TYPE_FONT }, - { "svg:font-face", SP_TYPE_FONTFACE }, - { "svg:glyph", SP_TYPE_GLYPH }, - { "svg:missing-glyph", SP_TYPE_MISSING_GLYPH }, - { "svg:hkern", SP_TYPE_HKERN }, - { "svg:vkern", SP_TYPE_VKERN }, - { "svg:g", SP_TYPE_GROUP }, - { "svg:feBlend", SP_TYPE_FEBLEND }, - { "svg:feColorMatrix", SP_TYPE_FECOLORMATRIX }, - { "svg:feComponentTransfer", SP_TYPE_FECOMPONENTTRANSFER }, - { "svg:feComposite", SP_TYPE_FECOMPOSITE }, - { "svg:feConvolveMatrix", SP_TYPE_FECONVOLVEMATRIX }, - { "svg:feDiffuseLighting", SP_TYPE_FEDIFFUSELIGHTING }, - { "svg:feDistantLight", SP_TYPE_FEDISTANTLIGHT }, - { "svg:feDisplacementMap", SP_TYPE_FEDISPLACEMENTMAP }, - { "svg:feFlood", SP_TYPE_FEFLOOD }, - { "svg:feFuncR", SP_TYPE_FEFUNCR }, - { "svg:feFuncG", SP_TYPE_FEFUNCG }, - { "svg:feFuncB", SP_TYPE_FEFUNCB }, - { "svg:feFuncA", SP_TYPE_FEFUNCA }, - { "svg:feGaussianBlur", SP_TYPE_GAUSSIANBLUR }, - { "svg:feImage", SP_TYPE_FEIMAGE }, - { "svg:feMerge", SP_TYPE_FEMERGE }, - { "svg:feMorphology", SP_TYPE_FEMORPHOLOGY }, - { "svg:feOffset", SP_TYPE_FEOFFSET }, - { "svg:fePointLight", SP_TYPE_FEPOINTLIGHT }, - { "svg:feSpecularLighting", SP_TYPE_FESPECULARLIGHTING }, - { "svg:feSpotLight", SP_TYPE_FESPOTLIGHT }, - { "svg:feTile", SP_TYPE_FETILE }, - { "svg:feTurbulence", SP_TYPE_FETURBULENCE }, - { "svg:feMergeNode", SP_TYPE_FEMERGENODE }, - { "svg:image", SP_TYPE_IMAGE }, - { "svg:line", SP_TYPE_LINE }, - { "svg:linearGradient", SP_TYPE_LINEARGRADIENT }, - { "svg:marker", SP_TYPE_MARKER }, - { "svg:mask", SP_TYPE_MASK }, - { "svg:meshGradient", SP_TYPE_MESHGRADIENT }, - { "svg:meshRow", SP_TYPE_MESHROW }, - { "svg:meshPatch", SP_TYPE_MESHPATCH }, - { "svg:metadata", SP_TYPE_METADATA }, - { "svg:path", SP_TYPE_PATH }, - { "svg:pattern", SP_TYPE_PATTERN }, - { "svg:polygon", SP_TYPE_POLYGON }, - { "svg:polyline", SP_TYPE_POLYLINE }, - { "svg:radialGradient", SP_TYPE_RADIALGRADIENT }, - { "svg:rect", SP_TYPE_RECT }, - { "svg:stop", SP_TYPE_STOP }, - { "svg:script", SP_TYPE_SCRIPT }, - { "svg:svg", SP_TYPE_ROOT }, - { "svg:style", SP_TYPE_STYLE_ELEM }, - { "svg:switch", SP_TYPE_SWITCH }, - { "svg:symbol", SP_TYPE_SYMBOL }, - { "svg:text", SP_TYPE_TEXT }, - { "svg:textPath", SP_TYPE_TEXTPATH }, - { "svg:title", SP_TYPE_TITLE }, - { "svg:tref", SP_TYPE_TREF }, - { "svg:tspan", SP_TYPE_TSPAN }, - { "svg:use", SP_TYPE_USE }, - { "inkscape:path-effect", TYPE_LIVEPATHEFFECT } +// { "svg:a", SP_TYPE_ANCHOR }, +// //{ "svg:animate", SP_TYPE_ANIMATE }, +// { "svg:circle", SP_TYPE_CIRCLE }, +// { "svg:color-profile", COLORPROFILE_TYPE }, +// { "svg:clipPath", SP_TYPE_CLIPPATH }, +// { "svg:defs", SP_TYPE_DEFS }, +// { "svg:desc", SP_TYPE_DESC }, +// { "svg:ellipse", SP_TYPE_ELLIPSE }, +// { "svg:filter", SP_TYPE_FILTER }, +// /* Note: flow* elements are proposed additions for SVG 1.2, they aren't in +// SVG 1.1. */ +// { "svg:flowDiv", SP_TYPE_FLOWDIV }, +// { "svg:flowLine", SP_TYPE_FLOWLINE }, +// { "svg:flowPara", SP_TYPE_FLOWPARA }, +// { "svg:flowRegion", SP_TYPE_FLOWREGION }, +// { "svg:flowRegionBreak", SP_TYPE_FLOWREGIONBREAK }, +// { "svg:flowRegionExclude", SP_TYPE_FLOWREGIONEXCLUDE }, +// { "svg:flowRoot", SP_TYPE_FLOWTEXT }, +// { "svg:flowSpan", SP_TYPE_FLOWTSPAN }, +// { "svg:font", SP_TYPE_FONT }, +// { "svg:font-face", SP_TYPE_FONTFACE }, +// { "svg:glyph", SP_TYPE_GLYPH }, +// { "svg:missing-glyph", SP_TYPE_MISSING_GLYPH }, +// { "svg:hkern", SP_TYPE_HKERN }, +// { "svg:vkern", SP_TYPE_VKERN }, +// { "svg:g", SP_TYPE_GROUP }, +// { "svg:feBlend", SP_TYPE_FEBLEND }, +// { "svg:feColorMatrix", SP_TYPE_FECOLORMATRIX }, +// { "svg:feComponentTransfer", SP_TYPE_FECOMPONENTTRANSFER }, +// { "svg:feComposite", SP_TYPE_FECOMPOSITE }, +// { "svg:feConvolveMatrix", SP_TYPE_FECONVOLVEMATRIX }, +// { "svg:feDiffuseLighting", SP_TYPE_FEDIFFUSELIGHTING }, +// { "svg:feDistantLight", SP_TYPE_FEDISTANTLIGHT }, +// { "svg:feDisplacementMap", SP_TYPE_FEDISPLACEMENTMAP }, +// { "svg:feFlood", SP_TYPE_FEFLOOD }, +// { "svg:feFuncR", SP_TYPE_FEFUNCR }, +// { "svg:feFuncG", SP_TYPE_FEFUNCG }, +// { "svg:feFuncB", SP_TYPE_FEFUNCB }, +// { "svg:feFuncA", SP_TYPE_FEFUNCA }, +// { "svg:feGaussianBlur", SP_TYPE_GAUSSIANBLUR }, +// { "svg:feImage", SP_TYPE_FEIMAGE }, +// { "svg:feMerge", SP_TYPE_FEMERGE }, +// { "svg:feMorphology", SP_TYPE_FEMORPHOLOGY }, +// { "svg:feOffset", SP_TYPE_FEOFFSET }, +// { "svg:fePointLight", SP_TYPE_FEPOINTLIGHT }, +// { "svg:feSpecularLighting", SP_TYPE_FESPECULARLIGHTING }, +// { "svg:feSpotLight", SP_TYPE_FESPOTLIGHT }, +// { "svg:feTile", SP_TYPE_FETILE }, +// { "svg:feTurbulence", SP_TYPE_FETURBULENCE }, +// { "svg:feMergeNode", SP_TYPE_FEMERGENODE }, +// { "svg:image", SP_TYPE_IMAGE }, +// { "svg:line", SP_TYPE_LINE }, +// { "svg:linearGradient", SP_TYPE_LINEARGRADIENT }, +// { "svg:marker", SP_TYPE_MARKER }, +// { "svg:mask", SP_TYPE_MASK }, +// { "svg:meshGradient", SP_TYPE_MESHGRADIENT }, +// { "svg:meshRow", SP_TYPE_MESHROW }, +// { "svg:meshPatch", SP_TYPE_MESHPATCH }, +// { "svg:metadata", SP_TYPE_METADATA }, +// { "svg:path", SP_TYPE_PATH }, +// { "svg:pattern", SP_TYPE_PATTERN }, +// { "svg:polygon", SP_TYPE_POLYGON }, +// { "svg:polyline", SP_TYPE_POLYLINE }, +// { "svg:radialGradient", SP_TYPE_RADIALGRADIENT }, +// { "svg:rect", SP_TYPE_RECT }, +// { "svg:stop", SP_TYPE_STOP }, +// { "svg:script", SP_TYPE_SCRIPT }, +// { "svg:svg", SP_TYPE_ROOT }, +// { "svg:style", SP_TYPE_STYLE_ELEM }, +// { "svg:switch", SP_TYPE_SWITCH }, +// { "svg:symbol", SP_TYPE_SYMBOL }, +// { "svg:text", SP_TYPE_TEXT }, +// { "svg:textPath", SP_TYPE_TEXTPATH }, +// { "svg:title", SP_TYPE_TITLE }, +// { "svg:tref", SP_TYPE_TREF }, +// { "svg:tspan", SP_TYPE_TSPAN }, +// { "svg:use", SP_TYPE_USE }, +// { "inkscape:path-effect", TYPE_LIVEPATHEFFECT } }; NameTypeEntry const sodipodi_name_entries[] = { { "arc", SP_TYPE_ARC }, -- cgit v1.2.3