diff options
Diffstat (limited to 'src/filters')
| -rw-r--r-- | src/filters/blend.h | 2 | ||||
| -rw-r--r-- | src/filters/colormatrix.h | 2 | ||||
| -rw-r--r-- | src/filters/componenttransfer-funcnode.h | 8 | ||||
| -rw-r--r-- | src/filters/componenttransfer.h | 2 | ||||
| -rw-r--r-- | src/filters/composite.h | 2 | ||||
| -rw-r--r-- | src/filters/convolvematrix.h | 2 | ||||
| -rw-r--r-- | src/filters/diffuselighting.h | 2 | ||||
| -rw-r--r-- | src/filters/displacementmap.h | 2 | ||||
| -rw-r--r-- | src/filters/distantlight.h | 2 | ||||
| -rw-r--r-- | src/filters/flood.h | 2 | ||||
| -rw-r--r-- | src/filters/gaussian-blur.h | 2 | ||||
| -rw-r--r-- | src/filters/image.h | 2 | ||||
| -rw-r--r-- | src/filters/merge.h | 2 | ||||
| -rw-r--r-- | src/filters/mergenode.h | 2 | ||||
| -rw-r--r-- | src/filters/morphology.h | 2 | ||||
| -rw-r--r-- | src/filters/offset.h | 2 | ||||
| -rw-r--r-- | src/filters/pointlight.h | 2 | ||||
| -rw-r--r-- | src/filters/specularlighting.h | 2 | ||||
| -rw-r--r-- | src/filters/spotlight.h | 2 | ||||
| -rw-r--r-- | src/filters/tile.h | 2 | ||||
| -rw-r--r-- | src/filters/turbulence.h | 2 |
21 files changed, 24 insertions, 24 deletions
diff --git a/src/filters/blend.h b/src/filters/blend.h index f8b7bd2cb..779eed3e0 100644 --- a/src/filters/blend.h +++ b/src/filters/blend.h @@ -17,7 +17,7 @@ #include "display/nr-filter-blend.h" #define SP_FEBLEND(obj) ((SPFeBlend*)obj) -#define SP_IS_FEBLEND(obj) (dynamic_cast<const SPFeBlend*>((SPObject*)obj)) +#define SP_IS_FEBLEND(obj) (dynamic_cast<const SPFeBlend*>((SPObject*)obj) != NULL) class SPFeBlend : public SPFilterPrimitive { public: diff --git a/src/filters/colormatrix.h b/src/filters/colormatrix.h index 4d11964dd..e109bbcdd 100644 --- a/src/filters/colormatrix.h +++ b/src/filters/colormatrix.h @@ -16,7 +16,7 @@ #include "display/nr-filter-colormatrix.h" #define SP_FECOLORMATRIX(obj) ((SPFeColorMatrix*)obj) -#define SP_IS_FECOLORMATRIX(obj) (dynamic_cast<const SPFeColorMatrix*>((SPObject*)obj)) +#define SP_IS_FECOLORMATRIX(obj) (dynamic_cast<const SPFeColorMatrix*>((SPObject*)obj) != NULL) class SPFeColorMatrix : public SPFilterPrimitive { public: diff --git a/src/filters/componenttransfer-funcnode.h b/src/filters/componenttransfer-funcnode.h index 873baa196..10eead379 100644 --- a/src/filters/componenttransfer-funcnode.h +++ b/src/filters/componenttransfer-funcnode.h @@ -36,10 +36,10 @@ //#define SP_IS_FEFUNCB(obj) (obj != NULL && static_cast<const SPObject*>(obj)->typeHierarchy.count(typeid(SPFeFuncNode))) //#define SP_IS_FEFUNCA(obj) (obj != NULL && static_cast<const SPObject*>(obj)->typeHierarchy.count(typeid(SPFeFuncNode))) -#define SP_IS_FEFUNCR(obj) (dynamic_cast<const SPFeFuncNode*>((SPObject*)obj)) -#define SP_IS_FEFUNCG(obj) (dynamic_cast<const SPFeFuncNode*>((SPObject*)obj)) -#define SP_IS_FEFUNCB(obj) (dynamic_cast<const SPFeFuncNode*>((SPObject*)obj)) -#define SP_IS_FEFUNCA(obj) (dynamic_cast<const SPFeFuncNode*>((SPObject*)obj)) +#define SP_IS_FEFUNCR(obj) (dynamic_cast<const SPFeFuncNode*>((SPObject*)obj) != NULL) +#define SP_IS_FEFUNCG(obj) (dynamic_cast<const SPFeFuncNode*>((SPObject*)obj) != NULL) +#define SP_IS_FEFUNCB(obj) (dynamic_cast<const SPFeFuncNode*>((SPObject*)obj) != NULL) +#define SP_IS_FEFUNCA(obj) (dynamic_cast<const SPFeFuncNode*>((SPObject*)obj) != NULL) class SPFeFuncNode : public SPObject { public: diff --git a/src/filters/componenttransfer.h b/src/filters/componenttransfer.h index 3aab5cf49..14149171c 100644 --- a/src/filters/componenttransfer.h +++ b/src/filters/componenttransfer.h @@ -14,7 +14,7 @@ #include "sp-filter-primitive.h" #define SP_FECOMPONENTTRANSFER(obj) ((SPFeComponentTransfer*)obj) -#define SP_IS_FECOMPONENTTRANSFER(obj) (dynamic_cast<const SPFeComponentTransfer*>((SPObject*)obj)) +#define SP_IS_FECOMPONENTTRANSFER(obj) (dynamic_cast<const SPFeComponentTransfer*>((SPObject*)obj) != NULL) namespace Inkscape { namespace Filters { diff --git a/src/filters/composite.h b/src/filters/composite.h index dc124e891..b3500ecaf 100644 --- a/src/filters/composite.h +++ b/src/filters/composite.h @@ -14,7 +14,7 @@ #include "sp-filter-primitive.h" #define SP_FECOMPOSITE(obj) ((SPFeComposite*)obj) -#define SP_IS_FECOMPOSITE(obj) (dynamic_cast<const SPFeComposite*>((SPObject*)obj)) +#define SP_IS_FECOMPOSITE(obj) (dynamic_cast<const SPFeComposite*>((SPObject*)obj) != NULL) enum FeCompositeOperator { // Default value is 'over', but let's distinquish specifying the diff --git a/src/filters/convolvematrix.h b/src/filters/convolvematrix.h index abcf52384..6cbd63998 100644 --- a/src/filters/convolvematrix.h +++ b/src/filters/convolvematrix.h @@ -19,7 +19,7 @@ #include "display/nr-filter-convolve-matrix.h" #define SP_FECONVOLVEMATRIX(obj) ((SPFeConvolveMatrix*)obj) -#define SP_IS_FECONVOLVEMATRIX(obj) (dynamic_cast<const SPFeConvolveMatrix*>((SPObject*)obj)) +#define SP_IS_FECONVOLVEMATRIX(obj) (dynamic_cast<const SPFeConvolveMatrix*>((SPObject*)obj) != NULL) class SPFeConvolveMatrix : public SPFilterPrimitive { public: diff --git a/src/filters/diffuselighting.h b/src/filters/diffuselighting.h index e33584b4f..701128158 100644 --- a/src/filters/diffuselighting.h +++ b/src/filters/diffuselighting.h @@ -16,7 +16,7 @@ #include "number-opt-number.h" #define SP_FEDIFFUSELIGHTING(obj) ((SPFeDiffuseLighting*)obj) -#define SP_IS_FEDIFFUSELIGHTING(obj) (dynamic_cast<const 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 3100e66b7..66b0c8afc 100644 --- a/src/filters/displacementmap.h +++ b/src/filters/displacementmap.h @@ -15,7 +15,7 @@ #include "sp-filter-primitive.h" #define SP_FEDISPLACEMENTMAP(obj) ((SPFeDisplacementMap*)obj) -#define SP_IS_FEDISPLACEMENTMAP(obj) (dynamic_cast<const SPFeDisplacementMap*>((SPObject*)obj)) +#define SP_IS_FEDISPLACEMENTMAP(obj) (dynamic_cast<const SPFeDisplacementMap*>((SPObject*)obj) != NULL) enum FilterDisplacementMapChannelSelector { DISPLACEMENTMAP_CHANNEL_RED, diff --git a/src/filters/distantlight.h b/src/filters/distantlight.h index ad9c8f53c..bab49726e 100644 --- a/src/filters/distantlight.h +++ b/src/filters/distantlight.h @@ -18,7 +18,7 @@ #include "sp-object.h" #define SP_FEDISTANTLIGHT(obj) ((SPFeDistantLight*)obj) -#define SP_IS_FEDISTANTLIGHT(obj) (dynamic_cast<const SPFeDistantLight*>((SPObject*)obj)) +#define SP_IS_FEDISTANTLIGHT(obj) (dynamic_cast<const SPFeDistantLight*>((SPObject*)obj) != NULL) /* Distant light class */ class SPFeDistantLight : public SPObject { diff --git a/src/filters/flood.h b/src/filters/flood.h index 67369a794..d052dd8ff 100644 --- a/src/filters/flood.h +++ b/src/filters/flood.h @@ -16,7 +16,7 @@ #include "svg/svg-icc-color.h" #define SP_FEFLOOD(obj) ((SPFeFlood*)obj) -#define SP_IS_FEFLOOD(obj) (dynamic_cast<const SPFeFlood*>((SPObject*)obj)) +#define SP_IS_FEFLOOD(obj) (dynamic_cast<const SPFeFlood*>((SPObject*)obj) != NULL) class SPFeFlood : public SPFilterPrimitive { public: diff --git a/src/filters/gaussian-blur.h b/src/filters/gaussian-blur.h index b0e725a50..7aa293b93 100644 --- a/src/filters/gaussian-blur.h +++ b/src/filters/gaussian-blur.h @@ -16,7 +16,7 @@ #include "number-opt-number.h" #define SP_GAUSSIANBLUR(obj) ((SPGaussianBlur*)obj) -#define SP_IS_GAUSSIANBLUR(obj) (dynamic_cast<const SPGaussianBlur*>((SPObject*)obj)) +#define SP_IS_GAUSSIANBLUR(obj) (dynamic_cast<const SPGaussianBlur*>((SPObject*)obj) != NULL) class SPGaussianBlur : public SPFilterPrimitive { public: diff --git a/src/filters/image.h b/src/filters/image.h index 8bbab2614..055e4e31a 100644 --- a/src/filters/image.h +++ b/src/filters/image.h @@ -19,7 +19,7 @@ #include "uri-references.h" #define SP_FEIMAGE(obj) ((SPFeImage*)obj) -#define SP_IS_FEIMAGE(obj) (dynamic_cast<const SPFeImage*>((SPObject*)obj)) +#define SP_IS_FEIMAGE(obj) (dynamic_cast<const SPFeImage*>((SPObject*)obj) != NULL) class SPFeImage : public SPFilterPrimitive { public: diff --git a/src/filters/merge.h b/src/filters/merge.h index c7d2ce45b..55f0b0be7 100644 --- a/src/filters/merge.h +++ b/src/filters/merge.h @@ -13,7 +13,7 @@ #include "sp-filter-primitive.h" #define SP_FEMERGE(obj) ((SPFeMerge*)obj) -#define SP_IS_FEMERGE(obj) (dynamic_cast<const SPFeMerge*>((SPObject*)obj)) +#define SP_IS_FEMERGE(obj) (dynamic_cast<const SPFeMerge*>((SPObject*)obj) != NULL) class SPFeMerge : public SPFilterPrimitive { public: diff --git a/src/filters/mergenode.h b/src/filters/mergenode.h index 9182780ca..3fd5e890b 100644 --- a/src/filters/mergenode.h +++ b/src/filters/mergenode.h @@ -18,7 +18,7 @@ #include "sp-object.h" #define SP_FEMERGENODE(obj) ((SPFeMergeNode*)obj) -#define SP_IS_FEMERGENODE(obj) (dynamic_cast<const SPFeMergeNode*>((SPObject*)obj)) +#define SP_IS_FEMERGENODE(obj) (dynamic_cast<const SPFeMergeNode*>((SPObject*)obj) != NULL) class SPFeMergeNode : public SPObject { public: diff --git a/src/filters/morphology.h b/src/filters/morphology.h index 786d444f3..ebcdfc28f 100644 --- a/src/filters/morphology.h +++ b/src/filters/morphology.h @@ -17,7 +17,7 @@ #include "display/nr-filter-morphology.h" #define SP_FEMORPHOLOGY(obj) ((SPFeMorphology*)obj) -#define SP_IS_FEMORPHOLOGY(obj) (dynamic_cast<const SPFeMorphology*>((SPObject*)obj)) +#define SP_IS_FEMORPHOLOGY(obj) (dynamic_cast<const SPFeMorphology*>((SPObject*)obj) != NULL) class SPFeMorphology : public SPFilterPrimitive { public: diff --git a/src/filters/offset.h b/src/filters/offset.h index 10bed3338..43407c3a9 100644 --- a/src/filters/offset.h +++ b/src/filters/offset.h @@ -15,7 +15,7 @@ #include "sp-filter-primitive.h" #define SP_FEOFFSET(obj) ((SPFeOffset*)obj) -#define SP_IS_FEOFFSET(obj) (dynamic_cast<const SPFeOffset*>((SPObject*)obj)) +#define SP_IS_FEOFFSET(obj) (dynamic_cast<const SPFeOffset*>((SPObject*)obj) != NULL) class SPFeOffset : public SPFilterPrimitive { public: diff --git a/src/filters/pointlight.h b/src/filters/pointlight.h index 2379167b6..2d092bd1c 100644 --- a/src/filters/pointlight.h +++ b/src/filters/pointlight.h @@ -18,7 +18,7 @@ #include "sp-object.h" #define SP_FEPOINTLIGHT(obj) ((SPFePointLight*)obj) -#define SP_IS_FEPOINTLIGHT(obj) (dynamic_cast<const SPFePointLight*>((SPObject*)obj)) +#define SP_IS_FEPOINTLIGHT(obj) (dynamic_cast<const SPFePointLight*>((SPObject*)obj) != NULL) class SPFePointLight : public SPObject { public: diff --git a/src/filters/specularlighting.h b/src/filters/specularlighting.h index 081d0e0ed..f99dbd9ce 100644 --- a/src/filters/specularlighting.h +++ b/src/filters/specularlighting.h @@ -18,7 +18,7 @@ #include "number-opt-number.h" #define SP_FESPECULARLIGHTING(obj) ((SPFeSpecularLighting*)obj) -#define SP_IS_FESPECULARLIGHTING(obj) (dynamic_cast<const 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 b273f72b7..55717ac5d 100644 --- a/src/filters/spotlight.h +++ b/src/filters/spotlight.h @@ -18,7 +18,7 @@ #include "sp-object.h" #define SP_FESPOTLIGHT(obj) ((SPFeSpotLight*)obj) -#define SP_IS_FESPOTLIGHT(obj) (dynamic_cast<const SPFeSpotLight*>((SPObject*)obj)) +#define SP_IS_FESPOTLIGHT(obj) (dynamic_cast<const SPFeSpotLight*>((SPObject*)obj) != NULL) class SPFeSpotLight : public SPObject { public: diff --git a/src/filters/tile.h b/src/filters/tile.h index 184858a3d..9b2199adc 100644 --- a/src/filters/tile.h +++ b/src/filters/tile.h @@ -15,7 +15,7 @@ #include "sp-filter-primitive.h" #define SP_FETILE(obj) ((SPFeTile*)obj) -#define SP_IS_FETILE(obj) (dynamic_cast<const SPFeTile*>((SPObject*)obj)) +#define SP_IS_FETILE(obj) (dynamic_cast<const SPFeTile*>((SPObject*)obj) != NULL) /* FeTile base class */ class SPFeTile : public SPFilterPrimitive { diff --git a/src/filters/turbulence.h b/src/filters/turbulence.h index d6046036a..d0bb6f878 100644 --- a/src/filters/turbulence.h +++ b/src/filters/turbulence.h @@ -18,7 +18,7 @@ #include "display/nr-filter-turbulence.h" #define SP_FETURBULENCE(obj) ((SPFeTurbulence*)obj) -#define SP_IS_FETURBULENCE(obj) (dynamic_cast<const SPFeTurbulence*>((SPObject*)obj)) +#define SP_IS_FETURBULENCE(obj) (dynamic_cast<const SPFeTurbulence*>((SPObject*)obj) != NULL) /* FeTurbulence base class */ |
