Skip to content

Commit

Permalink
Increasing memory security
Browse files Browse the repository at this point in the history
  • Loading branch information
@awxkee
awxkee committed Jul 27, 2024
1 parent 4e54848 commit 8f8dc9d
Show file tree
Hide file tree
Showing 5 changed files with 73 additions and 39 deletions.
18 changes: 9 additions & 9 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ let mut scaler = LinearScaler::new(ResamplingFunction::Lanczos3);
scaler.set_threading_policy(ThreadingPolicy::Adaptive);
// ImageStore::<u8, 4> - (u8, 4) represents RGBA, (u8, 3) - RGB etc
let store =
ImageStore::<u8, 4>::from_slice(&mut bytes, dimensions.0 as usize, dimensions.1 as usize);
ImageStore::<u8, 4>::from_slice(&mut bytes, dimensions.0 as usize, dimensions.1 as usize).unwrap();
let resized = scaler.resize_rgba(
ImageSize::new(dimensions.0 as usize / 2, dimensions.1 as usize / 2),
store,
Expand Down Expand Up @@ -161,7 +161,7 @@ In common, you should not downsize an image in sRGB colorspace, however if speed
let mut scaler = Scaler::new(ResamplingFunction::Hermite);
scaler.set_threading_policy(ThreadingPolicy::Single);
let store =
ImageStore::<u8, 4>::from_slice(&mut bytes, width, height);
ImageStore::<u8, 4>::from_slice(&mut bytes, width, height).unwrap();
let resized = scaler.resize_rgba(
ImageSize::new(new_width, new_height),
store,
Expand All @@ -177,7 +177,7 @@ At the moment only sRGB transfer function is supported. This is also good optimi
let mut scaler = LinearScaler::new(ResamplingFunction::Lanczos3);
scaler.set_threading_policy(ThreadingPolicy::Single);
let store =
ImageStore::<u8, 4>::from_slice(&mut bytes, width, height);
ImageStore::<u8, 4>::from_slice(&mut bytes, width, height).unwrap();
let resized = scaler.resize_rgba(
ImageSize::new(new_width, new_height),
store,
Expand All @@ -190,7 +190,7 @@ let resized = scaler.resize_rgba(
let mut scaler = LabScaler::new(ResamplingFunction::Hermite);
scaler.set_threading_policy(ThreadingPolicy::Single);
let store =
ImageStore::<u8, 4>::from_slice(&mut bytes, width, height);
ImageStore::<u8, 4>::from_slice(&mut bytes, width, height).unwrap();
let resized = scaler.resize_rgba(
ImageSize::new(new_width, new_height),
store,
Expand All @@ -203,7 +203,7 @@ let resized = scaler.resize_rgba(
let mut scaler = LuvScaler::new(ResamplingFunction::Hermite);
scaler.set_threading_policy(ThreadingPolicy::Single);
let store =
ImageStore::<u8, 4>::from_slice(&mut bytes, width, height);
ImageStore::<u8, 4>::from_slice(&mut bytes, width, height).unwrap();
let resized = scaler.resize_rgba(
ImageSize::new(new_width, new_height),
store,
Expand All @@ -216,7 +216,7 @@ let resized = scaler.resize_rgba(
let mut scaler = XYZScale::new(ResamplingFunction::Hermite);
scaler.set_threading_policy(ThreadingPolicy::Single);
let store =
ImageStore::<u8, 4>::from_slice(&mut bytes, width, height);
ImageStore::<u8, 4>::from_slice(&mut bytes, width, height).unwrap();
let resized = scaler.resize_rgba(
ImageSize::new(new_width, new_height),
store,
Expand All @@ -229,7 +229,7 @@ let resized = scaler.resize_rgba(
let mut scaler = SigmoidalScaler::new(ResamplingFunction::Hermite);
scaler.set_threading_policy(ThreadingPolicy::Single);
let store =
ImageStore::<u8, 4>::from_slice(&mut bytes, width, height);
ImageStore::<u8, 4>::from_slice(&mut bytes, width, height).unwrap();
let resized = scaler.resize_rgba(
ImageSize::new(new_width, new_height),
store,
Expand All @@ -242,7 +242,7 @@ let resized = scaler.resize_rgba(
let mut scaler = LChScaler::new(ResamplingFunction::Hermite);
scaler.set_threading_policy(ThreadingPolicy::Single);
let store =
ImageStore::<u8, 4>::from_slice(&mut bytes, width, height);
ImageStore::<u8, 4>::from_slice(&mut bytes, width, height).unwrap();
let resized = scaler.resize_rgba(
ImageSize::new(new_width, new_height),
store,
Expand All @@ -255,7 +255,7 @@ let resized = scaler.resize_rgba(
let mut scaler = OklabScaler::new(ResamplingFunction::Hermite);
scaler.set_threading_policy(ThreadingPolicy::Single);
let store =
ImageStore::<u8, 4>::from_slice(&mut bytes, width, height);
ImageStore::<u8, 4>::from_slice(&mut bytes, width, height).unwrap();
let resized = scaler.resize_rgba(
ImageSize::new(new_width, new_height),
store,
Expand Down
8 changes: 4 additions & 4 deletions app/src/main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ use pic_scale::{

fn main() {
// test_fast_image();
let img = ImageReader::open("./assets/asset_5.png")
let img = ImageReader::open("./assets/beach_horizon.jpg")
.unwrap()
.decode()
.unwrap();
Expand All @@ -34,14 +34,14 @@ fn main() {
//

let start_time = Instant::now();
let store = ImageStore::<u8, 4>::from_slice(
let store = ImageStore::<u8, 3>::from_slice(
&mut bytes,
dimensions.0 as usize,
dimensions.1 as usize,
);
let resized = scaler.resize_rgba(
let resized = scaler.resize_rgb(
ImageSize::new(dimensions.0 as usize / 2, dimensions.1 as usize / 2),
store, false,
store,
);

// let mut r_chan = vec![0u8; dimensions.0 as usize * dimensions.1 as usize];
Expand Down
21 changes: 18 additions & 3 deletions src/image_store.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,14 +86,29 @@ impl<T, const N: usize> ImageStore<'static, T, N>
where
T: FromPrimitive + Clone + Copy + Debug + Default,
{
pub fn new(slice_ref: Vec<T>, width: usize, height: usize) -> ImageStore<'static, T, N> {
ImageStore::<T, N> {
pub fn new(
slice_ref: Vec<T>,
width: usize,
height: usize,
) -> Result<ImageStore<'static, T, N>, String> {
let expected_size = width * height * N;
if slice_ref.len() != width * height * N {
return Err(format!(
"Image buffer len expected to be {} (w({})*h({})*channels({}) but received {}",
expected_size,
width,
height,
N,
slice_ref.len()
));
}
Ok(ImageStore::<T, N> {
buffer: BufferStore::Owned(slice_ref),
channels: N,
width,
height,
bit_depth: 0,
}
})
}

pub fn alloc(width: usize, height: usize) -> ImageStore<'static, T, N> {
Expand Down
38 changes: 24 additions & 14 deletions src/scaler.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ impl Scaling for Scaler {
);
let new_image =
ImageStore::<u8, 3>::new(allocated_store, new_size.width, new_size.height);
return new_image;
return new_image.unwrap();
}
let vertical_filters = self.generate_weights(store.height, new_size.height);
let horizontal_filters = self.generate_weights(store.width, new_size.width);
Expand Down Expand Up @@ -352,7 +352,7 @@ impl Scaling for Scaler {
impl ScalingF32 for Scaler {
fn resize_rgb_f32(&self, new_size: ImageSize, store: ImageStore<f32, 3>) -> ImageStore<f32, 3> {
if self.function == Nearest {
let mut allocated_store: Vec<f32> = vec![0f32; new_size.width * 4 * new_size.height];
let mut allocated_store: Vec<f32> = vec![0f32; new_size.width * 3 * new_size.height];
resize_nearest::<f32, 3>(
&store.buffer.borrow(),
store.width,
Expand All @@ -363,7 +363,7 @@ impl ScalingF32 for Scaler {
);
let new_image =
ImageStore::<f32, 3>::new(allocated_store, new_size.width, new_size.height);
return new_image;
return new_image.unwrap();
}

let pool = self
Expand All @@ -372,13 +372,15 @@ impl ScalingF32 for Scaler {

let allocated_store_vertical: Vec<f32> = vec![0f32; store.width * 3 * new_size.height];
let mut new_image_vertical =
ImageStore::<f32, 3>::new(allocated_store_vertical, store.width, new_size.height);
ImageStore::<f32, 3>::new(allocated_store_vertical, store.width, new_size.height)
.unwrap();
let vertical_filters = self.generate_weights(store.height, new_image_vertical.height);
store.convolve_vertical(vertical_filters, &mut new_image_vertical, &pool);

let allocated_store_horizontal: Vec<f32> = vec![0f32; new_size.width * 3 * new_size.height];
let mut new_image_horizontal =
ImageStore::<f32, 3>::new(allocated_store_horizontal, new_size.width, new_size.height);
ImageStore::<f32, 3>::new(allocated_store_horizontal, new_size.width, new_size.height)
.unwrap();
let horizontal_filters = self.generate_weights(store.width, new_size.width);
new_image_vertical.convolve_horizontal(
horizontal_filters,
Expand Down Expand Up @@ -413,7 +415,8 @@ impl ScalingF32 for Scaler {
new_size.height,
);
let new_image =
ImageStore::<f32, 4>::new(allocated_store, new_size.width, new_size.height);
ImageStore::<f32, 4>::new(allocated_store, new_size.width, new_size.height)
.unwrap();

if is_alpha_premultiplied {
let mut premultiplied_store =
Expand All @@ -431,14 +434,16 @@ impl ScalingF32 for Scaler {

let allocated_store_vertical: Vec<f32> = vec![0f32; src_store.width * 4 * new_size.height];
let mut new_image_vertical =
ImageStore::<f32, 4>::new(allocated_store_vertical, src_store.width, new_size.height);
ImageStore::<f32, 4>::new(allocated_store_vertical, src_store.width, new_size.height)
.unwrap();
let horizontal_filters = self.generate_weights(src_store.width, new_size.width);
let vertical_filters = self.generate_weights(src_store.height, new_image_vertical.height);
src_store.convolve_vertical(vertical_filters, &mut new_image_vertical, &pool);

let allocated_store_horizontal: Vec<f32> = vec![0f32; new_size.width * 4 * new_size.height];
let mut new_image_horizontal =
ImageStore::<f32, 4>::new(allocated_store_horizontal, new_size.width, new_size.height);
ImageStore::<f32, 4>::new(allocated_store_horizontal, new_size.width, new_size.height)
.unwrap();
new_image_vertical.convolve_horizontal(
horizontal_filters,
&mut new_image_horizontal,
Expand Down Expand Up @@ -476,7 +481,8 @@ impl Scaler {
new_size.height,
);
let new_image =
ImageStore::<f32, 1>::new(allocated_store, new_size.width, new_size.height);
ImageStore::<f32, 1>::new(allocated_store, new_size.width, new_size.height)
.unwrap();
return new_image;
}

Expand All @@ -486,14 +492,16 @@ impl Scaler {

let allocated_store_vertical: Vec<f32> = vec![0f32; store.width * new_size.height];
let mut new_image_vertical =
ImageStore::<f32, 1>::new(allocated_store_vertical, store.width, new_size.height);
ImageStore::<f32, 1>::new(allocated_store_vertical, store.width, new_size.height)
.unwrap();
let horizontal_filters = self.generate_weights(store.width, new_size.width);
let vertical_filters = self.generate_weights(store.height, new_image_vertical.height);
store.convolve_vertical(vertical_filters, &mut new_image_vertical, &pool);

let allocated_store_horizontal: Vec<f32> = vec![0f32; new_size.width * new_size.height];
let mut new_image_horizontal =
ImageStore::<f32, 1>::new(allocated_store_horizontal, new_size.width, new_size.height);
ImageStore::<f32, 1>::new(allocated_store_horizontal, new_size.width, new_size.height)
.unwrap();
new_image_vertical.convolve_horizontal(
horizontal_filters,
&mut new_image_horizontal,
Expand All @@ -517,7 +525,7 @@ impl Scaler {
new_size.height,
);
let new_image =
ImageStore::<u8, 1>::new(allocated_store, new_size.width, new_size.height);
ImageStore::<u8, 1>::new(allocated_store, new_size.width, new_size.height).unwrap();
return new_image;
}
let vertical_filters = self.generate_weights(store.height, new_size.height);
Expand Down Expand Up @@ -557,7 +565,8 @@ impl ScalingU16 for Scaler {
new_size.height,
);
let mut new_image =
ImageStore::<u16, 3>::new(allocated_store, new_size.width, new_size.height);
ImageStore::<u16, 3>::new(allocated_store, new_size.width, new_size.height)
.unwrap();
new_image.bit_depth = bit_depth;
return new_image;
}
Expand Down Expand Up @@ -689,7 +698,8 @@ impl ScalingU16 for Scaler {
new_size.height,
);
let mut new_image =
ImageStore::<u16, 1>::new(allocated_store, new_size.width, new_size.height);
ImageStore::<u16, 1>::new(allocated_store, new_size.width, new_size.height)
.unwrap();
new_image.bit_depth = bit_depth;
return new_image;
}
Expand Down
27 changes: 18 additions & 9 deletions src/scaler_f16.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ impl Scaler {
new_size.height,
);
let new_image =
ImageStore::<f16, 4>::new(allocated_store, new_size.width, new_size.height);
ImageStore::<f16, 4>::new(allocated_store, new_size.width, new_size.height)
.unwrap();

if is_alpha_premultiplied {
let mut premultiplied_store =
Expand All @@ -81,15 +82,17 @@ impl Scaler {
let allocated_store_vertical: Vec<f16> =
vec![f16::from_f32(0.); src_store.width * 4 * new_size.height];
let mut new_image_vertical =
ImageStore::<f16, 4>::new(allocated_store_vertical, src_store.width, new_size.height);
ImageStore::<f16, 4>::new(allocated_store_vertical, src_store.width, new_size.height)
.unwrap();
let horizontal_filters = self.generate_weights(src_store.width, new_size.width);
let vertical_filters = self.generate_weights(src_store.height, new_image_vertical.height);
src_store.convolve_vertical(vertical_filters, &mut new_image_vertical, &pool);

let allocated_store_horizontal: Vec<f16> =
vec![f16::from_f32(0.); new_size.width * 4 * new_size.height];
let mut new_image_horizontal =
ImageStore::<f16, 4>::new(allocated_store_horizontal, new_size.width, new_size.height);
ImageStore::<f16, 4>::new(allocated_store_horizontal, new_size.width, new_size.height)
.unwrap();
new_image_vertical.convolve_horizontal(
horizontal_filters,
&mut new_image_horizontal,
Expand Down Expand Up @@ -126,7 +129,8 @@ impl Scaler {
new_size.height,
);
let new_image =
ImageStore::<f16, 3>::new(allocated_store, new_size.width, new_size.height);
ImageStore::<f16, 3>::new(allocated_store, new_size.width, new_size.height)
.unwrap();
return new_image;
}

Expand All @@ -137,14 +141,16 @@ impl Scaler {
let allocated_store_vertical: Vec<f16> =
vec![f16::from_f32(0.); store.width * 3 * new_size.height];
let mut new_image_vertical =
ImageStore::<f16, 3>::new(allocated_store_vertical, store.width, new_size.height);
ImageStore::<f16, 3>::new(allocated_store_vertical, store.width, new_size.height)
.unwrap();
let vertical_filters = self.generate_weights(store.height, new_image_vertical.height);
store.convolve_vertical(vertical_filters, &mut new_image_vertical, &pool);

let allocated_store_horizontal: Vec<f16> =
vec![f16::from_f32(0.); new_size.width * 3 * new_size.height];
let mut new_image_horizontal =
ImageStore::<f16, 3>::new(allocated_store_horizontal, new_size.width, new_size.height);
ImageStore::<f16, 3>::new(allocated_store_horizontal, new_size.width, new_size.height)
.unwrap();
let horizontal_filters = self.generate_weights(store.width, new_size.width);
new_image_vertical.convolve_horizontal(
horizontal_filters,
Expand Down Expand Up @@ -172,7 +178,8 @@ impl Scaler {
new_size.height,
);
let new_image =
ImageStore::<f16, 1>::new(allocated_store, new_size.width, new_size.height);
ImageStore::<f16, 1>::new(allocated_store, new_size.width, new_size.height)
.unwrap();
return new_image;
}

Expand All @@ -183,14 +190,16 @@ impl Scaler {
let allocated_store_vertical: Vec<f16> =
vec![f16::from_f32(0.); store.width * 1 * new_size.height];
let mut new_image_vertical =
ImageStore::<f16, 1>::new(allocated_store_vertical, store.width, new_size.height);
ImageStore::<f16, 1>::new(allocated_store_vertical, store.width, new_size.height)
.unwrap();
let vertical_filters = self.generate_weights(store.height, new_image_vertical.height);
store.convolve_vertical(vertical_filters, &mut new_image_vertical, &pool);

let allocated_store_horizontal: Vec<f16> =
vec![f16::from_f32(0.); new_size.width * 1 * new_size.height];
let mut new_image_horizontal =
ImageStore::<f16, 1>::new(allocated_store_horizontal, new_size.width, new_size.height);
ImageStore::<f16, 1>::new(allocated_store_horizontal, new_size.width, new_size.height)
.unwrap();
let horizontal_filters = self.generate_weights(store.width, new_size.width);
new_image_vertical.convolve_horizontal(
horizontal_filters,
Expand Down

0 comments on commit 8f8dc9d

Please sign in to comment.