summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Moulder <peter.moulder@monash.edu>2008-04-24 03:05:56 +0000
committerpjrm <pjrm@users.sourceforge.net>2008-04-24 03:05:56 +0000
commitbbd8acef4e03cb5361d0bca31ad0bfb91490f85f (patch)
treeecfb9c0017f7e6e954e588290a782bf0fc0a61aa
parentFurther cleanup. Minidom superseded by pedrodom. (diff)
downloadinkscape-bbd8acef4e03cb5361d0bca31ad0bfb91490f85f.tar.gz
inkscape-bbd8acef4e03cb5361d0bca31ad0bfb91490f85f.zip
fix a couple of g++-4.3 compile errors.
(bzr r5503)
-rw-r--r--src/live_effects/lpe-test-doEffect-stack.cpp2
-rw-r--r--src/sp-lpe-item.cpp3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/live_effects/lpe-test-doEffect-stack.cpp b/src/live_effects/lpe-test-doEffect-stack.cpp
index cafe693b7..3aa143632 100644
--- a/src/live_effects/lpe-test-doEffect-stack.cpp
+++ b/src/live_effects/lpe-test-doEffect-stack.cpp
@@ -11,6 +11,8 @@
#include <2geom/piecewise.h>
#include <vector>
#include <libnr/n-art-bpath.h>
+#include <cstring>
+using std::memcpy;
namespace Inkscape {
namespace LivePathEffect {
diff --git a/src/sp-lpe-item.cpp b/src/sp-lpe-item.cpp
index 78055eb9c..eaf92704c 100644
--- a/src/sp-lpe-item.cpp
+++ b/src/sp-lpe-item.cpp
@@ -23,6 +23,7 @@
#include "sp-path.h"
#include "sp-item-group.h"
+#include "streq.h"
#include "macros.h"
#include "attributes.h"
#include "sp-lpe-item.h"
@@ -159,7 +160,7 @@ sp_lpe_item_set(SPObject *object, unsigned int key, gchar const *value)
switch (key) {
case SP_ATTR_INKSCAPE_PATH_EFFECT:
if ( value && lpeitem->path_effect_ref->lpeobject_href
- && ( strcmp(value, lpeitem->path_effect_ref->lpeobject_href) == 0 ) ) {
+ && streq(value, lpeitem->path_effect_ref->lpeobject_href) ) {
/* No change, do nothing. */
} else {
if (value) {