diff --git a/Cargo.toml b/Cargo.toml index 9081ddd..5e8381e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,33 +17,33 @@ exclude = [ [dependencies] byteorder = "1.5.0" -bytes = "1.5.0" +bytes = "1.7.1" cfb = "0.10.0" -encoding_rs = "0.8.33" +encoding_rs = "0.8.34" fake = { version = "2.9.2", features = ["derive"] } md2 = "0.10.2" nom = "7.1.3" -serde = { version = "1.0.188", features = ["derive"] } -serde_json = { version = "1.0.107", features = ["preserve_order"] } +serde = { version = "1.0.208", features = ["derive"] } +serde_json = { version = "1.0.125", features = ["preserve_order"] } utf16string = "0.2.0" quick-xml = { version = "0.36.0", features = ["serialize"] } serde_repr = "0.1.16" hex = "0.4.3" wavefront_rs = "2.0.0-beta.1" -flate2 = "1.0.28" -image = "0.25.1" +flate2 = "1.0.31" +image = "0.25.2" weezl = "0.1.8" -regex = "1.10.5" +regex = "1.10.6" [dev-dependencies] dirs = "5.0.1" pretty_assertions = "1.4.0" rand = "0.8.5" -rayon = "1.8.0" +rayon = "1.10.0" testdir = "0.9.0" -walkdir = "2.4.0" +walkdir = "2.5.0" roxmltree = "0.20.0" -testresult = "0.4.0" +testresult = "0.4.1" [profile.test] # level 0 is very slow for writing to compound files diff --git a/src/vpx/expanded.rs b/src/vpx/expanded.rs index 10ce407..81433db 100644 --- a/src/vpx/expanded.rs +++ b/src/vpx/expanded.rs @@ -474,7 +474,7 @@ fn read_images>(expanded_dir: &P) -> io::Result> { } None => match dimensions_from_file { - Some((width_file,_)) => width_file, + Some((width_file, _)) => width_file, None => return Err(io::Error::new(io::ErrorKind::InvalidData, "Image width not provided and could not be read from file")), } }; @@ -493,10 +493,10 @@ fn read_images>(expanded_dir: &P) -> io::Result> { } None => match dimensions_from_file { - Some((_,height_file)) => height_file, + Some((_, height_file)) => height_file, None => return Err(io::Error::new(io::ErrorKind::InvalidData, "Image height not provided and could not be read from file")), } - }; + }; let mut image = image_data_json.to_image_data(width, height, None); if let Some(jpg) = &mut image.jpeg { @@ -518,7 +518,7 @@ fn read_images>(expanded_dir: &P) -> io::Result> { } fn read_image_dimensions(file_path: &PathBuf) -> io::Result> { - let decoder = image::io::Reader::open(file_path)?.with_guessed_format()?; + let decoder = image::ImageReader::open(file_path)?.with_guessed_format()?; let dimensions_from_file = match decoder.into_dimensions() { Ok(dimensions) => Some(dimensions), Err(image_error) => { @@ -546,7 +546,7 @@ fn read_image_dimensions_from_file_steam( } }?; let cursor = std::io::Cursor::new(&jpeg.data); - let decoder = image::io::Reader::with_format(cursor, format); + let decoder = image::ImageReader::with_format(cursor, format); match decoder.into_dimensions() { Ok(dimensions) => Some(dimensions), Err(image_error) => {