4 files changed, 14 insertions, 4 deletions
diff --git a/src/display/canvas-axonomgrid.cpp b/src/display/canvas-axonomgrid.cpp
index 170684328..1eadd3fd2 100644
--- a/src/display/canvas-axonomgrid.cpp
+++ b/src/display/canvas-axonomgrid.cpp
@@ -17,6 +17,10 @@
 # include "config.h"
 #endif
 
+#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
+#include <glibmm/threads.h>
+#endif
+
 #include <gtkmm/box.h>
 #include <gtkmm/label.h>
 
diff --git a/src/display/canvas-grid.cpp b/src/display/canvas-grid.cpp
index 88da22835..ee5ad0945 100644
--- a/src/display/canvas-grid.cpp
+++ b/src/display/canvas-grid.cpp
@@ -17,6 +17,10 @@
 # include "config.h"
 #endif
 
+#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
+#include <glibmm/threads.h>
+#endif
+
 #include <gtkmm/box.h>
 #include <gtkmm/label.h>
 
diff --git a/src/display/nr-filter.cpp b/src/display/nr-filter.cpp
index eeba94d7c..f0965c460 100644
--- a/src/display/nr-filter.cpp
+++ b/src/display/nr-filter.cpp
@@ -114,7 +114,8 @@ int Filter::render(Inkscape::DrawingItem const *item, DrawingContext &graphic, D
 
     Geom::Affine trans = item->ctm();
 
-    Geom::OptRect filter_area = filter_effect_area(item->itemBounds());
+//    Geom::OptRect filter_area = filter_effect_area(item->itemBounds()); // disabled, already done in visualBounds
+    Geom::OptRect filter_area = item->itemBounds(); // see LP Bug 1188336
     if (!filter_area) return 1;
 
     FilterUnits units(_filter_units, _primitive_units);
@@ -221,7 +222,8 @@ void Filter::area_enlarge(Geom::IntRect &bbox, Inkscape::DrawingItem const *item
 
 Geom::OptIntRect Filter::compute_drawbox(Inkscape::DrawingItem const *item, Geom::OptRect const &item_bbox) {
 
-    Geom::OptRect enlarged = filter_effect_area(item_bbox);
+//    Geom::OptRect enlarged = filter_effect_area(item_bbox); // disabled, already done in visualBounds
+    Geom::OptRect enlarged = item_bbox; // see LP Bug 1188336
     if (enlarged) {
         *enlarged *= item->ctm();
 
diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp
index 9d4049512..9adb96642 100644
--- a/src/display/sp-canvas.cpp
+++ b/src/display/sp-canvas.cpp
@@ -1095,8 +1095,8 @@ double SPCanvasGroup::point(SPCanvasItem *item, Geom::Point p, SPCanvasItem **ac
             SPCanvasItem *point_item = NULL; // cater for incomplete item implementations
 
             int has_point;
-            if (child->visible && SP_CANVAS_ITEM_GET_CLASS (child)->point) {
-                dist = sp_canvas_item_invoke_point (child, p, &point_item);
+            if (child->visible && SP_CANVAS_ITEM_GET_CLASS(child)->point) {
+                dist = sp_canvas_item_invoke_point(child, p, &point_item);
                 has_point = TRUE;
             } else {
                 has_point = FALSE;