Skip to content

Commit

Permalink
Merge branch 'master' into minimal-lock
Browse files Browse the repository at this point in the history
  • Loading branch information
cospectrum committed Mar 10, 2024
2 parents ec10acf + 14f266a commit 84324f8
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/contours.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use std::collections::VecDeque;
/// Whether a border of a foreground region borders an enclosing background region or a contained background region.
#[derive(Debug, Copy, Clone, PartialEq, Eq)]
pub enum BorderType {
/// A border between a foreground region and the backround region enclosing it.
/// A border between a foreground region and the background region enclosing it.
/// All points in the border lie within the foreground region.
Outer,
/// A border between a foreground region and a background region contained within it.
Expand Down
2 changes: 1 addition & 1 deletion src/filter/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -937,7 +937,7 @@ mod tests {
}

/// Baseline implementation of Gaussian blur is that provided by image::imageops.
/// We can also use this to validate correctnes of any implementations we add here.
/// We can also use this to validate correctness of any implementations we add here.
fn gaussian_baseline_rgb<I>(image: &I, stdev: f32) -> Image<Rgb<u8>>
where
I: GenericImage<Pixel = Rgb<u8>>,
Expand Down
2 changes: 1 addition & 1 deletion src/region_labelling.rs
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ mod tests {
}

// One huge component with eight-way connectivity, loads of
// isolated components with four-way conectivity.
// isolated components with four-way connectivity.
fn chessboard(width: u32, height: u32) -> GrayImage {
ImageBuffer::from_fn(width, height, |x, y| {
if (x + y) % 2 == 0 {
Expand Down
2 changes: 1 addition & 1 deletion src/stats.rs
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ where
}

/// Returns the peak signal to noise ratio for a clean image and its noisy
/// aproximation. All channels are considered equally. If you do not want this
/// approximation. All channels are considered equally. If you do not want this
/// (e.g. if using RGBA) then change image formats first.
/// See also [peak signal-to-noise ratio (wikipedia)](https://en.wikipedia.org/wiki/Peak_signal-to-noise_ratio).
pub fn peak_signal_to_noise_ratio<I, J, P>(original: &I, noisy: &J) -> f64
Expand Down
2 changes: 1 addition & 1 deletion src/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ where
}

/// Human readable description of some of the pixels that differ
/// signifcantly (according to provided function) between left
/// significantly (according to provided function) between left
/// and right, or None if all pixels match.
pub fn significant_pixel_diff_summary<I, J, F, P>(
actual: &I,
Expand Down

0 comments on commit 84324f8

Please sign in to comment.