diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-11-03 00:10:02 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-11-03 00:10:02 +0000 |
| commit | d2df0412f728dd5bb54537dfdfe7c35b34d40e0e (patch) | |
| tree | e2703384779e83312c456399999997fcc289c5cf /src/sp-filter.h | |
| parent | Merge branch 'master' into powerpencil (diff) | |
| parent | change assignment to equality (diff) | |
| download | inkscape-d2df0412f728dd5bb54537dfdfe7c35b34d40e0e.tar.gz inkscape-d2df0412f728dd5bb54537dfdfe7c35b34d40e0e.zip | |
Merge branch 'master' into powerpencil
Diffstat (limited to 'src/sp-filter.h')
| -rw-r--r-- | src/sp-filter.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/sp-filter.h b/src/sp-filter.h index 1c214c6b7..054562d39 100644 --- a/src/sp-filter.h +++ b/src/sp-filter.h @@ -16,6 +16,7 @@ #include <map> #include "number-opt-number.h" +#include "sp-dimensions.h" #include "sp-object.h" #include "sp-filter-units.h" #include "svg/svg-length.h" @@ -38,7 +39,7 @@ struct ltstr { bool operator()(const char* s1, const char* s2) const; }; -class SPFilter : public SPObject { +class SPFilter : public SPObject, public SPDimensions { public: SPFilter(); virtual ~SPFilter(); @@ -47,14 +48,10 @@ public: unsigned int filterUnits_set : 1; SPFilterUnits primitiveUnits; unsigned int primitiveUnits_set : 1; - SVGLength x; - SVGLength y; - SVGLength width; - SVGLength height; NumberOptNumber filterRes; SPFilterReference *href; sigc::connection modified_connection; - + guint getRefCount(); guint _refcount; |