[librsvg/bilelmoussaoui/new-gtk-rs-stack] tests: revert the cairo workaround in !627
- From: Bilal Elmoussaoui <bilelmoussaoui src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg/bilelmoussaoui/new-gtk-rs-stack] tests: revert the cairo workaround in !627
- Date: Mon, 15 Nov 2021 06:48:43 +0000 (UTC)
commit e93cefe53355495205471eeb8054049f75ee1ea2
Author: Bilal Elmoussaoui <bil elmoussaoui gmail com>
Date: Mon Nov 15 07:48:33 2021 +0100
tests: revert the cairo workaround in !627
as the issue was fixed upstream
tests/src/api.rs | 19 ++-----------------
1 file changed, 2 insertions(+), 17 deletions(-)
---
diff --git a/tests/src/api.rs b/tests/src/api.rs
index 6f219519..4d099ba4 100644
--- a/tests/src/api.rs
+++ b/tests/src/api.rs
@@ -1,5 +1,4 @@
use cairo;
-use libc;
use librsvg::surface_utils::shared_surface::{SharedImageSurface, SurfaceType};
use librsvg::{CairoRenderer, RenderingError};
@@ -221,20 +220,6 @@ fn set_stylesheet() {
.evaluate(&output_surf, "set_stylesheet");
}
-fn has_current_point(cr: &cairo::Context) -> bool {
- // https://github.com/gtk-rs/gtk-rs-core/issues/335
- //
- // cairo-rs-sys incorrectly declares cairo_bool_t as a repr(C)
- // struct; it needs to be repr(transparent). So, we'll call
- // has_current_point by hand.
-
- extern "C" {
- fn cairo_has_current_point(cr: *mut cairo::ffi::cairo_t) -> libc::c_int;
- }
-
- unsafe { cairo_has_current_point(cr.to_raw_none()) != 0 }
-}
-
// https://gitlab.gnome.org/GNOME/librsvg/-/issues/799
#[test]
fn text_doesnt_leave_points_in_current_path() {
@@ -252,7 +237,7 @@ fn text_doesnt_leave_points_in_current_path() {
let output = cairo::ImageSurface::create(cairo::Format::ARgb32, 100, 100).unwrap();
let cr = cairo::Context::new(&output).unwrap();
- assert!(!has_current_point(&cr));
+ assert!(!cr.has_current_point().unwrap());
let viewport = cairo::Rectangle {
x: 0.0,
@@ -263,5 +248,5 @@ fn text_doesnt_leave_points_in_current_path() {
renderer.render_document(&cr, &viewport).unwrap();
- assert!(!has_current_point(&cr));
+ assert!(!cr.has_current_point().unwrap());
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]