summaryrefslogtreecommitdiffstats
path: root/src/marker.cpp
diff options
context:
space:
mode:
authorThomas Holder <speleo3@users.sourceforge.net>2009-11-23 20:21:00 +0000
committerspeleo3 <speleo3@users.sourceforge.net>2009-11-23 20:21:00 +0000
commitca042d328590b13696c0cef7494690ebb904cb35 (patch)
tree0daf7e292be5ecf0625d0bc97de03a4844fabaeb /src/marker.cpp
parentfix bug 427267, single dots inside transformed groups misplaced (diff)
downloadinkscape-ca042d328590b13696c0cef7494690ebb904cb35.tar.gz
inkscape-ca042d328590b13696c0cef7494690ebb904cb35.zip
fix bug 168663, marker shifted wrong by viewBox
(bzr r8836)
Diffstat (limited to 'src/marker.cpp')
-rw-r--r--src/marker.cpp19
1 files changed, 3 insertions, 16 deletions
diff --git a/src/marker.cpp b/src/marker.cpp
index c66acc192..e4c2e0c30 100644
--- a/src/marker.cpp
+++ b/src/marker.cpp
@@ -440,22 +440,9 @@ sp_marker_update (SPObject *object, SPCtx *ctx, guint flags)
}
}
- {
- Geom::Matrix q;
- /* Compose additional transformation from scale and position */
- q[0] = width / vb.width();
- q[1] = 0.0;
- q[2] = 0.0;
- q[3] = height / vb.height();
- q[4] = -vb.min()[Geom::X] * q[0] + x;
- q[5] = -vb.min()[Geom::Y] * q[3] + y;
- /* Append viewbox transformation */
- marker->c2p = q * marker->c2p;
- }
-
- /* Append reference translation */
- /* fixme: lala (Lauris) */
- marker->c2p = Geom::Translate(-marker->refX.computed, -marker->refY.computed) * marker->c2p;
+ // viewbox transformation and reference translation
+ marker->c2p = Geom::Translate(-marker->refX.computed, -marker->refY.computed) *
+ Geom::Scale(width / vb.width(), height / vb.height());
rctx.i2doc = marker->c2p * rctx.i2doc;