[librsvg: 43/95] gradient/pattern.rs: Don't export functions that are only used from Rust
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg: 43/95] gradient/pattern.rs: Don't export functions that are only used from Rust
- Date: Thu, 22 Feb 2018 03:16:45 +0000 (UTC)
commit 3f8e1a6e4059feb6496577dcc187e01e28c68cc6
Author: Federico Mena Quintero <federico gnome org>
Date: Tue Feb 20 14:48:03 2018 -0600
gradient/pattern.rs: Don't export functions that are only used from Rust
rust/src/gradient.rs | 9 ++++-----
rust/src/lib.rs | 2 --
rust/src/paint_server.rs | 8 ++++----
rust/src/pattern.rs | 7 +++----
4 files changed, 11 insertions(+), 15 deletions(-)
---
diff --git a/rust/src/gradient.rs b/rust/src/gradient.rs
index 6d7f75e5..42d18386 100644
--- a/rust/src/gradient.rs
+++ b/rust/src/gradient.rs
@@ -701,11 +701,10 @@ fn resolve_fallbacks_and_set_pattern (gradient: &Gradient,
set_pattern_on_draw_context (&resolved, draw_ctx, opacity, &bbox)
}
-#[no_mangle]
-pub extern fn gradient_resolve_fallbacks_and_set_pattern (raw_node: *const RsvgNode,
- draw_ctx: *mut RsvgDrawingCtx,
- opacity: u8,
- bbox: RsvgBbox) -> glib_sys::gboolean {
+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 };
diff --git a/rust/src/lib.rs b/rust/src/lib.rs
index 0179834a..e49dd2f2 100644
--- a/rust/src/lib.rs
+++ b/rust/src/lib.rs
@@ -57,7 +57,6 @@ pub use color::{
pub use gradient::{
rsvg_node_linear_gradient_new,
rsvg_node_radial_gradient_new,
- gradient_resolve_fallbacks_and_set_pattern
};
pub use length::{
@@ -127,7 +126,6 @@ pub use path_builder::{
pub use pattern::{
rsvg_node_pattern_new,
- pattern_resolve_fallbacks_and_set_pattern,
};
pub use property_bag::{
diff --git a/rust/src/paint_server.rs b/rust/src/paint_server.rs
index b83003b0..f00499f1 100644
--- a/rust/src/paint_server.rs
+++ b/rust/src/paint_server.rs
@@ -11,10 +11,10 @@ use bbox::RsvgBbox;
use color::Color;
use drawing_ctx;
use error::*;
-use gradient::gradient_resolve_fallbacks_and_set_pattern;
+use gradient;
use node::NodeType;
use parsers::{Parse, ParseError};
-use pattern::pattern_resolve_fallbacks_and_set_pattern;
+use pattern;
use util::utf8_cstr;
#[derive(Debug, Copy, Clone, PartialEq)]
@@ -229,14 +229,14 @@ pub extern "C" fn _set_source_rsvg_paint_server(
if node.get_type() == NodeType::LinearGradient ||
node.get_type() == NodeType::RadialGradient
{
- had_paint_server = gradient_resolve_fallbacks_and_set_pattern(
+ had_paint_server = gradient::gradient_resolve_fallbacks_and_set_pattern(
node_ptr,
c_ctx,
opacity,
c_bbox,
).to_bool();
} else if node.get_type() == NodeType::Pattern {
- had_paint_server = pattern_resolve_fallbacks_and_set_pattern(node_ptr, c_ctx,
c_bbox).to_bool();
+ had_paint_server = pattern::pattern_resolve_fallbacks_and_set_pattern(node_ptr, c_ctx,
c_bbox).to_bool();
}
}
diff --git a/rust/src/pattern.rs b/rust/src/pattern.rs
index c0223e36..976d4669 100644
--- a/rust/src/pattern.rs
+++ b/rust/src/pattern.rs
@@ -484,10 +484,9 @@ pub extern fn rsvg_node_pattern_new (_: *const libc::c_char, raw_parent: *const
Box::new (NodePattern::new ()))
}
-#[no_mangle]
-pub extern fn pattern_resolve_fallbacks_and_set_pattern (raw_node: *const RsvgNode,
- draw_ctx: *mut RsvgDrawingCtx,
- bbox: RsvgBbox) -> glib_sys::gboolean {
+pub fn pattern_resolve_fallbacks_and_set_pattern (raw_node: *const RsvgNode,
+ draw_ctx: *mut RsvgDrawingCtx,
+ bbox: RsvgBbox) -> glib_sys::gboolean {
assert! (!raw_node.is_null ());
let node: &RsvgNode = unsafe { & *raw_node };
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]