diff options
| author | Tavmjong Bah <tavmjong@free.fr> | 2014-02-06 14:29:15 +0000 |
|---|---|---|
| committer | tavmjong-free <tavmjong@free.fr> | 2014-02-06 14:29:15 +0000 |
| commit | 7dd239eed97761b22ef635b6896a8f65c4939462 (patch) | |
| tree | a9c4eb95e2ae1356cd584151683dc9373e4f1140 /src/sp-image.h | |
| parent | Extensions->Render submenu. Scaling of input parameters into document units, ... (diff) | |
| download | inkscape-7dd239eed97761b22ef635b6896a8f65c4939462.tar.gz inkscape-7dd239eed97761b22ef635b6896a8f65c4939462.zip | |
Added new base class to handle viewBox and preserveAspectRatio.
Updated sp-root, sp-symbol, sp-image, sp-pattern, marker to use new class.
Fixed some viewport issues when % used.
(bzr r13002)
Diffstat (limited to 'src/sp-image.h')
| -rw-r--r-- | src/sp-image.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/sp-image.h b/src/sp-image.h index 3b7208487..50eb731d7 100644 --- a/src/sp-image.h +++ b/src/sp-image.h @@ -18,6 +18,7 @@ #include <glibmm/ustring.h> #include "svg/svg-length.h" #include "sp-shape.h" +#include "viewbox.h" #define SP_IMAGE(obj) (dynamic_cast<SPImage*>((SPObject*)obj)) #define SP_IS_IMAGE(obj) (dynamic_cast<const SPImage*>((SPObject*)obj) != NULL) @@ -25,7 +26,7 @@ #define SP_IMAGE_HREF_MODIFIED_FLAG SP_OBJECT_USER_MODIFIED_FLAG_A namespace Inkscape { class Pixbuf; } -class SPImage : public SPItem { +class SPImage : public SPItem, public SPViewBox { public: SPImage(); virtual ~SPImage(); @@ -39,13 +40,6 @@ public: double sx, sy; double ox, oy; - // Added by EAF - /* preserveAspectRatio */ - unsigned int aspect_align : 4; - unsigned int aspect_clip : 1; - //int trimx, trimy, trimwidth, trimheight; - //double viewx, viewy, viewwidth, viewheight; - SPCurve *curve; // This curve is at the image's boundary for snapping gchar *href; @@ -69,6 +63,10 @@ public: virtual Inkscape::DrawingItem* show(Inkscape::Drawing &drawing, unsigned int key, unsigned int flags); virtual void snappoints(std::vector<Inkscape::SnapCandidatePoint> &p, Inkscape::SnapPreferences const *snapprefs) const; virtual Geom::Affine set_transform(Geom::Affine const &transform); + +#if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) + void apply_profile(Inkscape::Pixbuf *pixbuf); +#endif // defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) }; /* Return duplicate of curve or NULL */ |