[librsvg: 41/90] Oops, we just need the cairo::prelude for SurfaceExt
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg: 41/90] Oops, we just need the cairo::prelude for SurfaceExt
- Date: Tue, 26 Mar 2019 19:15:30 +0000 (UTC)
commit 677eed4046968a76b7f8a37822490da85847311e
Author: Federico Mena Quintero <federico gnome org>
Date: Thu Mar 14 17:19:09 2019 -0600
Oops, we just need the cairo::prelude for SurfaceExt
rsvg_internals/src/drawing_ctx.rs | 4 ++--
rsvg_internals/src/surface_utils/mod.rs | 20 --------------------
2 files changed, 2 insertions(+), 22 deletions(-)
---
diff --git a/rsvg_internals/src/drawing_ctx.rs b/rsvg_internals/src/drawing_ctx.rs
index 01986569..4e3d6e27 100644
--- a/rsvg_internals/src/drawing_ctx.rs
+++ b/rsvg_internals/src/drawing_ctx.rs
@@ -1,5 +1,5 @@
use cairo;
-use cairo::MatrixTrait;
+use cairo::prelude::*;
use cairo_sys;
use glib::translate::*;
use std::cell::RefCell;
@@ -30,7 +30,7 @@ use crate::properties::{
StrokeLinejoin,
};
use crate::rect::RectangleExt;
-use crate::surface_utils::{shared_surface::SharedImageSurface, SurfaceExt};
+use crate::surface_utils::shared_surface::SharedImageSurface;
use crate::svg::Svg;
use crate::unit_interval::UnitInterval;
use crate::viewbox::ViewBox;
diff --git a/rsvg_internals/src/surface_utils/mod.rs b/rsvg_internals/src/surface_utils/mod.rs
index 3b1ec267..efc28542 100644
--- a/rsvg_internals/src/surface_utils/mod.rs
+++ b/rsvg_internals/src/surface_utils/mod.rs
@@ -2,8 +2,6 @@
use std::ops::DerefMut;
use cairo;
-use cairo_sys;
-use glib::translate::*;
pub mod iterators;
pub mod shared_surface;
@@ -151,21 +149,3 @@ impl Pixel {
impl<'a> ImageSurfaceDataExt for cairo::ImageSurfaceData<'a> {}
impl<'a> ImageSurfaceDataExt for &'a mut [u8] {}
-
-// FIXME: cairo-rs forgot to export its own SurfaceExt with the status() method
-// and others: https://github.com/gtk-rs/cairo/issues/252
-//
-// Remove the following when cairo-rs gets fixed.
-pub trait SurfaceExt {
- fn status(&self) -> cairo::Status;
-}
-
-impl SurfaceExt for cairo::Surface {
- fn status(&self) -> cairo::Status {
- unsafe {
- let raw_surface = self.to_glib_none();
-
- cairo_sys::cairo_surface_status(raw_surface.0).into()
- }
- }
-}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]