summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFederico Mena Quintero <federico@gnome.org>2023-01-30 16:33:29 -0600
committerFederico Mena Quintero <federico@gnome.org>2023-01-30 16:33:29 -0600
commitf00e76e493766f47e2f44e0dc688fd0b760f8982 (patch)
treee082d3f640a28ec000db65fa67fa6c38cc9b1eb9
parent6947b3b9409d14c3fcea64cf86a0141b04fe00da (diff)
downloadlibrsvg-f00e76e493766f47e2f44e0dc688fd0b760f8982.tar.gz
rsvg-bench.rs: Adapt to the new cairo crate API
Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/789>
-rw-r--r--src/bin/rsvg-bench.rs17
1 files changed, 6 insertions, 11 deletions
diff --git a/src/bin/rsvg-bench.rs b/src/bin/rsvg-bench.rs
index 82aae657..080887a8 100644
--- a/src/bin/rsvg-bench.rs
+++ b/src/bin/rsvg-bench.rs
@@ -53,15 +53,15 @@ enum LoadingError {
#[derive(Debug, Fail)]
enum ProcessingError {
#[fail(display = "Cairo error: {:?}", status)]
- CairoError { status: cairo::Status },
+ CairoError { error: cairo::Error },
#[fail(display = "Rendering error")]
RenderingError,
}
-impl From<cairo::Status> for ProcessingError {
- fn from(status: cairo::Status) -> ProcessingError {
- ProcessingError::CairoError { status: status }
+impl From<cairo::Error> for ProcessingError {
+ fn from(error: cairo::Error) -> ProcessingError {
+ ProcessingError::CairoError { error }
}
}
@@ -139,14 +139,9 @@ fn render_to_cairo(opt: &Opt, handle: &librsvg::SvgHandle) -> Result<(), Process
let renderer = librsvg::CairoRenderer::new(handle);
let surface = cairo::ImageSurface::create(cairo::Format::ARgb32, 100, 100)?;
- let cr = cairo::Context::new(&surface);
+ let cr = cairo::Context::new(&surface)?;
- let viewport = cairo::Rectangle {
- x: 0.0,
- y: 0.0,
- width: 100.0,
- height: 100.0,
- };
+ let viewport = cairo::Rectangle::new(0.0, 0.0, 100.0, 100.0);
match (opt.hard_failures, renderer.render_document(&cr, &viewport)) {
(_, Ok(_)) => Ok(()),