[librsvg: 2/6] paint_server: rename some methods
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg: 2/6] paint_server: rename some methods
- Date: Wed, 2 May 2018 20:22:07 +0000 (UTC)
commit 90d01c0bf26e3c7e8ec6da016fd02c5b483e5d44
Author: Paolo Borelli <pborelli gnome org>
Date: Tue May 1 14:08:43 2018 +0200
paint_server: rename some methods
rsvg_internals/src/draw.rs | 12 ++++++------
rsvg_internals/src/paint_server.rs | 13 ++++---------
2 files changed, 10 insertions(+), 15 deletions(-)
---
diff --git a/rsvg_internals/src/draw.rs b/rsvg_internals/src/draw.rs
index 88304c0f..89206454 100644
--- a/rsvg_internals/src/draw.rs
+++ b/rsvg_internals/src/draw.rs
@@ -85,7 +85,7 @@ fn stroke_and_fill(cr: &cairo::Context, draw_ctx: *mut RsvgDrawingCtx) {
.map_or_else(|| FillOpacity::default().0, |o| o.0);
let success = match rstate.fill {
- Some(Fill(ref fill)) => paint_server::_set_source_rsvg_paint_server(
+ Some(Fill(ref fill)) => paint_server::set_source_paint_server(
draw_ctx,
fill,
&fill_opacity,
@@ -93,7 +93,7 @@ fn stroke_and_fill(cr: &cairo::Context, draw_ctx: *mut RsvgDrawingCtx) {
¤t_color,
),
- _ => paint_server::_set_source_rsvg_paint_server(
+ _ => paint_server::set_source_paint_server(
draw_ctx,
&Fill::default().0,
&fill_opacity,
@@ -116,7 +116,7 @@ fn stroke_and_fill(cr: &cairo::Context, draw_ctx: *mut RsvgDrawingCtx) {
.map_or_else(|| StrokeOpacity::default().0, |o| o.0);
if let Some(Stroke(ref stroke)) = rstate.stroke {
- if paint_server::_set_source_rsvg_paint_server(
+ if paint_server::set_source_paint_server(
draw_ctx,
stroke,
&stroke_opacity,
@@ -425,7 +425,7 @@ pub fn draw_pango_layout(
if !clipping {
let success = match rstate.fill {
- Some(Fill(ref fill)) => paint_server::_set_source_rsvg_paint_server(
+ Some(Fill(ref fill)) => paint_server::set_source_paint_server(
draw_ctx,
fill,
&fill_opacity,
@@ -433,7 +433,7 @@ pub fn draw_pango_layout(
¤t_color,
),
- _ => paint_server::_set_source_rsvg_paint_server(
+ _ => paint_server::set_source_paint_server(
draw_ctx,
&Fill::default().0,
&fill_opacity,
@@ -457,7 +457,7 @@ pub fn draw_pango_layout(
if !clipping {
if let Some(Stroke(ref stroke)) = rstate.stroke {
- if paint_server::_set_source_rsvg_paint_server(
+ if paint_server::set_source_paint_server(
draw_ctx,
stroke,
&stroke_opacity,
diff --git a/rsvg_internals/src/paint_server.rs b/rsvg_internals/src/paint_server.rs
index dc91eb90..5bbd6396 100644
--- a/rsvg_internals/src/paint_server.rs
+++ b/rsvg_internals/src/paint_server.rs
@@ -52,7 +52,7 @@ impl Parse for PaintServer {
}
}
-fn _set_source_rsvg_solid_color(
+fn set_color(
ctx: *mut drawing_ctx::RsvgDrawingCtx,
color: &cssparser::Color,
opacity: &UnitInterval,
@@ -72,7 +72,7 @@ fn _set_source_rsvg_solid_color(
);
}
-pub fn _set_source_rsvg_paint_server(
+pub fn set_source_paint_server(
c_ctx: *mut drawing_ctx::RsvgDrawingCtx,
ps: &PaintServer,
opacity: &UnitInterval,
@@ -104,18 +104,13 @@ pub fn _set_source_rsvg_paint_server(
}
if !had_paint_server && alternate.is_some() {
- _set_source_rsvg_solid_color(
- c_ctx,
- alternate.as_ref().unwrap(),
- opacity,
- current_color,
- );
+ set_color(c_ctx, alternate.as_ref().unwrap(), opacity, current_color);
had_paint_server = true;
}
}
PaintServer::SolidColor(color) => {
- _set_source_rsvg_solid_color(c_ctx, &color, opacity, current_color);
+ set_color(c_ctx, &color, opacity, current_color);
had_paint_server = true;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]