diff options
| author | Markus Engel <markus.engel@tum.de> | 2013-04-20 21:21:33 +0000 |
|---|---|---|
| committer | Markus Engel <markus.engel@tum.de> | 2013-04-20 21:21:33 +0000 |
| commit | 39580f4b417374ccba9d504f028388b2a2932506 (patch) | |
| tree | a4337231a1b27403dceb49810ea618297ed0b659 /src/display | |
| parent | Merging of EventContext classes complete. (diff) | |
| parent | Group bbox update (Bug 1168979) (diff) | |
| download | inkscape-39580f4b417374ccba9d504f028388b2a2932506.tar.gz inkscape-39580f4b417374ccba9d504f028388b2a2932506.zip | |
merged from trunk (r12287)
(bzr r11608.1.99)
Diffstat (limited to 'src/display')
| -rw-r--r-- | src/display/cairo-utils.h | 2 | ||||
| -rw-r--r-- | src/display/drawing-image.cpp | 7 | ||||
| -rw-r--r-- | src/display/nr-style.cpp | 2 | ||||
| -rw-r--r-- | src/display/nr-style.h | 2 |
4 files changed, 10 insertions, 3 deletions
diff --git a/src/display/cairo-utils.h b/src/display/cairo-utils.h index 2596cd969..016f72d00 100644 --- a/src/display/cairo-utils.h +++ b/src/display/cairo-utils.h @@ -203,4 +203,4 @@ inline guint AssembleARGB32(guint32 a, guint32 r, guint32 g, guint32 b) fill-column:99 End: */ -// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 : +// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 : diff --git a/src/display/drawing-image.cpp b/src/display/drawing-image.cpp index 3f1a86ee7..753249e60 100644 --- a/src/display/drawing-image.cpp +++ b/src/display/drawing-image.cpp @@ -121,6 +121,13 @@ unsigned DrawingImage::_renderItem(DrawingContext &ct, Geom::IntRect const &/*ar if (!outline) { if (!_pixbuf) return RENDER_OK; + // if (_style) { + // _style->image_rendering.computed + // See: http://www.w3.org/TR/SVG/painting.html#ImageRenderingProperty + // http://www.w3.org/TR/css4-images/#the-image-rendering + // style.h/style.cpp + // } + Inkscape::DrawingContext::Save save(ct); ct.transform(_ctm); ct.newPath(); diff --git a/src/display/nr-style.cpp b/src/display/nr-style.cpp index ba2340074..26d70ad15 100644 --- a/src/display/nr-style.cpp +++ b/src/display/nr-style.cpp @@ -220,4 +220,4 @@ void NRStyle::update() fill-column:99 End: */ -// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 : +// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 : diff --git a/src/display/nr-style.h b/src/display/nr-style.h index 80547c43e..cd0bd208f 100644 --- a/src/display/nr-style.h +++ b/src/display/nr-style.h @@ -81,4 +81,4 @@ struct NRStyle { fill-column:99 End: */ -// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 : +// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 : |