Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions src/fast_gaussian_image.rs
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ pub fn fast_gaussian_blur_image(
FastBlurChannels::Plane,
);

fast_gaussian(&mut image, radius, threading_policy, edge_modes).unwrap();
fast_gaussian(&mut image, radius, threading_policy, edge_modes).ok()?;
let new_gray_image = GrayImage::from_raw(gray.width(), gray.height(), new_image)?;
Some(DynamicImage::ImageLuma8(new_gray_image))
}
Expand All @@ -91,7 +91,7 @@ pub fn fast_gaussian_blur_image(
FastBlurChannels::Plane,
);

fast_gaussian(&mut image_intensity, radius, threading_policy, edge_modes).unwrap();
fast_gaussian(&mut image_intensity, radius, threading_policy, edge_modes).ok()?;

let mut image_alpha = BlurImageMut::borrow(
&mut alpha_plane,
Expand All @@ -100,7 +100,7 @@ pub fn fast_gaussian_blur_image(
FastBlurChannels::Plane,
);

fast_gaussian(&mut image_alpha, radius, threading_policy, edge_modes).unwrap();
fast_gaussian(&mut image_alpha, radius, threading_policy, edge_modes).ok()?;

let mut new_raw_buffer =
vec![
Expand Down Expand Up @@ -134,7 +134,7 @@ pub fn fast_gaussian_blur_image(
FastBlurChannels::Channels3,
);

fast_gaussian(&mut image, radius, threading_policy, edge_modes).unwrap();
fast_gaussian(&mut image, radius, threading_policy, edge_modes).ok()?;
let new_rgb_image =
RgbImage::from_raw(rgb_image.width(), rgb_image.height(), new_image)?;
Some(DynamicImage::ImageRgb8(new_rgb_image))
Expand All @@ -149,7 +149,7 @@ pub fn fast_gaussian_blur_image(
FastBlurChannels::Channels4,
);

fast_gaussian(&mut image, radius, threading_policy, edge_modes).unwrap();
fast_gaussian(&mut image, radius, threading_policy, edge_modes).ok()?;

let new_rgba_image =
RgbaImage::from_raw(rgba_image.width(), rgba_image.height(), new_image)?;
Expand All @@ -166,7 +166,7 @@ pub fn fast_gaussian_blur_image(
FastBlurChannels::Plane,
);

fast_gaussian_u16(&mut image, radius, threading_policy, edge_modes).unwrap();
fast_gaussian_u16(&mut image, radius, threading_policy, edge_modes).ok()?;

let new_rgb_image = ImageBuffer::<Luma<u16>, Vec<u16>>::from_raw(
luma_16.width(),
Expand Down Expand Up @@ -198,7 +198,7 @@ pub fn fast_gaussian_blur_image(
FastBlurChannels::Plane,
);

fast_gaussian_u16(&mut intensity_image, radius, threading_policy, edge_modes).unwrap();
fast_gaussian_u16(&mut intensity_image, radius, threading_policy, edge_modes).ok()?;

let mut alpha_image = BlurImageMut::borrow(
&mut alpha_plane,
Expand All @@ -207,7 +207,7 @@ pub fn fast_gaussian_blur_image(
FastBlurChannels::Plane,
);

fast_gaussian_u16(&mut alpha_image, radius, threading_policy, edge_modes).unwrap();
fast_gaussian_u16(&mut alpha_image, radius, threading_policy, edge_modes).ok()?;

let mut new_raw_buffer =
vec![0u16; gray_alpha_16.width() as usize * gray_alpha_16.height() as usize * 2];
Expand Down Expand Up @@ -238,7 +238,7 @@ pub fn fast_gaussian_blur_image(
FastBlurChannels::Channels3,
);

fast_gaussian_u16(&mut rgb_image, radius, threading_policy, edge_modes).unwrap();
fast_gaussian_u16(&mut rgb_image, radius, threading_policy, edge_modes).ok()?;

let new_rgb_image = ImageBuffer::<Rgb<u16>, Vec<u16>>::from_raw(
rgb_16_image.width(),
Expand All @@ -257,7 +257,7 @@ pub fn fast_gaussian_blur_image(
FastBlurChannels::Channels4,
);

fast_gaussian_u16(&mut rgb_image, radius, threading_policy, edge_modes).unwrap();
fast_gaussian_u16(&mut rgb_image, radius, threading_policy, edge_modes).ok()?;

let new_rgba_image = ImageBuffer::<Rgba<u16>, Vec<u16>>::from_raw(
rgba_16_image.width(),
Expand All @@ -276,7 +276,7 @@ pub fn fast_gaussian_blur_image(
FastBlurChannels::Channels3,
);

fast_gaussian_f32(&mut rgb_image, radius, threading_policy, edge_modes).unwrap();
fast_gaussian_f32(&mut rgb_image, radius, threading_policy, edge_modes).ok()?;

let new_rgb_image =
Rgb32FImage::from_raw(rgb_image_f32.width(), rgb_image_f32.height(), new_image)?;
Expand All @@ -292,7 +292,7 @@ pub fn fast_gaussian_blur_image(
FastBlurChannels::Channels4,
);

fast_gaussian_f32(&mut rgb_image, radius, threading_policy, edge_modes).unwrap();
fast_gaussian_f32(&mut rgb_image, radius, threading_policy, edge_modes).ok()?;

let new_rgb_image =
Rgba32FImage::from_raw(rgba_image_f32.width(), rgba_image_f32.height(), new_image)?;
Expand Down
24 changes: 12 additions & 12 deletions src/fast_gaussian_image_next.rs
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ pub fn fast_gaussian_next_blur_image(
gray.height(),
FastBlurChannels::Plane,
);
fast_gaussian_next(&mut blur_image, radius, threading_policy, edge_modes).unwrap();
fast_gaussian_next(&mut blur_image, radius, threading_policy, edge_modes).ok()?;
let new_gray_image = GrayImage::from_raw(gray.width(), gray.height(), new_image)?;
Some(DynamicImage::ImageLuma8(new_gray_image))
}
Expand All @@ -89,7 +89,7 @@ pub fn fast_gaussian_next_blur_image(
FastBlurChannels::Plane,
);

fast_gaussian_next(&mut intensity_image, radius, threading_policy, edge_modes).unwrap();
fast_gaussian_next(&mut intensity_image, radius, threading_policy, edge_modes).ok()?;

let mut alpha_image = BlurImageMut::borrow(
&mut alpha_plane,
Expand All @@ -98,7 +98,7 @@ pub fn fast_gaussian_next_blur_image(
FastBlurChannels::Plane,
);

fast_gaussian_next(&mut alpha_image, radius, threading_policy, edge_modes).unwrap();
fast_gaussian_next(&mut alpha_image, radius, threading_policy, edge_modes).ok()?;

let mut new_raw_buffer =
vec![
Expand Down Expand Up @@ -132,7 +132,7 @@ pub fn fast_gaussian_next_blur_image(
FastBlurChannels::Channels3,
);

fast_gaussian_next(&mut b_rgb_image, radius, threading_policy, edge_modes).unwrap();
fast_gaussian_next(&mut b_rgb_image, radius, threading_policy, edge_modes).ok()?;
let new_rgb_image =
RgbImage::from_raw(rgb_image.width(), rgb_image.height(), new_image)?;
Some(DynamicImage::ImageRgb8(new_rgb_image))
Expand All @@ -147,7 +147,7 @@ pub fn fast_gaussian_next_blur_image(
FastBlurChannels::Channels4,
);

fast_gaussian_next(&mut b_rgba_image, radius, threading_policy, edge_modes).unwrap();
fast_gaussian_next(&mut b_rgba_image, radius, threading_policy, edge_modes).ok()?;
let new_rgba_image =
RgbaImage::from_raw(rgba_image.width(), rgba_image.height(), new_image)?;
Some(DynamicImage::ImageRgba8(new_rgba_image))
Expand All @@ -163,7 +163,7 @@ pub fn fast_gaussian_next_blur_image(
);

fast_gaussian_next_u16(&mut intensity_image, radius, threading_policy, edge_modes)
.unwrap();
.ok()?;

let new_rgb_image = ImageBuffer::<Luma<u16>, Vec<u16>>::from_raw(
luma_16.width(),
Expand Down Expand Up @@ -196,7 +196,7 @@ pub fn fast_gaussian_next_blur_image(
);

fast_gaussian_next_u16(&mut intensity_image, radius, threading_policy, edge_modes)
.unwrap();
.ok()?;

let mut alpha_image = BlurImageMut::borrow(
&mut alpha_plane,
Expand All @@ -205,7 +205,7 @@ pub fn fast_gaussian_next_blur_image(
FastBlurChannels::Plane,
);

fast_gaussian_next_u16(&mut alpha_image, radius, threading_policy, edge_modes).unwrap();
fast_gaussian_next_u16(&mut alpha_image, radius, threading_policy, edge_modes).ok()?;

let mut new_raw_buffer =
vec![0u16; gray_alpha_16.width() as usize * gray_alpha_16.height() as usize * 2];
Expand Down Expand Up @@ -236,7 +236,7 @@ pub fn fast_gaussian_next_blur_image(
FastBlurChannels::Channels3,
);

fast_gaussian_next_u16(&mut rgb_image, radius, threading_policy, edge_modes).unwrap();
fast_gaussian_next_u16(&mut rgb_image, radius, threading_policy, edge_modes).ok()?;

let new_rgb_image = ImageBuffer::<Rgb<u16>, Vec<u16>>::from_raw(
rgb_16_image.width(),
Expand All @@ -255,7 +255,7 @@ pub fn fast_gaussian_next_blur_image(
FastBlurChannels::Channels4,
);

fast_gaussian_next_u16(&mut rgba_image, radius, threading_policy, edge_modes).unwrap();
fast_gaussian_next_u16(&mut rgba_image, radius, threading_policy, edge_modes).ok()?;

let new_rgba_image = ImageBuffer::<Rgba<u16>, Vec<u16>>::from_raw(
rgba_16_image.width(),
Expand All @@ -274,7 +274,7 @@ pub fn fast_gaussian_next_blur_image(
FastBlurChannels::Channels3,
);

fast_gaussian_next_f32(&mut rgb_image, radius, threading_policy, edge_modes).unwrap();
fast_gaussian_next_f32(&mut rgb_image, radius, threading_policy, edge_modes).ok()?;
let new_rgb_image =
Rgb32FImage::from_raw(rgb_image_f32.width(), rgb_image_f32.height(), new_image)?;
Some(DynamicImage::ImageRgb32F(new_rgb_image))
Expand All @@ -289,7 +289,7 @@ pub fn fast_gaussian_next_blur_image(
FastBlurChannels::Channels4,
);

fast_gaussian_next_f32(&mut rgb_image, radius, threading_policy, edge_modes).unwrap();
fast_gaussian_next_f32(&mut rgb_image, radius, threading_policy, edge_modes).ok()?;

let new_rgb_image =
Rgba32FImage::from_raw(rgba_image_f32.width(), rgba_image_f32.height(), new_image)?;
Expand Down
24 changes: 12 additions & 12 deletions src/gaussian_blur_image.rs
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ pub fn gaussian_blur_image(
threading_policy,
precise_level,
)
.unwrap();
.ok()?;
let new_gray_image = GrayImage::from_raw(
gray.width(),
gray.height(),
Expand Down Expand Up @@ -125,7 +125,7 @@ pub fn gaussian_blur_image(
threading_policy,
precise_level,
)
.unwrap();
.ok()?;

gaussian_blur(
&alp,
Expand All @@ -135,7 +135,7 @@ pub fn gaussian_blur_image(
threading_policy,
precise_level,
)
.unwrap();
.ok()?;

let mut new_raw_buffer =
vec![
Expand Down Expand Up @@ -175,7 +175,7 @@ pub fn gaussian_blur_image(
threading_policy,
precise_level,
)
.unwrap();
.ok()?;

let new_rgb_image =
RgbImage::from_raw(img.width(), img.height(), new_image.data.borrow().to_vec())?;
Expand All @@ -194,7 +194,7 @@ pub fn gaussian_blur_image(
threading_policy,
precise_level,
)
.unwrap();
.ok()?;
let new_rgba_image =
RgbaImage::from_raw(img.width(), img.height(), new_image.data.borrow().to_vec())?;
Some(DynamicImage::ImageRgba8(new_rgba_image))
Expand All @@ -213,7 +213,7 @@ pub fn gaussian_blur_image(
threading_policy,
precise_level,
)
.unwrap();
.ok()?;

let new_rgb_image = ImageBuffer::<Luma<u16>, Vec<u16>>::from_raw(
img.width(),
Expand Down Expand Up @@ -268,7 +268,7 @@ pub fn gaussian_blur_image(
threading_policy,
precise_level,
)
.unwrap();
.ok()?;

gaussian_blur_u16(
&alp,
Expand All @@ -278,7 +278,7 @@ pub fn gaussian_blur_image(
threading_policy,
precise_level,
)
.unwrap();
.ok()?;

let mut new_raw_buffer =
vec![
Expand Down Expand Up @@ -318,7 +318,7 @@ pub fn gaussian_blur_image(
threading_policy,
precise_level,
)
.unwrap();
.ok()?;

let new_rgb_image = ImageBuffer::<Rgb<u16>, Vec<u16>>::from_raw(
img.width(),
Expand All @@ -340,7 +340,7 @@ pub fn gaussian_blur_image(
threading_policy,
precise_level,
)
.unwrap();
.ok()?;

let new_rgb_image = ImageBuffer::<Rgba<u16>, Vec<u16>>::from_raw(
img.width(),
Expand All @@ -362,7 +362,7 @@ pub fn gaussian_blur_image(
threading_policy,
IeeeBinaryConvolutionMode::Normal,
)
.unwrap();
.ok()?;
let new_rgb_image =
Rgb32FImage::from_raw(img.width(), img.height(), new_image.data.borrow().to_vec())?;
Some(DynamicImage::ImageRgb32F(new_rgb_image))
Expand All @@ -380,7 +380,7 @@ pub fn gaussian_blur_image(
threading_policy,
IeeeBinaryConvolutionMode::Normal,
)
.unwrap();
.ok()?;
let new_rgb_image = Rgba32FImage::from_raw(
img.width(),
img.height(),
Expand Down