summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNiko Kiirala <niko@kiirala.com>2007-08-15 15:09:25 +0000
committerkiirala <kiirala@users.sourceforge.net>2007-08-15 15:09:25 +0000
commit09c08f165a15ba3df4613e2bef4386b7d82e9382 (patch)
treeffa4aa3efe9af2fead76b106282aaa3a630eef41 /src
parentFixed a problem compiling 2geom/poly.h on 64-bit platform (diff)
downloadinkscape-09c08f165a15ba3df4613e2bef4386b7d82e9382.tar.gz
inkscape-09c08f165a15ba3df4613e2bef4386b7d82e9382.zip
Fixed blur not rotating with the object in some cases (bug 1762289)
(bzr r3474)
Diffstat (limited to 'src')
-rw-r--r--src/display/nr-filter.cpp8
-rw-r--r--src/sp-filter.cpp2
2 files changed, 6 insertions, 4 deletions
diff --git a/src/display/nr-filter.cpp b/src/display/nr-filter.cpp
index 34a33e2b8..b97784ec4 100644
--- a/src/display/nr-filter.cpp
+++ b/src/display/nr-filter.cpp
@@ -138,10 +138,10 @@ int Filter::render(NRArenaItem const *item, NRPixBlock *pb)
// If filter effects region is not paraller to viewport,
// we must first undo the rotation / shear.
// It will be redone after filtering.
- // If there is only rotation and uniform scaling (zoom), let's skip this,
- // as it will not make a difference with gaussian blur.
- if ((fabs(trans[1]) > 1e-6 || fabs(trans[2]) > 1e-6) &&
- !(fabs(trans[0] - trans[3]) < 1e-6 && fabs(trans[1] + trans[2]) < 1e-6)) {
+ // If there is only scaling, let's skip this, as it will not make
+ // a difference with gaussian blur.
+ // TODO: This should be done in FilterSlot and for all input images
+ if (fabs(trans[1]) > 1e-6 || fabs(trans[2]) > 1e-6) {
notparaller = true;
// TODO: if filter resolution is specified, scaling should be set
diff --git a/src/sp-filter.cpp b/src/sp-filter.cpp
index e9c2af19d..9d2abcddf 100644
--- a/src/sp-filter.cpp
+++ b/src/sp-filter.cpp
@@ -112,6 +112,8 @@ sp_filter_init(SPFilter *filter)
filter->_image_name = map<gchar *, int, ltstr>();
+ filter->filterRes = NumberOptNumber();
+
new (&filter->modified_connection) sigc::connection();
}