From d57824529dd42757b4f6e51348ac692c86ad6d7d Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Mon, 21 Oct 2013 13:06:31 +0200 Subject: Fix bug introduced in r12686. Fixed bugs: - https://launchpad.net/bugs/1241034 (bzr r12702) --- src/sp-object.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'src/sp-object.cpp') diff --git a/src/sp-object.cpp b/src/sp-object.cpp index 8c54caf48..2408370cf 100644 --- a/src/sp-object.cpp +++ b/src/sp-object.cpp @@ -648,11 +648,6 @@ void SPObject::build(SPDocument *document, Inkscape::XML::Node *repr) { try { const std::string typeString = NodeTraits::get_type_string(*rchild); - // special cases - if (typeString.empty()) continue; // comments, usually - if (typeString == "rdf:RDF") continue; // no SP node yet - if (typeString == "inkscape:clipboard") continue; // SP node not necessary - SPObject* child = SPFactory::instance().createObject(typeString); object->attach(child, object->lastChild()); @@ -663,7 +658,7 @@ void SPObject::build(SPDocument *document, Inkscape::XML::Node *repr) { // corresponding classes in the SPObject tree. // (rdf:RDF, inkscape:clipboard, ...) // Thus, simply ignore this case for now. - return; + continue; } } } -- cgit v1.2.3 From 30c97ab939c645122e04862550a87838f79f634e Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sat, 26 Oct 2013 14:13:37 +0200 Subject: Fix memleak in reference counting introduced in r12532. Fixed bugs: - https://launchpad.net/bugs/1236632 (bzr r12727) --- src/sp-object.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/sp-object.cpp') diff --git a/src/sp-object.cpp b/src/sp-object.cpp index 2408370cf..e5f119ee0 100644 --- a/src/sp-object.cpp +++ b/src/sp-object.cpp @@ -228,7 +228,7 @@ SPObject *sp_object_unref(SPObject *object, SPObject *owner) //g_object_unref(G_OBJECT(object)); object->refCount--; - if (object->refCount < 0) { + if (object->refCount <= 0) { delete object; } -- cgit v1.2.3