[librsvg: 4/14] Don't return an empty result in check_cairo_context
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg: 4/14] Don't return an empty result in check_cairo_context
- Date: Tue, 23 Mar 2021 19:57:56 +0000 (UTC)
commit ffaeb8b3ca64a79727d5bcdefafb60679bbb81c1
Author: Federico Mena Quintero <federico gnome org>
Date: Mon Mar 22 13:49:32 2021 -0600
Don't return an empty result in check_cairo_context
src/c_api/handle.rs | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/src/c_api/handle.rs b/src/c_api/handle.rs
index 78206073..f802db94 100644
--- a/src/c_api/handle.rs
+++ b/src/c_api/handle.rs
@@ -997,7 +997,7 @@ impl CHandle {
cr: &cairo::Context,
id: Option<&str>,
) -> Result<(), RenderingError> {
- check_cairo_context(cr)?;
+ let cr = check_cairo_context(cr)?;
let dimensions = self.get_dimensions_sub(None)?;
if dimensions.width == 0 || dimensions.height == 0 {
@@ -1043,7 +1043,7 @@ impl CHandle {
cr: &cairo::Context,
viewport: &cairo::Rectangle,
) -> Result<(), RenderingError> {
- check_cairo_context(cr)?;
+ let cr = check_cairo_context(cr)?;
let handle = self.get_handle_ref()?;
@@ -1070,7 +1070,7 @@ impl CHandle {
id: Option<&str>,
viewport: &cairo::Rectangle,
) -> Result<(), RenderingError> {
- check_cairo_context(cr)?;
+ let cr = check_cairo_context(cr)?;
let handle = self.get_handle_ref()?;
@@ -1098,7 +1098,7 @@ impl CHandle {
id: Option<&str>,
element_viewport: &cairo::Rectangle,
) -> Result<(), RenderingError> {
- check_cairo_context(cr)?;
+ let cr = check_cairo_context(cr)?;
let handle = self.get_handle_ref()?;
@@ -2178,10 +2178,10 @@ impl fmt::Display for PathOrUrl {
}
}
-fn check_cairo_context(cr: &cairo::Context) -> Result<(), RenderingError> {
+fn check_cairo_context(cr: &cairo::Context) -> Result<&cairo::Context, RenderingError> {
let status = cr.status();
if status == cairo::Status::Success {
- Ok(())
+ Ok(cr)
} else {
let msg = format!(
"cannot render on a cairo_t with a failure status (status={:?})",
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]