[librsvg/alatiera/is-a-stream] (446): Accept IsA<InputStream> instead of &InputStream wherever possible
- From: Jordan Petridis <jpetridis src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg/alatiera/is-a-stream] (446): Accept IsA<InputStream> instead of &InputStream wherever possible
- Date: Tue, 19 Mar 2019 18:46:09 +0000 (UTC)
commit 0e848451f980a876d504b25cbd282368ba5a9fd1
Author: Jordan Petridis <jpetridis gnome org>
Date: Sat Mar 16 17:47:34 2019 +0200
(446): Accept IsA<InputStream> instead of &InputStream wherever possible
This should allow for a more flexible api and avoid the need of
casting before using it.
Close #446
librsvg_crate/Cargo.toml | 2 +-
librsvg_crate/examples/render_to_file.rs | 32 +++
librsvg_crate/org.gnome.Epiphany.svg | 386 ++++++++++++++++++++++++++++
librsvg_crate/src/lib.rs | 9 +-
librsvg_crate/tests/intrinsic-dimensions.rs | 9 +-
librsvg_crate/tests/render_to_viewport.rs | 9 +-
rsvg_internals/src/c_api.rs | 4 +-
rsvg_internals/src/handle.rs | 14 +-
rsvg_internals/src/svg.rs | 5 +-
rsvg_internals/src/xml.rs | 2 +-
rsvg_internals/src/xml2_load.rs | 23 +-
11 files changed, 454 insertions(+), 41 deletions(-)
---
diff --git a/librsvg_crate/Cargo.toml b/librsvg_crate/Cargo.toml
index 14dea355..c4dc0a49 100644
--- a/librsvg_crate/Cargo.toml
+++ b/librsvg_crate/Cargo.toml
@@ -16,7 +16,7 @@ gio = { version="0.6.0", features=["v2_48"] } # per configure.ac
rsvg_internals = { path = "../rsvg_internals" }
[dev-dependencies]
-cairo-rs = { version = "0.6.0", features = ["png"] }
+cairo-rs = { version = "0.6.0", features = ["png", "svg"] }
rsvg_internals = { path = "../rsvg_internals" }
[build-dependencies]
diff --git a/librsvg_crate/examples/render_to_file.rs b/librsvg_crate/examples/render_to_file.rs
new file mode 100644
index 00000000..42094b04
--- /dev/null
+++ b/librsvg_crate/examples/render_to_file.rs
@@ -0,0 +1,32 @@
+extern crate cairo;
+extern crate gio;
+extern crate glib;
+extern crate librsvg;
+
+fn main() {
+ let width = 96.0;
+ let height = 96.0;
+ let output = "output.svg";
+
+ let bytes = glib::Bytes::from_static(include_bytes!("../org.gnome.Epiphany.svg"));
+ let stream = gio::MemoryInputStream::new_from_bytes(&bytes);
+ let handle = librsvg::Loader::new()
+ .read_stream(&stream, None, None)
+ .unwrap();
+ let renderer = librsvg::CairoRenderer::new(&handle);
+
+ let surface = cairo::svg::File::new(width, height, output);
+ let cr = cairo::Context::new(&surface);
+ renderer
+ .render_element_to_viewport(
+ &cr,
+ None,
+ &cairo::Rectangle {
+ x: 0.0,
+ y: 0.0,
+ width,
+ height,
+ },
+ )
+ .unwrap();
+}
diff --git a/librsvg_crate/org.gnome.Epiphany.svg b/librsvg_crate/org.gnome.Epiphany.svg
new file mode 100644
index 00000000..f8ee5949
--- /dev/null
+++ b/librsvg_crate/org.gnome.Epiphany.svg
@@ -0,0 +1,386 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:xlink="http://www.w3.org/1999/xlink";
+ viewBox="0 0 128 128"
+ style="display:inline;enable-background:new"
+ version="1.0"
+ id="svg11300"
+ height="128"
+ width="128">
+ <title
+ id="title4162">Adwaita Icon Template</title>
+ <defs
+ id="defs3">
+ <linearGradient
+ id="linearGradient1062">
+ <stop
+ id="stop1056"
+ offset="0"
+ style="stop-color:#cee2f8;stop-opacity:1" />
+ <stop
+ style="stop-color:#98c1f1;stop-opacity:1"
+ offset="0.55168515"
+ id="stop1058" />
+ <stop
+ id="stop1060"
+ offset="1"
+ style="stop-color:#62a0ea;stop-opacity:1" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient1137">
+ <stop
+ style="stop-color:#62a0ea;stop-opacity:1"
+ offset="0"
+ id="stop1133" />
+ <stop
+ id="stop1139"
+ offset="0.55168515"
+ style="stop-color:#3584e4;stop-opacity:1" />
+ <stop
+ style="stop-color:#1a5fb4;stop-opacity:1"
+ offset="1"
+ id="stop1135" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient1494">
+ <stop
+ id="stop1490"
+ offset="0"
+ style="stop-color:#babdb6;stop-opacity:1;" />
+ <stop
+ id="stop1492"
+ offset="1"
+ style="stop-color:#babdb6;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ gradientUnits="userSpaceOnUse"
+ y2="20"
+ x2="280"
+ y1="172"
+ x1="280"
+ id="linearGradient1496"
+ xlink:href="#linearGradient1494" />
+ <clipPath
+ id="clipPath1113"
+ clipPathUnits="userSpaceOnUse">
+ <circle
+ r="52"
+ cy="236"
+ cx="64"
+ id="circle1115"
+
style="display:inline;opacity:1;fill:#3584e4;fill-opacity:1;stroke:none;stroke-width:0.0104912px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new"
/>
+ </clipPath>
+ <clipPath
+ id="clipPath987"
+ clipPathUnits="userSpaceOnUse">
+ <circle
+
style="display:inline;opacity:1;fill:#3584e4;fill-opacity:1;stroke:none;stroke-width:4.28571415;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new"
+ id="circle989"
+ cx="63.999996"
+ cy="236"
+ r="60" />
+ </clipPath>
+ <clipPath
+ id="clipPath1106"
+ clipPathUnits="userSpaceOnUse">
+ <g
+ id="g1112"
+ transform="matrix(0.26785714,0,0,0.26785714,-4.57143,224.21429)"
+ style="display:inline;fill:#f5c211;stroke-width:0.93333334;enable-background:new">
+ <circle
+ r="224"
+ cy="43.999989"
+ cx="256"
+ id="circle1108"
+
style="display:inline;opacity:1;fill:#f5c211;fill-opacity:1;stroke:none;stroke-width:0.04218px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new"
/>
+ <circle
+
style="display:inline;opacity:1;fill:#f5c211;fill-opacity:1;stroke:none;stroke-width:0.04218px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new"
+ id="circle1110"
+ cx="256"
+ cy="43.999989"
+ r="224" />
+ </g>
+ </clipPath>
+ <radialGradient
+ r="224"
+ fy="-46.416073"
+ fx="256"
+ cy="-46.416077"
+ cx="256"
+ gradientTransform="matrix(1.084457,0,0,1.1165135,-21.621005,6.2247781)"
+ gradientUnits="userSpaceOnUse"
+ id="radialGradient1131"
+ xlink:href="#linearGradient1137" />
+ <radialGradient
+ r="224"
+ fy="236.83044"
+ fx="46.510818"
+ cy="236.83043"
+ cx="46.510818"
+ gradientTransform="matrix(0.29041272,-7.8944831e-4,6.6501927e-4,0.24463927,50.335165,156.09876)"
+ gradientUnits="userSpaceOnUse"
+ id="radialGradient1054"
+ xlink:href="#linearGradient1062" />
+ <linearGradient
+ id="linearGradient8215">
+ <stop
+ id="stop8211"
+ offset="0"
+ style="stop-color:#ffffff;stop-opacity:1;" />
+ <stop
+ id="stop8213"
+ offset="1"
+ style="stop-color:#e4e4e4;stop-opacity:1" />
+ </linearGradient>
+ <radialGradient
+ xlink:href="#linearGradient8215"
+ r="9.125"
+ id="radialGradient4851-7-7"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(7.4290395,0,-8.2510486e-8,7.1212043,-87.91303,43.751587)"
+ fy="24.149399"
+ fx="17.81411"
+ cy="24.149399"
+ cx="17.81411" />
+ </defs>
+ <metadata
+ id="metadata4">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>GNOME Design Team</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <dc:source />
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/"; />
+ <dc:title>Adwaita Icon Template</dc:title>
+ <dc:subject>
+ <rdf:Bag />
+ </dc:subject>
+ <dc:date />
+ <dc:rights>
+ <cc:Agent>
+ <dc:title />
+ </cc:Agent>
+ </dc:rights>
+ <dc:publisher>
+ <cc:Agent>
+ <dc:title />
+ </cc:Agent>
+ </dc:publisher>
+ <dc:identifier />
+ <dc:relation />
+ <dc:language />
+ <dc:coverage />
+ <dc:description />
+ <dc:contributor>
+ <cc:Agent>
+ <dc:title />
+ </cc:Agent>
+ </dc:contributor>
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/";>
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction"; />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution"; />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice"; />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution"; />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks"; />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike"; />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ transform="translate(0,-172)"
+ style="display:inline"
+ id="layer1">
+ <g
+ style="display:inline"
+ id="layer9">
+ <g
+ style="fill:#1a5fb4"
+ transform="translate(0,2)"
+ id="g1119"
+ clip-path="url(#clipPath1113)" />
+ <path
+ d=""
+ cx="63"
+ cy="376.5"
+ rx="31"
+ ry="55"
+
style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#1a5fb4;stroke-width:1.99999976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new"
+ id="ellipse1344" />
+ <ellipse
+ r="11.99999"
+ cy="239.99995"
+ cx="64"
+ id="circle1005"
+
style="display:inline;opacity:1;fill:#d5d3cf;fill-opacity:1;stroke:none;stroke-width:0.29999983;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1.19999927,
0.59999964;stroke-dashoffset:0;stroke-opacity:1;enable-background:new" />
+ <path
+ id="path1018"
+ d="m 39.524811,179.21985 1.5e-4,1.99902 4.010843,-0.15924 0.0908,-1.99747 z"
+
style="fill:#2967b4;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
/>
+ <path
+ id="path1018-5"
+ d="m 4.1256471,230.11768 1.5e-4,1.99902 4.010843,-0.15924 0.0908,-1.99747 z"
+
style="display:inline;fill:#164e93;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"
/>
+ <g
+ style="display:inline;stroke-width:0.93333334;enable-background:new"
+ transform="matrix(0.26785714,0,0,0.26785714,-4.57143,224.21429)"
+ id="g912-6">
+ <circle
+ r="224"
+ cy="43.999989"
+ cx="256"
+ id="circle1036"
+
style="display:inline;opacity:1;fill:url(#radialGradient1131);fill-opacity:1;stroke:none;stroke-width:0.04218px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new"
/>
+ </g>
+ <path
+ id="path991"
+ d="m 38,176 v 4 l 10,8 v 8 l 8,8 h 4 v -4 l 6,-6 v -4 l 4,-4 v -10 z m -4,16 H 4 c 0,0
0.5090211,40.4419 0,40 l 20,18 v -6 l -4,-4 6,-6 h 4 l 4,4 0.12494,-8.4018 L 40,224 h 4 v -4 l 4,-4 v -6 L
43.727619,206.12499 34,206 v 8 h -4 l -4,-4 v -4 l 6,-6 h 6 v -4 z m 60,2 -6,6 v 4 h 6 v -2.14287 h 4 v
4.26786 L 96,208 H 86 v 4 h -4 v 6 h -8 v 8 h 10 v -4 h 8 v 2 l 4,4 h 2 v -2 l -2,-2 v -2 h 4 l 6,6 h 6 v 2 l
-2,2 h -4 l 18,18 V 194 H 96 Z m 12,38 H 94 l -2,-2 H 78 l -8,8 v 8 l 8,8 h 6 l 4,4 v 2 l 2,2 v 12 l 14,14 h
8 v -30 l 4,-4 v -8 l -10,-10 z m -2,-12 h 4 l 6,6 h -4 z m -74,28 -4,4 v 10 l 8.12494,8.14285 L 34,296 h 8 v
-8 l 6,-6 v -4 l 6,-6 v -4 l 4,-4 v -8 l -4,-4 h -8 l -4,-4 z"
+ clip-path="url(#clipPath987)"
+
style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.01129821px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:accumulate"
/>
+ <path
+ id="rect1096"
+ d="m 100,270 h 12 v 20 h -12 z"
+ clip-path="url(#clipPath1106)"
+
style="opacity:0.1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
/>
+ <path
+
style="fill:#144788;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 106,230 v 2 h 4 v -2 z"
+ id="path1028" />
+ <path
+
style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:url(#radialGradient1054);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.01129821px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:accumulate;font-variant-east_asian:normal"
+ clip-path="url(#clipPath987)"
+ d="m 38,176 v 4 l 10,8 v 8 l 8,8 h 4 v -4 l 6,-6 v -4 l 4,-4 v -10 z m -4,16 H 4 c 0,0
0.5090211,40.4419 0,40 l 20,18 v -6 l -4,-4 6,-6 h 4 l 4,4 0.12494,-8.4018 L 40,224 h 4 v -4 l 4,-4 v -6 L
43.727619,206.12499 34,206 v 8 h -4 l -4,-4 v -4 l 6,-6 h 6 v -4 z m 60,2 -6,6 v 4 h 6 v -2.14287 h 4 v
4.26786 L 96,208 H 86 v 4 h -4 v 6 h -8 v 8 h 10 v -4 h 8 v 2 l 4,4 h 2 v -2 l -2,-2 v -2 h 4 l 6,6 h 6 v 2 l
-2,2 h -4 l 18,18 V 194 H 96 Z m 12,38 H 94 l -2,-2 H 78 l -8,8 v 8 l 8,8 h 6 l 4,4 v 2 l 2,2 v 12 l 14,14 h
8 v -30 l 4,-4 v -8 l -10,-10 z m -2,-12 h 4 l 6,6 h -4 z m -74,28 -4,4 v 10 l 8.12494,8.14285 L 34,296 h 8 v
-8 l 6,-6 v -4 l 6,-6 v -4 l 4,-4 v -8 l -4,-4 h -8 l -4,-4 z"
+ id="path1310-2"
+ transform="translate(0,-2.0000017)" />
+ <rect
+ y="252"
+ x="78"
+ height="2"
+ width="6"
+ id="rect1072"
+
style="opacity:0.1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
/>
+ <rect
+
style="opacity:0.1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="rect1074"
+ width="4"
+ height="2"
+ x="26"
+ y="232" />
+ <rect
+ y="198"
+ x="32"
+ height="2"
+ width="6"
+ id="rect1076"
+
style="opacity:0.1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
/>
+ <rect
+ y="222"
+ x="40"
+ height="2"
+ width="4"
+ id="rect1078"
+
style="opacity:0.1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
/>
+ <rect
+ y="220"
+ x="96"
+ height="2"
+ width="4"
+ id="rect1082"
+
style="opacity:0.1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
/>
+ <rect
+
style="opacity:0.1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="rect1084"
+ width="2"
+ height="2"
+ x="96"
+ y="226" />
+ <rect
+
style="opacity:0.1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="rect1088"
+ width="6"
+ height="2"
+ x="106"
+ y="226" />
+ <rect
+
style="opacity:0.1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="rect1090"
+ width="4"
+ height="2"
+ x="94"
+ y="199.85713" />
+ <rect
+ y="202"
+ x="56"
+ height="2"
+ width="4"
+ id="rect1092"
+
style="opacity:0.1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
/>
+ <g
+ transform="matrix(0.33027944,0,0,0.33027944,-244.60018,98.024505)"
+ id="g6008">
+ <circle
+ r="36.270779"
+ cy="372.21783"
+ cx="883.60425"
+ id="path3066-4"
+
style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.66763006;fill:none;stroke:#ffffff;stroke-width:16.92636299;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
/>
+ <circle
+ r="68.971695"
+ cy="372.2179"
+ cx="883.60431"
+ id="path3941-2"
+
style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.66763006;fill:none;stroke:#ffffff;stroke-width:11.69271851;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
/>
+ <circle
+ r="103.1213"
+ cy="372.21796"
+ cx="883.60437"
+ id="path3943-0"
+
style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.66763006;fill:none;stroke:#ffffff;stroke-width:5.99500418;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
/>
+ </g>
+ <path
+ id="path3970-7-4-7"
+ transform="translate(0,172)"
+ d="M 47.589844 53.314453 L 9.9257812 89.869141 A 60 60 0 0 0 16.21875 100.20508 L 21.599609
100.37891 L 19.685547 104.35352 A 60 60 0 0 0 29.537109 113.07422 L 32.837891 105.64648 L 47.902344 121.73828
A 60 60 0 0 0 48.289062 121.83594 L 47.589844 53.314453 z "
+
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#12121c;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.01129821px;marker:none;enable-background:new;font-variant-east_asian:normal;opacity:0.3;vector-effect:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"
/>
+ <g
+ transform="translate(0,12)"
+ id="g6092">
+ <g
+ id="g6087">
+ <path
+
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient4851-7-7);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.80979562;marker:none;enable-background:new"
+ id="path3970-7-4"
+ d="m 47.589745,209.314 -47.7665216,46.36163 21.7759096,0.70244 c 0,0 -9.131831,18.96611
-9.131831,18.96611 -2.8097966,8.42939 9.834282,11.59041 11.941628,5.26838 0,0 8.42939,-18.96612
8.42939,-18.96612 l 15.453872,16.50755 z" />
+ <path
+ id="path6078"
+ transform="translate(0,172)"
+ d="M 47.589844,37.314453 47.34375,37.552734 16.185547,111.33398 c 3.147793,1.27683
7.120849,0.58472 8.222656,-2.7207 L 32.837891,89.646484 48.292969,106.1543 Z"
+
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#e4e6e8;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.80979562;marker:none;enable-background:new"
/>
+ </g>
+ </g>
+ </g>
+ <g
+ style="fill:url(#linearGradient1496);fill-opacity:1"
+ id="g1480" />
+ </g>
+</svg>
diff --git a/librsvg_crate/src/lib.rs b/librsvg_crate/src/lib.rs
index 3f773d04..746f9c17 100644
--- a/librsvg_crate/src/lib.rs
+++ b/librsvg_crate/src/lib.rs
@@ -89,13 +89,12 @@
#![warn(unused)]
use cairo;
use gio;
-use glib;
+use glib::{self, prelude::*};
use rsvg_internals;
use std::path::Path;
use gio::{Cancellable, FileExt};
-use glib::object::Cast;
use rsvg_internals::{Dpi, Handle, LoadFlags};
@@ -262,7 +261,7 @@ impl Loader {
let stream = file.read(cancellable)?;
- self.read_stream(&stream.upcast(), Some(&file), cancellable_clone)
+ self.read_stream(&stream, Some(&file), cancellable_clone)
}
/// Reads an SVG stream from a `gio::InputStream`.
@@ -277,9 +276,9 @@ impl Loader {
/// URL where this SVG got loaded from.
///
/// The `cancellable` can be used to cancel loading from another thread.
- pub fn read_stream<'a, P: Into<Option<&'a Cancellable>>>(
+ pub fn read_stream<'a, P: Into<Option<&'a Cancellable>>, S: IsA<gio::InputStream>>(
self,
- stream: &gio::InputStream,
+ stream: &S,
base_file: Option<&gio::File>,
cancellable: P,
) -> Result<SvgHandle, LoadingError> {
diff --git a/librsvg_crate/tests/intrinsic-dimensions.rs b/librsvg_crate/tests/intrinsic-dimensions.rs
index f1f17ee3..ec4789f4 100644
--- a/librsvg_crate/tests/intrinsic-dimensions.rs
+++ b/librsvg_crate/tests/intrinsic-dimensions.rs
@@ -3,9 +3,6 @@ use gio;
use glib;
use librsvg;
-use gio::MemoryInputStreamExt;
-use glib::Cast;
-
use librsvg::{
CairoRenderer,
DefsLookupErrorKind,
@@ -19,11 +16,11 @@ use librsvg::{
};
fn load_svg(input: &'static [u8]) -> SvgHandle {
- let stream = gio::MemoryInputStream::new();
- stream.add_bytes(&glib::Bytes::from_static(input));
+ let bytes = glib::Bytes::from_static(input);
+ let stream = gio::MemoryInputStream::new_from_bytes(&bytes);
Loader::new()
- .read_stream(&stream.upcast(), None, None)
+ .read_stream(&stream, None, None)
.unwrap()
}
diff --git a/librsvg_crate/tests/render_to_viewport.rs b/librsvg_crate/tests/render_to_viewport.rs
index 2ad44e14..6a444392 100644
--- a/librsvg_crate/tests/render_to_viewport.rs
+++ b/librsvg_crate/tests/render_to_viewport.rs
@@ -4,9 +4,6 @@ use glib;
use librsvg;
use rsvg_internals;
-use gio::MemoryInputStreamExt;
-use glib::Cast;
-
use librsvg::{CairoRenderer, Loader, SvgHandle};
use std::fs::File;
@@ -20,11 +17,11 @@ mod compare_surfaces;
use crate::compare_surfaces::{compare_surfaces, BufferDiff};
fn load_svg(input: &'static [u8]) -> SvgHandle {
- let stream = gio::MemoryInputStream::new();
- stream.add_bytes(&glib::Bytes::from_static(input));
+ let bytes = glib::Bytes::from_static(input);
+ let stream = gio::MemoryInputStream::new_from_bytes(&bytes);
Loader::new()
- .read_stream(&stream.upcast(), None, None)
+ .read_stream(&stream, None, None)
.unwrap()
}
diff --git a/rsvg_internals/src/c_api.rs b/rsvg_internals/src/c_api.rs
index 1d45e1db..f184e42d 100644
--- a/rsvg_internals/src/c_api.rs
+++ b/rsvg_internals/src/c_api.rs
@@ -562,7 +562,7 @@ pub unsafe extern "C" fn rsvg_rust_handle_read_stream_sync(
panic!("handle must not be already loaded in order to call rsvg_handle_read_stream_sync()",);
}
- let stream = from_glib_none(stream);
+ let stream = gio::InputStream::from_glib_none(stream);
let cancellable: Option<gio::Cancellable> = from_glib_none(cancellable);
match rhandle.read_stream_sync(&stream, cancellable.as_ref()) {
@@ -835,7 +835,7 @@ pub unsafe extern "C" fn rsvg_rust_handle_new_from_stream_sync(
let rhandle = get_rust_handle(raw_handle);
let base_file: Option<gio::File> = from_glib_none(base_file);
- let stream = from_glib_none(input_stream);
+ let stream: gio::InputStream = from_glib_none(input_stream);
let cancellable: Option<gio::Cancellable> = from_glib_none(cancellable);
match rhandle.construct_read_stream_sync(&stream, base_file.as_ref(), cancellable.as_ref()) {
diff --git a/rsvg_internals/src/handle.rs b/rsvg_internals/src/handle.rs
index 825ea364..e1dcc4b6 100644
--- a/rsvg_internals/src/handle.rs
+++ b/rsvg_internals/src/handle.rs
@@ -6,7 +6,7 @@ use std::rc::Rc;
use cairo::{self, ImageSurface, Status};
use gdk_pixbuf::Pixbuf;
use gio::{self, FileExt};
-use glib::{self, Bytes, Cast};
+use glib::{self, Bytes, IsA};
use glib_sys;
use libc;
use locale_config::{LanguageRange, Locale};
@@ -199,9 +199,9 @@ impl Handle {
};
}
- pub fn read_stream_sync(
+ pub fn read_stream_sync<S: IsA<gio::InputStream>>(
&self,
- stream: &gio::InputStream,
+ stream: &S,
cancellable: Option<&gio::Cancellable>,
) -> Result<(), LoadingError> {
self.load_state.set(LoadState::Loading);
@@ -275,7 +275,7 @@ impl Handle {
let bytes = Bytes::from(&*buffer);
let stream = gio::MemoryInputStream::new_from_bytes(&bytes);
- self.read_stream_sync(&stream.upcast(), None)
+ self.read_stream_sync(&stream, None)
}
LoadState::ClosedOk | LoadState::ClosedError => {
@@ -637,12 +637,12 @@ impl Handle {
cancellable: Option<&gio::Cancellable>,
) -> Result<(), LoadingError> {
let stream = file.read(cancellable)?;
- self.construct_read_stream_sync(&stream.upcast(), Some(file), cancellable)
+ self.construct_read_stream_sync(&stream, Some(file), cancellable)
}
- pub fn construct_read_stream_sync(
+ pub fn construct_read_stream_sync<S: IsA<gio::InputStream>>(
&self,
- stream: &gio::InputStream,
+ stream: &S,
base_file: Option<&gio::File>,
cancellable: Option<&gio::Cancellable>,
) -> Result<(), LoadingError> {
diff --git a/rsvg_internals/src/svg.rs b/rsvg_internals/src/svg.rs
index e8cba642..6a1c09fe 100644
--- a/rsvg_internals/src/svg.rs
+++ b/rsvg_internals/src/svg.rs
@@ -1,5 +1,6 @@
use gdk_pixbuf::{PixbufLoader, PixbufLoaderExt};
use gio;
+use glib::IsA;
use std::cell::RefCell;
use std::collections::hash_map::Entry;
use std::collections::HashMap;
@@ -49,9 +50,9 @@ impl Svg {
}
}
- pub fn load_from_stream(
+ pub fn load_from_stream<S: IsA<gio::InputStream>>(
load_options: &LoadOptions,
- stream: &gio::InputStream,
+ stream: &S,
cancellable: Option<&gio::Cancellable>,
) -> Result<Svg, LoadingError> {
let load_flags = load_options.flags;
diff --git a/rsvg_internals/src/xml.rs b/rsvg_internals/src/xml.rs
index 55d46184..3e503189 100644
--- a/rsvg_internals/src/xml.rs
+++ b/rsvg_internals/src/xml.rs
@@ -478,7 +478,7 @@ impl XmlState {
let flags = self.load_options.flags;
// FIXME: pass a cancellable
- xml_state_parse_from_stream(self, flags, stream, None).map_err(|e| match e {
+ xml_state_parse_from_stream(self, flags, &stream, None).map_err(|e| match e {
ParseFromStreamError::CouldNotCreateXmlParser => AcquireError::FatalError,
ParseFromStreamError::IoError(_) => AcquireError::ResourceError,
ParseFromStreamError::XmlParseError(_) => AcquireError::FatalError,
diff --git a/rsvg_internals/src/xml2_load.rs b/rsvg_internals/src/xml2_load.rs
index 4e388405..d44bb129 100644
--- a/rsvg_internals/src/xml2_load.rs
+++ b/rsvg_internals/src/xml2_load.rs
@@ -3,6 +3,7 @@
use gio;
use gio::prelude::*;
+use glib::prelude::*;
use std::borrow::Cow;
use std::cell::RefCell;
use std::mem;
@@ -245,8 +246,8 @@ fn set_xml_parse_options(parser: xmlParserCtxtPtr, load_flags: LoadFlags) {
// is set; if it is, it means that there was an I/O error. Otherwise,
// there were no I/O errors but the caller must then ask libxml2 for
// XML parsing errors.
-struct StreamCtx {
- stream: gio::InputStream,
+struct StreamCtx<'a> {
+ stream: &'a gio::InputStream,
cancellable: Option<gio::Cancellable>,
gio_error: Rc<RefCell<Option<glib::Error>>>,
}
@@ -309,10 +310,10 @@ struct Xml2Parser {
}
impl Xml2Parser {
- fn from_stream(
+ fn from_stream<S: IsA<gio::InputStream>>(
xml: &mut XmlState,
load_flags: LoadFlags,
- stream: gio::InputStream,
+ stream: &S,
cancellable: Option<&gio::Cancellable>,
) -> Result<Xml2Parser, ParseFromStreamError> {
// The Xml2Parser we end up creating, if
@@ -325,7 +326,7 @@ impl Xml2Parser {
let gio_error = Rc::new(RefCell::new(None));
let ctx = Box::new(StreamCtx {
- stream,
+ stream: stream.as_ref(),
cancellable: cancellable.map(|c| c.clone()),
gio_error: gio_error.clone(),
});
@@ -435,23 +436,23 @@ impl From<ParseFromStreamError> for LoadingError {
//
// This can be called "in the middle" of an XmlState's processing status,
// for example, when including another XML file via xi:include.
-pub fn xml_state_parse_from_stream(
+pub fn xml_state_parse_from_stream<S: IsA<gio::InputStream>>(
xml: &mut XmlState,
load_flags: LoadFlags,
- stream: gio::InputStream,
+ stream: &S,
cancellable: Option<&gio::Cancellable>,
) -> Result<(), ParseFromStreamError> {
Xml2Parser::from_stream(xml, load_flags, stream, cancellable).and_then(|parser| parser.parse())
}
-pub fn xml_state_load_from_possibly_compressed_stream(
+pub fn xml_state_load_from_possibly_compressed_stream<S: IsA<gio::InputStream>>(
xml: &mut XmlState,
load_flags: LoadFlags,
- stream: &gio::InputStream,
+ stream: &S,
cancellable: Option<&gio::Cancellable>,
) -> Result<(), ParseFromStreamError> {
- let stream = get_input_stream_for_loading(stream, cancellable)
+ let stream = get_input_stream_for_loading(stream.as_ref(), cancellable)
.map_err(|e| ParseFromStreamError::IoError(e))?;
- xml_state_parse_from_stream(xml, load_flags, stream, cancellable)
+ xml_state_parse_from_stream(xml, load_flags, &stream, cancellable)
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
