[librsvg: 2/15] Rename CairoRenderer::render_to_viewport -> ::render_document
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg: 2/15] Rename CairoRenderer::render_to_viewport -> ::render_document
- Date: Tue, 30 Jul 2019 17:32:25 +0000 (UTC)
commit e925f5ea89a19d25164b708bf01a2cc461984338
Author: Federico Mena Quintero <federico gnome org>
Date: Thu Jul 25 11:55:22 2019 -0500
Rename CairoRenderer::render_to_viewport -> ::render_document
We are going to have viewports in all the rendering API calls, so it
is not necessary to have the "viewport" word in the function name.
librsvg_crate/examples/proportional.rs | 2 +-
librsvg_crate/examples/render_to_file.rs | 2 +-
librsvg_crate/src/lib.rs | 4 ++--
librsvg_crate/tests/primitives.rs | 16 ++++++++--------
librsvg_crate/tests/render_to_viewport.rs | 12 ++++++------
librsvg_crate/tests/utils/mod.rs | 4 ++--
rsvg_internals/src/handle.rs | 2 +-
7 files changed, 21 insertions(+), 21 deletions(-)
---
diff --git a/librsvg_crate/examples/proportional.rs b/librsvg_crate/examples/proportional.rs
index 6c4480fd..da5a095e 100644
--- a/librsvg_crate/examples/proportional.rs
+++ b/librsvg_crate/examples/proportional.rs
@@ -34,7 +34,7 @@ fn main() {
let surface = cairo::ImageSurface::create(cairo::Format::ARgb32, width, height).unwrap();
let cr = cairo::Context::new(&surface);
renderer
- .render_to_viewport(
+ .render_document(
&cr,
&cairo::Rectangle {
x: 0.0,
diff --git a/librsvg_crate/examples/render_to_file.rs b/librsvg_crate/examples/render_to_file.rs
index 9d57b747..b7533d20 100644
--- a/librsvg_crate/examples/render_to_file.rs
+++ b/librsvg_crate/examples/render_to_file.rs
@@ -13,7 +13,7 @@ fn main() {
let surface = cairo::SvgSurface::new(width, height, output);
let cr = cairo::Context::new(&surface);
renderer
- .render_to_viewport(
+ .render_document(
&cr,
&cairo::Rectangle {
x: 0.0,
diff --git a/librsvg_crate/src/lib.rs b/librsvg_crate/src/lib.rs
index d150f9ef..09ae7e71 100644
--- a/librsvg_crate/src/lib.rs
+++ b/librsvg_crate/src/lib.rs
@@ -409,12 +409,12 @@ impl<'a> CairoRenderer<'a> {
.map(|(i, l)| (i.into(), l.into()))
}
- pub fn render_to_viewport(
+ pub fn render_document(
&self,
cr: &cairo::Context,
viewport: &cairo::Rectangle,
) -> Result<(), RenderingError> {
- self.handle.0.render_to_viewport(cr, viewport, self.dpi, false)
+ self.handle.0.render_document(cr, viewport, self.dpi, false)
}
pub fn render_element_to_viewport(
diff --git a/librsvg_crate/tests/primitives.rs b/librsvg_crate/tests/primitives.rs
index c3941292..4ff262e4 100644
--- a/librsvg_crate/tests/primitives.rs
+++ b/librsvg_crate/tests/primitives.rs
@@ -4,7 +4,7 @@ mod utils;
use rsvg_internals::surface_utils::shared_surface::{SharedImageSurface, SurfaceType};
-use self::utils::{compare_to_surface, load_svg, render_to_viewport, SurfaceSize};
+use self::utils::{compare_to_surface, load_svg, render_document, SurfaceSize};
#[test]
fn simple_opacity_with_transform() {
@@ -18,7 +18,7 @@ fn simple_opacity_with_transform() {
"#,
);
- let output_surf = render_to_viewport(
+ let output_surf = render_document(
&svg,
SurfaceSize(150, 150),
|cr| cr.translate(50.0, 50.0),
@@ -63,7 +63,7 @@ fn simple_opacity_with_offset_viewport() {
"#,
);
- let output_surf = render_to_viewport(
+ let output_surf = render_document(
&svg,
SurfaceSize(150, 150),
|_cr| (),
@@ -109,7 +109,7 @@ fn simple_opacity_with_scale() {
"#,
);
- let output_surf = render_to_viewport(
+ let output_surf = render_document(
&svg,
SurfaceSize(500, 500),
|cr| {
@@ -162,7 +162,7 @@ fn markers_with_scale() {
"#,
);
- let output_surf = render_to_viewport(
+ let output_surf = render_document(
&svg,
SurfaceSize(800, 800),
|cr| {
@@ -220,7 +220,7 @@ fn opacity_inside_transformed_group() {
"#,
);
- let output_surf = render_to_viewport(
+ let output_surf = render_document(
&svg,
SurfaceSize(140, 140),
|cr| cr.translate(20.0, 20.0),
@@ -270,7 +270,7 @@ fn compound_opacity() {
"##,
);
- let output_surf = render_to_viewport(
+ let output_surf = render_document(
&svg,
SurfaceSize(500, 380),
|cr| cr.translate(10.0, 10.0),
@@ -340,7 +340,7 @@ fn nested_masks() {
"##,
);
- let output_surf = render_to_viewport(
+ let output_surf = render_document(
&svg,
SurfaceSize(321 + 20, 27 + 20),
|cr| cr.translate(10.0, 10.0),
diff --git a/librsvg_crate/tests/render_to_viewport.rs b/librsvg_crate/tests/render_to_viewport.rs
index 518a90ef..4338c7ec 100644
--- a/librsvg_crate/tests/render_to_viewport.rs
+++ b/librsvg_crate/tests/render_to_viewport.rs
@@ -4,7 +4,7 @@ mod utils;
use rsvg_internals::surface_utils::shared_surface::{SharedImageSurface, SurfaceType};
-use self::utils::{compare_to_surface, load_svg, render_to_viewport, SurfaceSize};
+use self::utils::{compare_to_surface, load_svg, render_document, SurfaceSize};
#[test]
fn render_to_viewport_with_different_size() {
@@ -16,7 +16,7 @@ fn render_to_viewport_with_different_size() {
"#,
);
- let output_surf = render_to_viewport(
+ let output_surf = render_document(
&svg,
SurfaceSize(128, 128),
|_cr| (),
@@ -60,7 +60,7 @@ fn render_to_offsetted_viewport() {
"#,
);
- let output_surf = render_to_viewport(
+ let output_surf = render_document(
&svg,
SurfaceSize(100, 100),
|_cr| (),
@@ -102,7 +102,7 @@ fn render_to_viewport_with_transform() {
"#,
);
- let output_surf = render_to_viewport(
+ let output_surf = render_document(
&svg,
SurfaceSize(100, 100),
|cr| cr.translate(10.0, 20.0),
@@ -155,7 +155,7 @@ fn clip_on_transformed_viewport() {
"##,
);
- let output_surf = render_to_viewport(
+ let output_surf = render_document(
&svg,
SurfaceSize(200, 200),
|cr| cr.translate(50.0, 50.0),
@@ -224,7 +224,7 @@ fn mask_on_transformed_viewport() {
"##,
);
- let output_surf = render_to_viewport(
+ let output_surf = render_document(
&svg,
SurfaceSize(200, 200),
|cr| cr.translate(50.0, 50.0),
diff --git a/librsvg_crate/tests/utils/mod.rs b/librsvg_crate/tests/utils/mod.rs
index 1f09ea91..f54a0ab8 100644
--- a/librsvg_crate/tests/utils/mod.rs
+++ b/librsvg_crate/tests/utils/mod.rs
@@ -28,7 +28,7 @@ pub fn load_svg(input: &'static [u8]) -> SvgHandle {
#[derive(Copy, Clone)]
pub struct SurfaceSize(pub i32, pub i32);
-pub fn render_to_viewport<F: FnOnce(&cairo::Context)>(
+pub fn render_document<F: FnOnce(&cairo::Context)>(
svg: &SvgHandle,
surface_size: SurfaceSize,
cr_transform: F,
@@ -43,7 +43,7 @@ pub fn render_to_viewport<F: FnOnce(&cairo::Context)>(
let res = {
let cr = cairo::Context::new(&output);
cr_transform(&cr);
- Ok(renderer.render_to_viewport(&cr, &viewport)?)
+ Ok(renderer.render_document(&cr, &viewport)?)
};
res.and_then(|_| Ok(SharedImageSurface::new(output, SurfaceType::SRgb)?))
diff --git a/rsvg_internals/src/handle.rs b/rsvg_internals/src/handle.rs
index 78a7b2a1..b39806e9 100644
--- a/rsvg_internals/src/handle.rs
+++ b/rsvg_internals/src/handle.rs
@@ -323,7 +323,7 @@ impl Handle {
self.render_element_to_viewport(cr, id, &viewport, dpi, is_testing)
}
- pub fn render_to_viewport(
+ pub fn render_document(
&self,
cr: &cairo::Context,
viewport: &cairo::Rectangle,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]