diff options
author | RazrFalcon <razrfalcon@gmail.com> | 2018-12-20 21:36:04 +0200 |
---|---|---|
committer | RazrFalcon <razrfalcon@gmail.com> | 2018-12-20 21:53:57 +0200 |
commit | 07290cf679d27f68c87a922eb6db73745116d593 (patch) | |
tree | 9c2b57cf2a356a9a9ff39633c6b9c587a1638e8d /src | |
parent | bf7392896cb05491ace203abe3b1e0f1450d9b6f (diff) |
Removed unneeded imports.
Removed backend_cairo/ext.rs
Diffstat (limited to 'src')
-rw-r--r-- | src/backend_cairo/clippath.rs | 1 | ||||
-rw-r--r-- | src/backend_cairo/ext.rs | 28 | ||||
-rw-r--r-- | src/backend_cairo/mod.rs | 30 | ||||
-rw-r--r-- | src/backend_cairo/pattern.rs | 1 | ||||
-rw-r--r-- | src/backend_cairo/text.rs | 1 | ||||
-rw-r--r-- | src/backend_qt/clippath.rs | 1 | ||||
-rw-r--r-- | src/backend_qt/mod.rs | 3 | ||||
-rw-r--r-- | src/backend_qt/pattern.rs | 1 | ||||
-rw-r--r-- | src/backend_utils/image.rs | 4 | ||||
-rw-r--r-- | src/utils.rs | 3 |
10 files changed, 28 insertions, 45 deletions
diff --git a/src/backend_cairo/clippath.rs b/src/backend_cairo/clippath.rs index eff9296..646e91e 100644 --- a/src/backend_cairo/clippath.rs +++ b/src/backend_cairo/clippath.rs @@ -8,7 +8,6 @@ use cairo::{ MatrixTrait, }; use usvg; -use usvg::prelude::*; // self use super::prelude::*; diff --git a/src/backend_cairo/ext.rs b/src/backend_cairo/ext.rs deleted file mode 100644 index fcf5335..0000000 --- a/src/backend_cairo/ext.rs +++ /dev/null @@ -1,28 +0,0 @@ -// This Source Code Form is subject to the terms of the Mozilla Public -// License, v. 2.0. If a copy of the MPL was not distributed with this -// file, You can obtain one at http://mozilla.org/MPL/2.0/. - -// external -use cairo; -use usvg; - - -pub trait ReCairoContextExt { - fn set_source_color(&self, color: usvg::Color, opacity: usvg::Opacity); - fn reset_source_rgba(&self); -} - -impl ReCairoContextExt for cairo::Context { - fn set_source_color(&self, color: usvg::Color, opacity: usvg::Opacity) { - self.set_source_rgba( - color.red as f64 / 255.0, - color.green as f64 / 255.0, - color.blue as f64 / 255.0, - *opacity, - ); - } - - fn reset_source_rgba(&self) { - self.set_source_rgba(0.0, 0.0, 0.0, 0.0); - } -} diff --git a/src/backend_cairo/mod.rs b/src/backend_cairo/mod.rs index 2f486bf..c053816 100644 --- a/src/backend_cairo/mod.rs +++ b/src/backend_cairo/mod.rs @@ -11,7 +11,6 @@ use cairo::{ }; use pangocairo::functions as pc; use usvg; -use usvg::prelude::*; // self use prelude::*; @@ -21,7 +20,6 @@ use { OutputImage, Render, }; -use self::ext::*; macro_rules! try_create_surface { @@ -38,7 +36,6 @@ macro_rules! try_create_surface { mod clippath; -mod ext; mod fill; mod filter; mod gradient; @@ -52,7 +49,10 @@ mod text; mod prelude { pub use super::super::prelude::*; pub type CairoLayers = super::layers::Layers<super::cairo::ImageSurface>; - pub use super::ext::*; + + // It's actually used. Rust bug? + #[allow(unused_imports)] + pub(super) use super::ReCairoContextExt; } @@ -78,6 +78,26 @@ impl TransformFromBBox for cairo::Matrix { } } +pub(crate) trait ReCairoContextExt { + fn set_source_color(&self, color: usvg::Color, opacity: usvg::Opacity); + fn reset_source_rgba(&self); +} + +impl ReCairoContextExt for cairo::Context { + fn set_source_color(&self, color: usvg::Color, opacity: usvg::Opacity) { + self.set_source_rgba( + color.red as f64 / 255.0, + color.green as f64 / 255.0, + color.blue as f64 / 255.0, + *opacity, + ); + } + + fn reset_source_rgba(&self) { + self.set_source_rgba(0.0, 0.0, 0.0, 0.0); + } +} + /// Cairo backend handle. #[derive(Clone, Copy)] @@ -459,7 +479,7 @@ fn from_cairo_path(path: &cairo::Path) -> Vec<usvg::PathSegment> { } } - if segments.len() < 2 { + if segments.len() == 1 { segments.clear(); } diff --git a/src/backend_cairo/pattern.rs b/src/backend_cairo/pattern.rs index 96a8b6a..4d77286 100644 --- a/src/backend_cairo/pattern.rs +++ b/src/backend_cairo/pattern.rs @@ -9,7 +9,6 @@ use cairo::{ PatternTrait, }; use usvg; -use usvg::prelude::*; // self use super::prelude::*; diff --git a/src/backend_cairo/text.rs b/src/backend_cairo/text.rs index 333ed0f..9ba05eb 100644 --- a/src/backend_cairo/text.rs +++ b/src/backend_cairo/text.rs @@ -13,7 +13,6 @@ use pango::{ }; use pangocairo::functions as pc; use usvg; -use usvg::prelude::*; // self use super::prelude::*; diff --git a/src/backend_qt/clippath.rs b/src/backend_qt/clippath.rs index 00735b4..0b4f0e9 100644 --- a/src/backend_qt/clippath.rs +++ b/src/backend_qt/clippath.rs @@ -5,7 +5,6 @@ // external use qt; use usvg; -use usvg::prelude::*; // self use super::prelude::*; diff --git a/src/backend_qt/mod.rs b/src/backend_qt/mod.rs index 68c720d..bdc4876 100644 --- a/src/backend_qt/mod.rs +++ b/src/backend_qt/mod.rs @@ -7,7 +7,6 @@ // external use qt; use usvg; -use usvg::prelude::*; // self use prelude::*; @@ -427,7 +426,7 @@ fn from_qt_path(p_path: &qt::PainterPath) -> Vec<usvg::PathSegment> { i += 1; } - if segments.len() < 2 { + if segments.len() == 1 { segments.clear(); } diff --git a/src/backend_qt/pattern.rs b/src/backend_qt/pattern.rs index f609e95..be32867 100644 --- a/src/backend_qt/pattern.rs +++ b/src/backend_qt/pattern.rs @@ -5,7 +5,6 @@ // external use qt; use usvg; -use usvg::prelude::*; // self use super::prelude::*; diff --git a/src/backend_utils/image.rs b/src/backend_utils/image.rs index 68d5d67..2e7d09f 100644 --- a/src/backend_utils/image.rs +++ b/src/backend_utils/image.rs @@ -6,11 +6,9 @@ use std::path; // external use usvg; -use usvg::prelude::*; // self -use utils; -use geom::*; +use super::super::prelude::*; use { FitTo, Options, diff --git a/src/utils.rs b/src/utils.rs index d9bc440..2285ec7 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -8,11 +8,10 @@ use std::f64; // external use usvg; -use usvg::prelude::*; pub use usvg::utils::*; // self -use geom::*; +use super::prelude::*; use FitTo; |