cargo fmt

GraphiteEditor · Oct 12, 2024 · 376a84b · 376a84b
1 parent f685b5e
commit 376a84b
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 13 deletions.
diff --git a/libraries/raw-rs/src/demosaicing/linear_demosaicing.rs b/libraries/raw-rs/src/demosaicing/linear_demosaicing.rs
@@ -1,4 +1,4 @@
-use crate::{Pixel, RawImage ,Captures};
+use crate::{Captures, Pixel, RawImage};
 
 fn average(data: &[u16], indexes: impl Iterator<Item = i64>) -> u16 {
 	let mut sum = 0;

diff --git a/libraries/raw-rs/src/lib.rs b/libraries/raw-rs/src/lib.rs
@@ -137,9 +137,12 @@ impl RawImage {
 
 	pub fn demosaic_and_apply(self, mut transform: impl PixelTransform) -> Image<u16> {
 		let mut image = vec![0; self.width * self.height * 3];
-		for Pixel { values, row, column } in self.linear_demosaic_iter().map(|mut pixel| { pixel.values = transform.apply(pixel); pixel }) {
+		for Pixel { values, row, column } in self.linear_demosaic_iter().map(|mut pixel| {
+			pixel.values = transform.apply(pixel);
+			pixel
+		}) {
 			let pixel_index = row * self.width + column;
-			image[3 * pixel_index..3 * (pixel_index+1)].copy_from_slice(&values);
+			image[3 * pixel_index..3 * (pixel_index + 1)].copy_from_slice(&values);
 		}
 
 		Image {
@@ -169,9 +172,12 @@ impl Image<u16> {
 	pub fn transform_and_apply(self, mut transform: impl PixelTransform) -> Image<u16> {
 		let mut image = vec![0; self.width * self.height * 3];
 		let (width, height, iter) = self.transform_iter();
-		for Pixel { values, row, column } in iter.map(|mut pixel| { pixel.values = transform.apply(pixel); pixel }) {
+		for Pixel { values, row, column } in iter.map(|mut pixel| {
+			pixel.values = transform.apply(pixel);
+			pixel
+		}) {
 			let pixel_index = row * width + column;
-			image[3 * pixel_index..3 * (pixel_index+1)].copy_from_slice(&values);
+			image[3 * pixel_index..3 * (pixel_index + 1)].copy_from_slice(&values);
 		}
 
 		Image {

diff --git a/libraries/raw-rs/src/postprocessing/convert_to_rgb.rs b/libraries/raw-rs/src/postprocessing/convert_to_rgb.rs
@@ -1,4 +1,4 @@
-use crate::{Pixel, PixelTransform, RawImage, CHANNELS_IN_RGB, Histogram};
+use crate::{Histogram, Pixel, PixelTransform, RawImage, CHANNELS_IN_RGB};
 
 impl RawImage {
 	pub fn convert_to_rgb_fn(&self) -> impl Fn(Pixel) -> [u16; CHANNELS_IN_RGB] {
@@ -30,7 +30,10 @@ impl RecordHistogram {
 
 impl PixelTransform for &mut RecordHistogram {
 	fn apply(&mut self, pixel: Pixel) -> [u16; CHANNELS_IN_RGB] {
-		self.histogram.iter_mut().zip(pixel.values.iter()).for_each(|(histogram, &value)| histogram[value as usize >> CHANNELS_IN_RGB] += 1);
+		self.histogram
+			.iter_mut()
+			.zip(pixel.values.iter())
+			.for_each(|(histogram, &value)| histogram[value as usize >> CHANNELS_IN_RGB] += 1);
 		pixel.values
 	}
 }
diff --git a/libraries/raw-rs/src/postprocessing/gamma_correction.rs b/libraries/raw-rs/src/postprocessing/gamma_correction.rs
@@ -1,4 +1,4 @@
-use crate::{Image, Pixel, Histogram, CHANNELS_IN_RGB};
+use crate::{Histogram, Image, Pixel, CHANNELS_IN_RGB};
 use std::f64::consts::E;
 
 impl Image<u16> {
@@ -20,9 +20,7 @@ impl Image<u16> {
 
 		let curve = generate_gamma_curve(0.45, 4.5, (white << 3) as f64);
 
-		move |pixel: Pixel| {
-			pixel.values.map(|value| curve[value as usize])
-		}
+		move |pixel: Pixel| pixel.values.map(|value| curve[value as usize])
 	}
 }
 

diff --git a/libraries/raw-rs/src/postprocessing/transform.rs b/libraries/raw-rs/src/postprocessing/transform.rs
@@ -1,4 +1,4 @@
-use crate::{Image, Transform, Captures, Pixel};
+use crate::{Captures, Image, Pixel, Transform};
 
 impl Image<u16> {
 	pub fn transform_iter(&self) -> (usize, usize, impl Iterator<Item = Pixel> + Captures<&'_ ()>) {
@@ -37,7 +37,7 @@ impl Image<u16> {
 				index = (index.0 + row_step.0, index.1 + row_step.1);
 
 				temp
-			})
+			}),
 		)
 	}
 }