fix bbox calculation for groups that contain groups with nothing in them (zero bbox...

[inkscape.git] / src / display / nr-arena-image.cpp

diff --git a/src/display/nr-arena-image.cpp b/src/display/nr-arena-image.cpp
index a2050f75cfa3cf4ccab1aa17d78a4fd2a9de9750..4803228739ce51217085f242a73ddd7226da67e7 100644 (file)
--- a/src/display/nr-arena-image.cpp
+++ b/src/display/nr-arena-image.cpp
@@ -20,8 +20,6 @@
 #include "display/nr-arena.h"
 #include "display/nr-filter.h"
 #include "display/nr-filter-gaussian.h"
-#include <livarot/Path.h>
-#include <livarot/Shape.h>
 #include "sp-filter.h"
 #include "sp-filter-reference.h"
 #include "sp-gaussian-blur.h"
@@ -36,9 +34,6 @@ int nr_arena_image_y_sample = 1;
  *
  */
 
-// defined in nr-arena-shape.cpp
-void nr_pixblock_render_shape_mask_or(NRPixBlock &m, Shape *theS);
-
 static void nr_arena_image_class_init (NRArenaImageClass *klass);
 static void nr_arena_image_init (NRArenaImage *image);
 static void nr_arena_image_finalize (NRObject *object);
@@ -180,7 +175,7 @@ nr_arena_image_render( cairo_t *ct, NRArenaItem *item, NRRectL */*area*/, NRPixB
     nr_arena_image_x_sample = prefs_get_int_attribute ("options.bitmapoversample", "value", 1);
     nr_arena_image_y_sample = nr_arena_image_x_sample;
 
-    bool outline = (item->arena->rendermode == RENDERMODE_OUTLINE);
+    bool outline = (item->arena->rendermode == Inkscape::RENDERMODE_OUTLINE);
 
     NRArenaImage *image = NR_ARENA_IMAGE (item);
 
@@ -294,7 +289,7 @@ nr_arena_image_pick( NRArenaItem *item, NR::Point p, double delta, unsigned int
 
     if (!image->px) return NULL;
 
-    bool outline = (item->arena->rendermode == RENDERMODE_OUTLINE);
+    bool outline = (item->arena->rendermode == Inkscape::RENDERMODE_OUTLINE);
 
     if (outline) {