diff --git a/src/sp-filter.cpp b/src/sp-filter.cpp
index 9d2abcddf53e341f57593cabe3b9646fcac493f6..150033895202aea50541345839874ed4431463a5 100644 (file)
--- a/src/sp-filter.cpp
+++ b/src/sp-filter.cpp
#include "sp-filter-reference.h"
#include "uri.h"
#include "xml/repr.h"
#include "sp-filter-reference.h"
#include "uri.h"
#include "xml/repr.h"
+#include <cstring>
+#include <string>
#define SP_MACROS_SILENT
#include "macros.h"
#define SP_MACROS_SILENT
#include "macros.h"
filter->primitiveUnits_set = FALSE;
filter->_renderer = NULL;
filter->primitiveUnits_set = FALSE;
filter->_renderer = NULL;
-
- filter->_image_name = map<gchar *, int, ltstr>();
+
+ filter->_image_name = new std::map<gchar *, int, ltstr>;
+ filter->_image_name->clear();
filter->filterRes = NumberOptNumber();
filter->filterRes = NumberOptNumber();
}
filter->modified_connection.~connection();
}
filter->modified_connection.~connection();
+ delete filter->_image_name;
if (((SPObjectClass *) filter_parent_class)->release)
((SPObjectClass *) filter_parent_class)->release(object);
if (((SPObjectClass *) filter_parent_class)->release)
((SPObjectClass *) filter_parent_class)->release(object);
}
break;
default:
}
break;
default:
- // See if any parents need this value.
+ // See if any parents need this value.
if (((SPObjectClass *) filter_parent_class)->set) {
((SPObjectClass *) filter_parent_class)->set(object, key, value);
}
if (((SPObjectClass *) filter_parent_class)->set) {
((SPObjectClass *) filter_parent_class)->set(object, key, value);
}
if ( SP_IS_FILTER(ref)
&& ref != filter )
{
if ( SP_IS_FILTER(ref)
&& ref != filter )
{
- filter->modified_connection =
+ filter->modified_connection =
ref->connectModified(sigc::bind(sigc::ptr_fun(&filter_ref_modified), filter));
}
ref->connectModified(sigc::bind(sigc::ptr_fun(&filter_ref_modified), filter));
}
}
static void
}
static void
-filter_ref_modified(SPObject *href, guint flags, SPFilter *filter)
+filter_ref_modified(SPObject */*href*/, guint /*flags*/, SPFilter *filter)
{
SP_OBJECT(filter)->requestModified(SP_OBJECT_MODIFIED_FLAG);
}
{
SP_OBJECT(filter)->requestModified(SP_OBJECT_MODIFIED_FLAG);
}
int sp_filter_get_image_name(SPFilter *filter, gchar const *name) {
gchar *name_copy = strdup(name);
int sp_filter_get_image_name(SPFilter *filter, gchar const *name) {
gchar *name_copy = strdup(name);
- map<gchar *, int, ltstr>::iterator result = filter->_image_name.find(name_copy);
+ map<gchar *, int, ltstr>::iterator result = filter->_image_name->find(name_copy);
free(name_copy);
free(name_copy);
- if (result == filter->_image_name.end()) return -1;
+ if (result == filter->_image_name->end()) return -1;
else return (*result).second;
}
else return (*result).second;
}
int value = filter->_image_number_next;
filter->_image_number_next++;
gchar *name_copy = strdup(name);
int value = filter->_image_number_next;
filter->_image_number_next++;
gchar *name_copy = strdup(name);
- pair<map<gchar*,int,ltstr>::iterator,bool> ret = filter->_image_name.insert(pair<gchar*,int>(name_copy, value));
+ pair<gchar*,int> new_pair(name_copy, value);
+ pair<map<gchar*,int,ltstr>::iterator,bool> ret = filter->_image_name->insert(new_pair);
if (ret.second == false) {
return (*ret.first).second;
}
if (ret.second == false) {
return (*ret.first).second;
}