diff options
author | Tavian Barnes <tavianator@tavianator.com> | 2020-07-06 23:04:10 -0400 |
---|---|---|
committer | Tavian Barnes <tavianator@tavianator.com> | 2020-08-24 11:10:13 -0400 |
commit | 6ba084db4ba375eacaa1677fd75de318c12170c7 (patch) | |
tree | 9122e889fcc47d8f6ebd71717a8cb35a98ebafdb /src/frontier.rs | |
parent | 39c0348c9f98b4dd29bd112a0a2a42faa67c92d4 (diff) | |
download | kd-forest-6ba084db4ba375eacaa1677fd75de318c12170c7.tar.xz |
Bump acap to 0.2.0
This requires adapting to the new k-d trees, which are significantly
faster.
Diffstat (limited to 'src/frontier.rs')
-rw-r--r-- | src/frontier.rs | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/src/frontier.rs b/src/frontier.rs index 74c7398..ccc3efa 100644 --- a/src/frontier.rs +++ b/src/frontier.rs @@ -4,10 +4,10 @@ pub mod image; pub mod mean; pub mod min; -use crate::color::{ColorSpace, Rgb8}; +use crate::color::Rgb8; use crate::soft::SoftDelete; -use acap::coords::{Coordinates, CoordinateMetric, CoordinateProximity}; +use acap::coords::Coordinates; use acap::distance::{Proximity, Metric}; use std::cell::Cell; @@ -40,7 +40,7 @@ struct Pixel<C> { deleted: Cell<bool>, } -impl<C: ColorSpace> Pixel<C> { +impl<C> Pixel<C> { fn new(x: u32, y: u32, color: C) -> Self { Self { pos: (x, y), @@ -58,7 +58,7 @@ impl<C: ColorSpace> Pixel<C> { #[derive(Clone, Debug)] struct RcPixel<C>(Rc<Pixel<C>>); -impl<C: ColorSpace> RcPixel<C> { +impl<C> RcPixel<C> { fn new(x: u32, y: u32, color: C) -> Self { Self(Rc::new(Pixel::new(x, y, color))) } @@ -136,16 +136,6 @@ impl<C: Coordinates> Coordinates for Target<C> { } } -impl<T, C: CoordinateProximity<T>> CoordinateProximity<T> for Target<C> { - type Distance = C::Distance; - - fn distance_to_coords(&self, coords: &[T]) -> Self::Distance { - self.0.distance_to_coords(coords) - } -} - -impl<T, C: CoordinateMetric<T>> CoordinateMetric<T> for Target<C> {} - impl<C: Proximity> Proximity for RcPixel<C> { type Distance = C::Distance; |