[librsvg: 11/13] Merge branch 'custom-css'
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg: 11/13] Merge branch 'custom-css'
- Date: Sat, 1 Feb 2020 13:25:04 +0000 (UTC)
commit e54ac7849284e833684ec5e880b3a433de1ca708
Merge: e04f4d7e a4298656
Author: Federico Mena Quintero <federico gnome org>
Date: Sat Feb 1 13:49:30 2020 +0100
Merge branch 'custom-css'
configure.ac | 4 ++--
librsvg/c_api.rs | 47 ++++++++++++++++++++++++++++++++++++++
librsvg/rsvg-handle.c | 39 +++++++++++++++++++++++++++++++
librsvg/rsvg.h | 6 +++++
librsvg_crate/src/lib.rs | 12 ++++++++++
librsvg_crate/tests/api.rs | 48 +++++++++++++++++++++++++++++++++++++++
rsvg-convert.1 | 3 +++
rsvg-convert.c | 20 ++++++++++++++++
rsvg_internals/src/css.rs | 6 ++---
rsvg_internals/src/document.rs | 26 ++++++++++++++++-----
rsvg_internals/src/drawing_ctx.rs | 20 ++++++++--------
rsvg_internals/src/handle.rs | 23 ++++++++++++-------
12 files changed, 225 insertions(+), 29 deletions(-)
---
diff --cc rsvg_internals/src/drawing_ctx.rs
index 5765c44c,46dfe4ef..bfebfbfa
--- a/rsvg_internals/src/drawing_ctx.rs
+++ b/rsvg_internals/src/drawing_ctx.rs
@@@ -85,10 -84,10 +85,10 @@@ pub enum ClipMode
ClipToVbox,
}
- pub struct DrawingCtx {
- document: Rc<Document>,
+ pub struct DrawingCtx<'i> {
+ document: &'i Document,
- initial_affine: cairo::Matrix,
+ initial_transform: Transform,
rect: Rect,
dpi: Dpi,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]