summaryrefslogtreecommitdiffstats
path: root/src/filters
diff options
context:
space:
mode:
authorMarkus Engel <markus.engel@tum.de>2013-09-15 00:43:49 +0000
committerMarkus Engel <markus.engel@tum.de>2013-09-15 00:43:49 +0000
commit5cf6efefbfd06d723973b6517b442f0ee64416b7 (patch)
treeda00f2c24881267859ab46843398cb10d8fe2ff2 /src/filters
parentModified SP_IS_ macros. (diff)
downloadinkscape-5cf6efefbfd06d723973b6517b442f0ee64416b7.tar.gz
inkscape-5cf6efefbfd06d723973b6517b442f0ee64416b7.zip
Added runtime check in SP_-cast macros.
(bzr r11608.1.123)
Diffstat (limited to 'src/filters')
-rw-r--r--src/filters/blend.h2
-rw-r--r--src/filters/colormatrix.h2
-rw-r--r--src/filters/componenttransfer-funcnode.h2
-rw-r--r--src/filters/componenttransfer.h2
-rw-r--r--src/filters/composite.h2
-rw-r--r--src/filters/convolvematrix.h2
-rw-r--r--src/filters/diffuselighting.h2
-rw-r--r--src/filters/displacementmap.h2
-rw-r--r--src/filters/distantlight.h2
-rw-r--r--src/filters/flood.h2
-rw-r--r--src/filters/gaussian-blur.h2
-rw-r--r--src/filters/image.h2
-rw-r--r--src/filters/merge.h2
-rw-r--r--src/filters/mergenode.h2
-rw-r--r--src/filters/morphology.h2
-rw-r--r--src/filters/offset.h2
-rw-r--r--src/filters/pointlight.h2
-rw-r--r--src/filters/specularlighting.h2
-rw-r--r--src/filters/spotlight.h2
-rw-r--r--src/filters/tile.h2
-rw-r--r--src/filters/turbulence.h2
21 files changed, 21 insertions, 21 deletions
diff --git a/src/filters/blend.h b/src/filters/blend.h
index 779eed3e0..d5af9fe7d 100644
--- a/src/filters/blend.h
+++ b/src/filters/blend.h
@@ -16,7 +16,7 @@
#include "sp-filter-primitive.h"
#include "display/nr-filter-blend.h"
-#define SP_FEBLEND(obj) ((SPFeBlend*)obj)
+#define SP_FEBLEND(obj) (dynamic_cast<SPFeBlend*>((SPObject*)obj))
#define SP_IS_FEBLEND(obj) (dynamic_cast<const SPFeBlend*>((SPObject*)obj) != NULL)
class SPFeBlend : public SPFilterPrimitive {
diff --git a/src/filters/colormatrix.h b/src/filters/colormatrix.h
index e109bbcdd..2a1c403f1 100644
--- a/src/filters/colormatrix.h
+++ b/src/filters/colormatrix.h
@@ -15,7 +15,7 @@
#include "sp-filter-primitive.h"
#include "display/nr-filter-colormatrix.h"
-#define SP_FECOLORMATRIX(obj) ((SPFeColorMatrix*)obj)
+#define SP_FECOLORMATRIX(obj) (dynamic_cast<SPFeColorMatrix*>((SPObject*)obj))
#define SP_IS_FECOLORMATRIX(obj) (dynamic_cast<const SPFeColorMatrix*>((SPObject*)obj) != NULL)
class SPFeColorMatrix : public SPFilterPrimitive {
diff --git a/src/filters/componenttransfer-funcnode.h b/src/filters/componenttransfer-funcnode.h
index 10eead379..a5f813e1e 100644
--- a/src/filters/componenttransfer-funcnode.h
+++ b/src/filters/componenttransfer-funcnode.h
@@ -29,7 +29,7 @@
//#define SP_IS_FEFUNCB(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), SP_TYPE_FEFUNCB))
//#define SP_IS_FEFUNCA(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), SP_TYPE_FEFUNCA))
-#define SP_FEFUNCNODE(obj) ((SPFeFuncNode*)obj)
+#define SP_FEFUNCNODE(obj) (dynamic_cast<SPFeFuncNode*>((SPObject*)obj))
//#define SP_IS_FEFUNCR(obj) (obj != NULL && static_cast<const SPObject*>(obj)->typeHierarchy.count(typeid(SPFeFuncNode)))
//#define SP_IS_FEFUNCG(obj) (obj != NULL && static_cast<const SPObject*>(obj)->typeHierarchy.count(typeid(SPFeFuncNode)))
diff --git a/src/filters/componenttransfer.h b/src/filters/componenttransfer.h
index 14149171c..8dbe91db1 100644
--- a/src/filters/componenttransfer.h
+++ b/src/filters/componenttransfer.h
@@ -13,7 +13,7 @@
#include "sp-filter-primitive.h"
-#define SP_FECOMPONENTTRANSFER(obj) ((SPFeComponentTransfer*)obj)
+#define SP_FECOMPONENTTRANSFER(obj) (dynamic_cast<SPFeComponentTransfer*>((SPObject*)obj))
#define SP_IS_FECOMPONENTTRANSFER(obj) (dynamic_cast<const SPFeComponentTransfer*>((SPObject*)obj) != NULL)
namespace Inkscape {
diff --git a/src/filters/composite.h b/src/filters/composite.h
index b3500ecaf..b8c0178d1 100644
--- a/src/filters/composite.h
+++ b/src/filters/composite.h
@@ -13,7 +13,7 @@
#include "sp-filter-primitive.h"
-#define SP_FECOMPOSITE(obj) ((SPFeComposite*)obj)
+#define SP_FECOMPOSITE(obj) (dynamic_cast<SPFeComposite*>((SPObject*)obj))
#define SP_IS_FECOMPOSITE(obj) (dynamic_cast<const SPFeComposite*>((SPObject*)obj) != NULL)
enum FeCompositeOperator {
diff --git a/src/filters/convolvematrix.h b/src/filters/convolvematrix.h
index 6cbd63998..9783eaa47 100644
--- a/src/filters/convolvematrix.h
+++ b/src/filters/convolvematrix.h
@@ -18,7 +18,7 @@
#include "number-opt-number.h"
#include "display/nr-filter-convolve-matrix.h"
-#define SP_FECONVOLVEMATRIX(obj) ((SPFeConvolveMatrix*)obj)
+#define SP_FECONVOLVEMATRIX(obj) (dynamic_cast<SPFeConvolveMatrix*>((SPObject*)obj))
#define SP_IS_FECONVOLVEMATRIX(obj) (dynamic_cast<const SPFeConvolveMatrix*>((SPObject*)obj) != NULL)
class SPFeConvolveMatrix : public SPFilterPrimitive {
diff --git a/src/filters/diffuselighting.h b/src/filters/diffuselighting.h
index 701128158..f41c6c056 100644
--- a/src/filters/diffuselighting.h
+++ b/src/filters/diffuselighting.h
@@ -15,7 +15,7 @@
#include "sp-filter-primitive.h"
#include "number-opt-number.h"
-#define SP_FEDIFFUSELIGHTING(obj) ((SPFeDiffuseLighting*)obj)
+#define SP_FEDIFFUSELIGHTING(obj) (dynamic_cast<SPFeDiffuseLighting*>((SPObject*)obj))
#define SP_IS_FEDIFFUSELIGHTING(obj) (dynamic_cast<const SPFeDiffuseLighting*>((SPObject*)obj) != NULL)
struct SVGICCColor;
diff --git a/src/filters/displacementmap.h b/src/filters/displacementmap.h
index 66b0c8afc..85a6beaaa 100644
--- a/src/filters/displacementmap.h
+++ b/src/filters/displacementmap.h
@@ -14,7 +14,7 @@
#include "sp-filter-primitive.h"
-#define SP_FEDISPLACEMENTMAP(obj) ((SPFeDisplacementMap*)obj)
+#define SP_FEDISPLACEMENTMAP(obj) (dynamic_cast<SPFeDisplacementMap*>((SPObject*)obj))
#define SP_IS_FEDISPLACEMENTMAP(obj) (dynamic_cast<const SPFeDisplacementMap*>((SPObject*)obj) != NULL)
enum FilterDisplacementMapChannelSelector {
diff --git a/src/filters/distantlight.h b/src/filters/distantlight.h
index bab49726e..0eebf768f 100644
--- a/src/filters/distantlight.h
+++ b/src/filters/distantlight.h
@@ -17,7 +17,7 @@
#include "sp-object.h"
-#define SP_FEDISTANTLIGHT(obj) ((SPFeDistantLight*)obj)
+#define SP_FEDISTANTLIGHT(obj) (dynamic_cast<SPFeDistantLight*>((SPObject*)obj))
#define SP_IS_FEDISTANTLIGHT(obj) (dynamic_cast<const SPFeDistantLight*>((SPObject*)obj) != NULL)
/* Distant light class */
diff --git a/src/filters/flood.h b/src/filters/flood.h
index d052dd8ff..75e332b73 100644
--- a/src/filters/flood.h
+++ b/src/filters/flood.h
@@ -15,7 +15,7 @@
#include "sp-filter-primitive.h"
#include "svg/svg-icc-color.h"
-#define SP_FEFLOOD(obj) ((SPFeFlood*)obj)
+#define SP_FEFLOOD(obj) (dynamic_cast<SPFeFlood*>((SPObject*)obj))
#define SP_IS_FEFLOOD(obj) (dynamic_cast<const SPFeFlood*>((SPObject*)obj) != NULL)
class SPFeFlood : public SPFilterPrimitive {
diff --git a/src/filters/gaussian-blur.h b/src/filters/gaussian-blur.h
index 7aa293b93..00de8a95f 100644
--- a/src/filters/gaussian-blur.h
+++ b/src/filters/gaussian-blur.h
@@ -15,7 +15,7 @@
#include "sp-filter-primitive.h"
#include "number-opt-number.h"
-#define SP_GAUSSIANBLUR(obj) ((SPGaussianBlur*)obj)
+#define SP_GAUSSIANBLUR(obj) (dynamic_cast<SPGaussianBlur*>((SPObject*)obj))
#define SP_IS_GAUSSIANBLUR(obj) (dynamic_cast<const SPGaussianBlur*>((SPObject*)obj) != NULL)
class SPGaussianBlur : public SPFilterPrimitive {
diff --git a/src/filters/image.h b/src/filters/image.h
index 055e4e31a..452e08134 100644
--- a/src/filters/image.h
+++ b/src/filters/image.h
@@ -18,7 +18,7 @@
#include "sp-item.h"
#include "uri-references.h"
-#define SP_FEIMAGE(obj) ((SPFeImage*)obj)
+#define SP_FEIMAGE(obj) (dynamic_cast<SPFeImage*>((SPObject*)obj))
#define SP_IS_FEIMAGE(obj) (dynamic_cast<const SPFeImage*>((SPObject*)obj) != NULL)
class SPFeImage : public SPFilterPrimitive {
diff --git a/src/filters/merge.h b/src/filters/merge.h
index 55f0b0be7..68257c38e 100644
--- a/src/filters/merge.h
+++ b/src/filters/merge.h
@@ -12,7 +12,7 @@
#include "sp-filter-primitive.h"
-#define SP_FEMERGE(obj) ((SPFeMerge*)obj)
+#define SP_FEMERGE(obj) (dynamic_cast<SPFeMerge*>((SPObject*)obj))
#define SP_IS_FEMERGE(obj) (dynamic_cast<const SPFeMerge*>((SPObject*)obj) != NULL)
class SPFeMerge : public SPFilterPrimitive {
diff --git a/src/filters/mergenode.h b/src/filters/mergenode.h
index 3fd5e890b..408b3bbb8 100644
--- a/src/filters/mergenode.h
+++ b/src/filters/mergenode.h
@@ -17,7 +17,7 @@
#include "sp-object.h"
-#define SP_FEMERGENODE(obj) ((SPFeMergeNode*)obj)
+#define SP_FEMERGENODE(obj) (dynamic_cast<SPFeMergeNode*>((SPObject*)obj))
#define SP_IS_FEMERGENODE(obj) (dynamic_cast<const SPFeMergeNode*>((SPObject*)obj) != NULL)
class SPFeMergeNode : public SPObject {
diff --git a/src/filters/morphology.h b/src/filters/morphology.h
index ebcdfc28f..f84a7271e 100644
--- a/src/filters/morphology.h
+++ b/src/filters/morphology.h
@@ -16,7 +16,7 @@
#include "number-opt-number.h"
#include "display/nr-filter-morphology.h"
-#define SP_FEMORPHOLOGY(obj) ((SPFeMorphology*)obj)
+#define SP_FEMORPHOLOGY(obj) (dynamic_cast<SPFeMorphology*>((SPObject*)obj))
#define SP_IS_FEMORPHOLOGY(obj) (dynamic_cast<const SPFeMorphology*>((SPObject*)obj) != NULL)
class SPFeMorphology : public SPFilterPrimitive {
diff --git a/src/filters/offset.h b/src/filters/offset.h
index 43407c3a9..0d26f6f90 100644
--- a/src/filters/offset.h
+++ b/src/filters/offset.h
@@ -14,7 +14,7 @@
#include "sp-filter-primitive.h"
-#define SP_FEOFFSET(obj) ((SPFeOffset*)obj)
+#define SP_FEOFFSET(obj) (dynamic_cast<SPFeOffset*>((SPObject*)obj))
#define SP_IS_FEOFFSET(obj) (dynamic_cast<const SPFeOffset*>((SPObject*)obj) != NULL)
class SPFeOffset : public SPFilterPrimitive {
diff --git a/src/filters/pointlight.h b/src/filters/pointlight.h
index 2d092bd1c..3819d8ff5 100644
--- a/src/filters/pointlight.h
+++ b/src/filters/pointlight.h
@@ -17,7 +17,7 @@
#include "sp-object.h"
-#define SP_FEPOINTLIGHT(obj) ((SPFePointLight*)obj)
+#define SP_FEPOINTLIGHT(obj) (dynamic_cast<SPFePointLight*>((SPObject*)obj))
#define SP_IS_FEPOINTLIGHT(obj) (dynamic_cast<const SPFePointLight*>((SPObject*)obj) != NULL)
class SPFePointLight : public SPObject {
diff --git a/src/filters/specularlighting.h b/src/filters/specularlighting.h
index f99dbd9ce..1de32ec58 100644
--- a/src/filters/specularlighting.h
+++ b/src/filters/specularlighting.h
@@ -17,7 +17,7 @@
#include "sp-filter-primitive.h"
#include "number-opt-number.h"
-#define SP_FESPECULARLIGHTING(obj) ((SPFeSpecularLighting*)obj)
+#define SP_FESPECULARLIGHTING(obj) (dynamic_cast<SPFeSpecularLighting*>((SPObject*)obj))
#define SP_IS_FESPECULARLIGHTING(obj) (dynamic_cast<const SPFeSpecularLighting*>((SPObject*)obj) != NULL)
struct SVGICCColor;
diff --git a/src/filters/spotlight.h b/src/filters/spotlight.h
index 55717ac5d..8caf12858 100644
--- a/src/filters/spotlight.h
+++ b/src/filters/spotlight.h
@@ -17,7 +17,7 @@
#include "sp-object.h"
-#define SP_FESPOTLIGHT(obj) ((SPFeSpotLight*)obj)
+#define SP_FESPOTLIGHT(obj) (dynamic_cast<SPFeSpotLight*>((SPObject*)obj))
#define SP_IS_FESPOTLIGHT(obj) (dynamic_cast<const SPFeSpotLight*>((SPObject*)obj) != NULL)
class SPFeSpotLight : public SPObject {
diff --git a/src/filters/tile.h b/src/filters/tile.h
index 9b2199adc..cc1a006dd 100644
--- a/src/filters/tile.h
+++ b/src/filters/tile.h
@@ -14,7 +14,7 @@
#include "sp-filter-primitive.h"
-#define SP_FETILE(obj) ((SPFeTile*)obj)
+#define SP_FETILE(obj) (dynamic_cast<SPFeTile*>((SPObject*)obj))
#define SP_IS_FETILE(obj) (dynamic_cast<const SPFeTile*>((SPObject*)obj) != NULL)
/* FeTile base class */
diff --git a/src/filters/turbulence.h b/src/filters/turbulence.h
index d0bb6f878..89e6d4a19 100644
--- a/src/filters/turbulence.h
+++ b/src/filters/turbulence.h
@@ -17,7 +17,7 @@
#include "number-opt-number.h"
#include "display/nr-filter-turbulence.h"
-#define SP_FETURBULENCE(obj) ((SPFeTurbulence*)obj)
+#define SP_FETURBULENCE(obj) (dynamic_cast<SPFeTurbulence*>((SPObject*)obj))
#define SP_IS_FETURBULENCE(obj) (dynamic_cast<const SPFeTurbulence*>((SPObject*)obj) != NULL)
/* FeTurbulence base class */
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-17 14:26:59 +0000