Upgrade rawkit

Author: TrueDoctor

editor/src/messages/tool/transform_layer/transform_layer_message_handler.rs

@@ -183,23 +183,22 @@ impl MessageHandler<TransformLayerMessage, TransformData<'_>> for TransformLayer
 				*selected.pivot = selected.mean_average_of_pivots();
 				self.local_pivot = document.metadata().document_to_viewport.inverse().transform_point2(*selected.pivot);
 				self.grab_target = document.metadata().document_to_viewport.inverse().transform_point2(selected.mean_average_of_pivots());
-			} else {
-				match selected_layers.first().and_then(|&layer| document.network_interface.compute_modified_vector(layer)) {
-					Some(vector_data) => {
-						*selected.original_transforms = OriginalTransforms::default();
-
-						let viewspace = document.metadata().transform_to_viewport(selected_layers[0]);
-						let selected_points = shape_editor.selected_points().collect::<Vec<_>>();
-
-						let get_location = |point: &&ManipulatorPointId| point.get_position(&vector_data).map(|position| viewspace.transform_point2(position));
-						match calculate_pivot(&selected_points, &vector_data, viewspace, |point: &ManipulatorPointId| get_location(&point)) {
-							Some((new_pivot, grab_target)) => {
-								*selected.pivot = new_pivot;
-
-					self.local_pivot = document_to_viewport.inverse().transform_point2(*selected.pivot);
-					self.grab_target = document_to_viewport.inverse().transform_point2(grab_target);
-				} else {
-					log::warn!("Failed to calculate pivot.");
+			} else if let Some(vector_data) = selected_layers.first().and_then(|&layer| document.network_interface.compute_modified_vector(layer)) {
+				*selected.original_transforms = OriginalTransforms::default();
+
+				let viewspace = document.metadata().transform_to_viewport(selected_layers[0]);
+				let selected_points = shape_editor.selected_points().collect::<Vec<_>>();
+
+				let get_location = |point: &&ManipulatorPointId| point.get_position(&vector_data).map(|position| viewspace.transform_point2(position));
+				match calculate_pivot(&selected_points, &vector_data, viewspace, |point: &ManipulatorPointId| get_location(&point)) {
+					Some((new_pivot, grab_target)) => {
+						*selected.pivot = new_pivot;
+						self.local_pivot = document_to_viewport.inverse().transform_point2(*selected.pivot);
+						self.grab_target = document_to_viewport.inverse().transform_point2(grab_target);
+					}
+					_ => {
+						log::warn!("Failed to calculate pivot.");
+					}
 				}
 			}
 

libraries/rawkit/rawkit-proc-macros/src/build_camera_data.rs

@@ -1,5 +1,5 @@
 use proc_macro::TokenStream;
-use quote::{quote, ToTokens};
+use quote::{ToTokens, quote};
 use toml::{Table, Value};
 
 use std::fs;

libraries/rawkit/rawkit-proc-macros/src/tag_derive.rs

@@ -24,7 +24,7 @@ pub fn tag_derive(input: TokenStream) -> TokenStream {
 
 	let new_name = format_ident!("_{}", name);
 
-	let gen = quote! {
+	let r#gen = quote! {
 		struct #new_name {
 			#( #struct_idents: <#struct_types as Tag>::Output ),*
 		}
@@ -39,5 +39,5 @@ pub fn tag_derive(input: TokenStream) -> TokenStream {
 		}
 	};
 
-	gen.into()
+	r#gen.into()
 }

libraries/rawkit/src/decoder/arw1.rs

@@ -1,9 +1,9 @@
+use crate::tiff::Ifd;
 use crate::tiff::file::TiffRead;
 use crate::tiff::tags::SonyDataOffset;
-use crate::tiff::Ifd;
 use crate::{RawImage, SubtractBlack, Transform};
 
-use bitstream_io::{BitRead, BitReader, Endianness, BE};
+use bitstream_io::{BE, BitRead, BitReader, Endianness};
 use std::io::{Read, Seek};
 
 pub fn decode_a100<R: Read + Seek>(ifd: Ifd, file: &mut TiffRead<R>) -> RawImage {
@@ -63,11 +63,7 @@ fn ljpeg_diff<R: Read + Seek, E: Endianness>(huff: &[u16], file: &mut BitReader<
 
 	let diff = read_n_bits_from_file(length, file) as i32;
 
-	if length == 0 || (diff & (1 << (length - 1))) == 0 {
-		diff - (1 << length) - 1
-	} else {
-		diff
-	}
+	if length == 0 || (diff & (1 << (length - 1))) == 0 { diff - (1 << length) - 1 } else { diff }
 }
 
 fn sony_arw_load_raw<R: Read + Seek>(width: usize, height: usize, file: &mut BitReader<R, BE>) -> Option<Vec<u16>> {

libraries/rawkit/src/postprocessing/convert_to_rgb.rs

@@ -1,7 +1,7 @@
-use crate::{Pixel, RawImage, CHANNELS_IN_RGB};
+use crate::{CHANNELS_IN_RGB, Pixel, RawImage};
 
 impl RawImage {
-	pub fn convert_to_rgb_fn(&self) -> impl Fn(Pixel) -> [u16; CHANNELS_IN_RGB] {
+	pub fn convert_to_rgb_fn(&self) -> impl Fn(Pixel) -> [u16; CHANNELS_IN_RGB] + use<> {
 		let Some(camera_to_rgb) = self.camera_to_rgb else { todo!() };
 
 		move |pixel: Pixel| {

libraries/rawkit/src/postprocessing/gamma_correction.rs

@@ -1,8 +1,8 @@
-use crate::{Histogram, Image, Pixel, CHANNELS_IN_RGB};
+use crate::{CHANNELS_IN_RGB, Histogram, Image, Pixel};
 use std::f64::consts::E;
 
 impl Image<u16> {
-	pub fn gamma_correction_fn(&self, histogram: &Histogram) -> impl Fn(Pixel) -> [u16; CHANNELS_IN_RGB] {
+	pub fn gamma_correction_fn(&self, histogram: &Histogram) -> impl Fn(Pixel) -> [u16; CHANNELS_IN_RGB] + use<> {
 		let percentage = self.width * self.height;
 
 		let mut white = 0;

libraries/rawkit/src/postprocessing/record_histogram.rs

@@ -1,4 +1,4 @@
-use crate::{Histogram, Pixel, PixelTransform, RawImage, CHANNELS_IN_RGB};
+use crate::{CHANNELS_IN_RGB, Histogram, Pixel, PixelTransform, RawImage};
 
 impl RawImage {
 	pub fn record_histogram_fn(&self) -> RecordHistogram {

libraries/rawkit/src/preprocessing/scale_to_16bit.rs

@@ -1,7 +1,7 @@
 use crate::{RawImage, RawPixel, SubtractBlack};
 
 impl RawImage {
-	pub fn scale_to_16bit_fn(&self) -> impl Fn(RawPixel) -> u16 {
+	pub fn scale_to_16bit_fn(&self) -> impl Fn(RawPixel) -> u16 + use<> {
 		let black_level = match self.black {
 			SubtractBlack::CfaGrid(x) => x,
 			_ => unreachable!(),

libraries/rawkit/src/preprocessing/scale_white_balance.rs

@@ -1,7 +1,7 @@
 use crate::{RawImage, RawPixel};
 
 impl RawImage {
-	pub fn scale_white_balance_fn(&self) -> impl Fn(RawPixel) -> u16 {
+	pub fn scale_white_balance_fn(&self) -> impl Fn(RawPixel) -> u16 + use<> {
 		let Some(mut white_balance) = self.white_balance else { todo!() };
 
 		if white_balance[1] == 0. {

libraries/rawkit/src/preprocessing/subtract_black.rs

@@ -2,7 +2,7 @@ use crate::RawPixel;
 use crate::{RawImage, SubtractBlack};
 
 impl RawImage {
-	pub fn subtract_black_fn(&self) -> impl Fn(RawPixel) -> u16 {
+	pub fn subtract_black_fn(&self) -> impl Fn(RawPixel) -> u16 + use<> {
 		match self.black {
 			SubtractBlack::CfaGrid(black_levels) => move |pixel: RawPixel| pixel.value.saturating_sub(black_levels[2 * (pixel.row % 2) + (pixel.column % 2)]),
 			_ => todo!(),