more unreffing temporary styles properly

[inkscape.git] / src / sp-shape.cpp

diff --git a/src/sp-shape.cpp b/src/sp-shape.cpp
index 453de5650fd017971a280a7c1c7ad069e69446cf..6dba2afb67b2f36a63b0d6f3ecd0ead17c03c4e6 100644 (file)
--- a/src/sp-shape.cpp
+++ b/src/sp-shape.cpp
@@ -618,43 +618,46 @@ static void sp_shape_bbox(SPItem const *item, NRRect *bbox, NR::Matrix const &tr
 
         nr_path_matrix_bbox_union(&bp, transform, &cbbox);
 
-        SPStyle* style=SP_OBJECT_STYLE (item);
-        if (style->stroke.type != SP_PAINT_TYPE_NONE) {
-            double const scale = expansion(transform);
-            if ( fabs(style->stroke_width.computed * scale) > 0.01 ) { // sinon c'est 0=oon veut pas de bord
-                double const width = MAX(0.125, style->stroke_width.computed * scale);
-                if ( fabs(cbbox.x1-cbbox.x0) > -0.00001 && fabs(cbbox.y1-cbbox.y0) > -0.00001 ) {
-                    cbbox.x0-=0.5*width;
-                    cbbox.x1+=0.5*width;
-                    cbbox.y0-=0.5*width;
-                    cbbox.y1+=0.5*width;
+        if ((SPItem::BBoxType) flags != SPItem::GEOMETRIC_BBOX) {
+            
+            SPStyle* style=SP_OBJECT_STYLE (item);
+            if (style->stroke.type != SP_PAINT_TYPE_NONE) {
+                double const scale = expansion(transform);
+                if ( fabs(style->stroke_width.computed * scale) > 0.01 ) { // sinon c'est 0=oon veut pas de bord
+                    double const width = MAX(0.125, style->stroke_width.computed * scale);
+                    if ( fabs(cbbox.x1-cbbox.x0) > -0.00001 && fabs(cbbox.y1-cbbox.y0) > -0.00001 ) {
+                        cbbox.x0-=0.5*width;
+                        cbbox.x1+=0.5*width;
+                        cbbox.y0-=0.5*width;
+                        cbbox.y1+=0.5*width;
+                    }
                 }
             }
-        }
 
-        // Union with bboxes of the markers, if any
-        if (sp_shape_has_markers (shape)) {
-            for (NArtBpath* bp = SP_CURVE_BPATH(shape->curve); bp->code != NR_END; bp++) {
-                for (int m = SP_MARKER_LOC_START; m < SP_MARKER_LOC_QTY; m++) {
-                    if (sp_shape_marker_required (shape, m, bp)) {
+            // Union with bboxes of the markers, if any
+            if (sp_shape_has_markers (shape)) {
+                for (NArtBpath* bp = SP_CURVE_BPATH(shape->curve); bp->code != NR_END; bp++) {
+                    for (int m = SP_MARKER_LOC_START; m < SP_MARKER_LOC_QTY; m++) {
+                        if (sp_shape_marker_required (shape, m, bp)) {
 
-                        SPMarker* marker = SP_MARKER (shape->marker[m]);
-                        SPItem* marker_item = sp_item_first_item_child (SP_OBJECT (shape->marker[m]));
+                            SPMarker* marker = SP_MARKER (shape->marker[m]);
+                            SPItem* marker_item = sp_item_first_item_child (SP_OBJECT (shape->marker[m]));
 
-                        NR::Matrix tr(sp_shape_marker_get_transform(shape, bp));
+                            NR::Matrix tr(sp_shape_marker_get_transform(shape, bp));
 
-                        if (marker->markerUnits == SP_MARKER_UNITS_STROKEWIDTH) {
-                            tr = NR::scale(style->stroke_width.computed) * tr;
-                        }
+                            if (marker->markerUnits == SP_MARKER_UNITS_STROKEWIDTH) {
+                                tr = NR::scale(style->stroke_width.computed) * tr;
+                            }
 
-                        // total marker transform
-                        tr = marker_item->transform * marker->c2p * tr * transform;
+                            // total marker transform
+                            tr = marker_item->transform * marker->c2p * tr * transform;
 
-                        // get bbox of the marker with that transform
-                        NRRect marker_bbox;
-                        sp_item_invoke_bbox (marker_item, &marker_bbox, tr, true);
-                        // union it with the shape bbox
-                        nr_rect_d_union (&cbbox, &cbbox, &marker_bbox);
+                            // get bbox of the marker with that transform
+                            NRRect marker_bbox;
+                            sp_item_invoke_bbox (marker_item, &marker_bbox, tr, true);
+                            // union it with the shape bbox
+                            nr_rect_d_union (&cbbox, &cbbox, &marker_bbox);
+                        }
                     }
                 }
             }
@@ -1018,6 +1021,11 @@ static void sp_shape_snappoints(SPItem const *item, SnapPointsIter p)
 
     /* Use the end points of each segment of the path */
     NArtBpath const *bp = SP_CURVE_BPATH(shape->curve);
+
+    if (bp->code == NR_MOVETO) { // Indicates the start of a closed subpath, see nr-path-code.h
+        bp++; //The first point of a closed path is coincident with the end point. Skip the first point as we need only one
+    }
+
     while (bp->code != NR_END) {
         *p = bp->c(3) * i2d;
         bp++;