summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTavmjong Bah <tavmjong@free.fr>2015-03-06 14:11:29 +0000
committertavmjong-free <tavmjong@free.fr>2015-03-06 14:11:29 +0000
commit77ef2ed0b37ba73bae12a602207499931a9edf13 (patch)
tree065b1257b08d15f74d915274df0af2d81cde6681 /src
parentFix for Bug #1428967 (Inkscape0.91 crashes under interface using Chinese/Taiw... (diff)
downloadinkscape-77ef2ed0b37ba73bae12a602207499931a9edf13.tar.gz
inkscape-77ef2ed0b37ba73bae12a602207499931a9edf13.zip
Fix filter primitives using 'type' attribute. (Broken when 'type' attribute introduced on meshes.)
(bzr r13969)
Diffstat (limited to 'src')
-rw-r--r--src/attributes.cpp2
-rw-r--r--src/attributes.h2
-rw-r--r--src/sp-mesh.cpp4
3 files changed, 4 insertions, 4 deletions
diff --git a/src/attributes.cpp b/src/attributes.cpp
index 3cf13d3f2..568f0528a 100644
--- a/src/attributes.cpp
+++ b/src/attributes.cpp
@@ -291,7 +291,7 @@ static SPStyleProp const props[] = {
{SP_ATTR_FY, "fy"},
/* SPMeshPatch */
{SP_ATTR_TENSOR, "tensor"},
- {SP_ATTR_MESH_TYPE, "type"},
+ //{SP_ATTR_TYPE, "type"},
/* SPPattern */
{SP_ATTR_PATTERNUNITS, "patternUnits"},
{SP_ATTR_PATTERNCONTENTUNITS, "patternContentUnits"},
diff --git a/src/attributes.h b/src/attributes.h
index 817819b69..91c8868f9 100644
--- a/src/attributes.h
+++ b/src/attributes.h
@@ -293,7 +293,7 @@ enum SPAttributeEnum {
SP_ATTR_FY,
/* SPMeshPatch */
SP_ATTR_TENSOR,
- SP_ATTR_MESH_TYPE,
+ //SP_ATTR_TYPE,
/* SPPattern */
SP_ATTR_PATTERNUNITS,
SP_ATTR_PATTERNCONTENTUNITS,
diff --git a/src/sp-mesh.cpp b/src/sp-mesh.cpp
index 0b1eb4509..e04c29e8e 100644
--- a/src/sp-mesh.cpp
+++ b/src/sp-mesh.cpp
@@ -48,14 +48,14 @@ void SPMesh::set(unsigned key, gchar const *value) {
this->requestModified(SP_OBJECT_MODIFIED_FLAG);
break;
- case SP_ATTR_MESH_TYPE:
+ case SP_ATTR_TYPE:
if (value) {
if (!strcmp(value, "coons")) {
this->type = SP_MESH_TYPE_COONS;
} else if (!strcmp(value, "bicubic")) {
this->type = SP_MESH_TYPE_BICUBIC;
} else {
- std::cout << "SPMesh::set(): invalid value " << value << std::endl;
+ std::cerr << "SPMesh::set(): invalid value " << value << std::endl;
}
this->type_set = TRUE;
} else {