diff --git a/src/sp-clippath.cpp b/src/sp-clippath.cpp
index 33feea8ce2eef50669b8a78841becde558822f69..501b5fcfd91caf5aea8d870a1d55e5f69bad4153 100644 (file)
--- a/src/sp-clippath.cpp
+++ b/src/sp-clippath.cpp
#include "document-private.h"
#include "sp-item.h"
+#include "libnr/nr-matrix-ops.h"
+
#include "sp-clippath.h"
struct SPClipPathView {
void
sp_clippath_get_bbox(SPClipPath *cp, NRRect *bbox, NR::Matrix const &transform, unsigned const flags)
{
- for (SPObject *o = sp_object_first_child(SP_OBJECT(cp)); o != NULL; o = SP_OBJECT_NEXT(o)) {
- if (SP_IS_ITEM(o)) {
- SPItem *child = SP_ITEM(o);
- sp_item_invoke_bbox_full(child, bbox, transform, flags, FALSE);
- }
- }
+ SPObject *i;
+ for (i = sp_object_first_child(SP_OBJECT(cp)); i && !SP_IS_ITEM(i); i = SP_OBJECT_NEXT(i));
+ if (!i) return;
+
+ sp_item_invoke_bbox_full(SP_ITEM(i), bbox, NR::Matrix(SP_ITEM(i)->transform) * transform, flags, FALSE);
+ SPObject *i_start = i;
+
+ while (i != NULL) {
+ if (i != i_start) {
+ NRRect i_box;
+ sp_item_invoke_bbox_full(SP_ITEM(i), &i_box, NR::Matrix(SP_ITEM(i)->transform) * transform, flags, FALSE);
+ nr_rect_d_union (bbox, bbox, &i_box);
+ }
+ i = SP_OBJECT_NEXT(i);
+ for (; i && !SP_IS_ITEM(i); i = SP_OBJECT_NEXT(i));
+ }
}
/* ClipPath views */
// Create a mask element (using passed elements), add it to <defs>
const gchar *
-sp_clippath_create (GSList *reprs, SPDocument *document)
+sp_clippath_create (GSList *reprs, SPDocument *document, NR::Matrix const* applyTransform)
{
Inkscape::XML::Node *defsrepr = SP_OBJECT_REPR (SP_DOCUMENT_DEFS (document));
for (GSList *it = reprs; it != NULL; it = it->next) {
Inkscape::XML::Node *node = (Inkscape::XML::Node *)(it->data);
- clip_path_object->appendChildRepr(node);
+ SPItem *item = SP_ITEM(clip_path_object->appendChildRepr(node));
+
+ if (NULL != applyTransform) {
+ NR::Matrix transform (item->transform);
+ transform *= (*applyTransform);
+ sp_item_write_transform(item, SP_OBJECT_REPR(item), transform);
+ }
}
Inkscape::GC::release(repr);