From dc01e8e42fff68b0fcf56e814cf837110da54d1d Mon Sep 17 00:00:00 2001 From: Bryce Harrington Date: Wed, 17 Sep 2014 21:37:41 -0700 Subject: Fix build for fink on OS X 10.9 by including unistd.h Fixes: https://bugs.launchpad.net/inkscape/+bug/1340914 Fixed bugs: - https://launchpad.net/bugs/1340914 (bzr r13560) --- src/color-profile.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src') diff --git a/src/color-profile.cpp b/src/color-profile.cpp index aa0750c00..6f335b590 100644 --- a/src/color-profile.cpp +++ b/src/color-profile.cpp @@ -19,6 +19,7 @@ #include #endif // DEBUG_LCMS +#include #include #include #include -- cgit v1.2.3 From b91f59f850cf88b2c5a4579cbb4a515189f96b24 Mon Sep 17 00:00:00 2001 From: Alvin Penner Date: Fri, 19 Sep 2014 15:10:08 -0400 Subject: scale clip or mask upon unit change (Bug 1287288) Fixed bugs: - https://launchpad.net/bugs/1287288 (bzr r13561) --- src/sp-item-group.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'src') diff --git a/src/sp-item-group.cpp b/src/sp-item-group.cpp index 5936cfbe5..a24056630 100644 --- a/src/sp-item-group.cpp +++ b/src/sp-item-group.cpp @@ -677,6 +677,18 @@ void SPGroup::scaleChildItemsRec(Geom::Scale const &sc, Geom::Point const &p, bo item->doWriteTransform(item->getRepr(), tAff, NULL, true); } else { // used for other import + SPItem *item = NULL; + if (SP_ITEM(o)->clip_ref->getObject()) { + item = SP_ITEM(SP_ITEM(o)->clip_ref->getObject()->firstChild()); + } else if (SP_ITEM(o)->mask_ref->getObject()) { + item = SP_ITEM(SP_ITEM(o)->mask_ref->getObject()->firstChild()); + } + if (item != NULL) { + Geom::Affine tdoc2dt = Geom::Scale(1, -1) * Geom::Translate(p); // re-create doc2dt() + Geom::Affine ti2doc = SP_ITEM(o)->i2doc_affine(); + item->set_i2d_affine(ti2doc * sc * ti2doc.inverse() * tdoc2dt); + item->doWriteTransform(item->getRepr(), item->transform, NULL, true); + } SP_GROUP(o)->scaleChildItemsRec(sc, p, false); } } else { -- cgit v1.2.3