[librsvg: 45/95] gradient_resolve_fallbacks_and_set_pattern(): Use Rust types
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg: 45/95] gradient_resolve_fallbacks_and_set_pattern(): Use Rust types
- Date: Thu, 22 Feb 2018 03:16:55 +0000 (UTC)
commit 19396be85db5d60dd311f88b0a375877b4a54b87
Author: Federico Mena Quintero <federico gnome org>
Date: Tue Feb 20 14:55:18 2018 -0600
gradient_resolve_fallbacks_and_set_pattern(): Use Rust types
rust/src/gradient.rs | 15 +++++----------
rust/src/paint_server.rs | 4 ++--
2 files changed, 7 insertions(+), 12 deletions(-)
---
diff --git a/rust/src/gradient.rs b/rust/src/gradient.rs
index 42d18386..ba120174 100644
--- a/rust/src/gradient.rs
+++ b/rust/src/gradient.rs
@@ -1,6 +1,4 @@
use cairo;
-use glib_sys;
-use glib::translate::*;
use libc;
use std::cell::RefCell;
@@ -701,13 +699,10 @@ fn resolve_fallbacks_and_set_pattern (gradient: &Gradient,
set_pattern_on_draw_context (&resolved, draw_ctx, opacity, &bbox)
}
-pub fn gradient_resolve_fallbacks_and_set_pattern (raw_node: *const RsvgNode,
- draw_ctx: *mut RsvgDrawingCtx,
- opacity: u8,
- bbox: RsvgBbox) -> glib_sys::gboolean {
- assert! (!raw_node.is_null ());
- let node: &RsvgNode = unsafe { & *raw_node };
-
+pub fn gradient_resolve_fallbacks_and_set_pattern (node: &RsvgNode,
+ draw_ctx: *mut RsvgDrawingCtx,
+ opacity: u8,
+ bbox: RsvgBbox) -> bool {
assert! (node.get_type () == NodeType::LinearGradient || node.get_type () == NodeType::RadialGradient);
let mut did_set_gradient = false;
@@ -717,5 +712,5 @@ pub fn gradient_resolve_fallbacks_and_set_pattern (raw_node: *const RsvgNode
did_set_gradient = resolve_fallbacks_and_set_pattern (&gradient, draw_ctx, opacity, bbox);
});
- did_set_gradient.to_glib ()
+ did_set_gradient
}
diff --git a/rust/src/paint_server.rs b/rust/src/paint_server.rs
index a7ace81e..2c2f2441 100644
--- a/rust/src/paint_server.rs
+++ b/rust/src/paint_server.rs
@@ -230,11 +230,11 @@ pub extern "C" fn _set_source_rsvg_paint_server(
node.get_type() == NodeType::RadialGradient
{
had_paint_server = gradient::gradient_resolve_fallbacks_and_set_pattern(
- node_ptr,
+ node,
c_ctx,
opacity,
c_bbox,
- ).to_bool();
+ );
} else if node.get_type() == NodeType::Pattern {
had_paint_server = pattern::pattern_resolve_fallbacks_and_set_pattern(node, c_ctx,
c_bbox);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]