summaryrefslogtreecommitdiffstats
path: root/src/sp-pattern.h
diff options
context:
space:
mode:
authorKrzysztof Kosi??ski <tweenk.pl@gmail.com>2011-04-07 23:42:04 +0000
committerKrzysztof KosiƄski <tweenk.pl@gmail.com>2011-04-07 23:42:04 +0000
commit945ce419c806c73d70203dec33ececafbe108a92 (patch)
treecfcdb59bf47e9db7f9e01f7eebb59924bdeaea94 /src/sp-pattern.h
parentMerge from trunk (again) (diff)
parentExtensions. SVG+media fix (see Bug #400356). (diff)
downloadinkscape-945ce419c806c73d70203dec33ececafbe108a92.tar.gz
inkscape-945ce419c806c73d70203dec33ececafbe108a92.zip
Merge from trunk
(bzr r9508.1.73)
Diffstat (limited to 'src/sp-pattern.h')
-rw-r--r--src/sp-pattern.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/sp-pattern.h b/src/sp-pattern.h
index 6ed7a1482..52f3859a6 100644
--- a/src/sp-pattern.h
+++ b/src/sp-pattern.h
@@ -32,6 +32,7 @@ class SPPatternClass;
#include "sp-paint-server.h"
#include "uri-references.h"
+#include <stddef.h>
#include <sigc++/connection.h>
class SPPatternReference : public Inkscape::URIReference {
@@ -63,7 +64,7 @@ struct SPPattern : public SPPaintServer {
guint patternContentUnits : 1;
guint patternContentUnits_set : 1;
/* patternTransform attribute */
- Geom::Matrix patternTransform;
+ Geom::Affine patternTransform;
guint patternTransform_set : 1;
/* Tile rectangle */
SVGLength x;
@@ -84,15 +85,15 @@ struct SPPatternClass {
guint pattern_users (SPPattern *pattern);
SPPattern *pattern_chain (SPPattern *pattern);
SPPattern *sp_pattern_clone_if_necessary (SPItem *item, SPPattern *pattern, const gchar *property);
-void sp_pattern_transform_multiply (SPPattern *pattern, Geom::Matrix postmul, bool set);
+void sp_pattern_transform_multiply (SPPattern *pattern, Geom::Affine postmul, bool set);
-const gchar *pattern_tile (GSList *reprs, Geom::Rect bounds, SPDocument *document, Geom::Matrix transform, Geom::Matrix move);
+const gchar *pattern_tile (GSList *reprs, Geom::Rect bounds, SPDocument *document, Geom::Affine transform, Geom::Affine move);
SPPattern *pattern_getroot (SPPattern *pat);
guint pattern_patternUnits (SPPattern *pat);
guint pattern_patternContentUnits (SPPattern *pat);
-Geom::Matrix const &pattern_patternTransform(SPPattern const *pat);
+Geom::Affine const &pattern_patternTransform(SPPattern const *pat);
gdouble pattern_x (SPPattern *pat);
gdouble pattern_y (SPPattern *pat);
gdouble pattern_width (SPPattern *pat);