cargo: bump image from 0.23.14 to 0.24.1

Bumps [image](https://github.com/image-rs/image) from 0.23.14 to 0.24.1.
- [Release notes](https://github.com/image-rs/image/releases)
- [Changelog](https://github.com/image-rs/image/blob/master/CHANGES.md)
- [Commits](https://github.com/image-rs/image/commits)

---
updated-dependencies:
- dependency-name: image
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
This commit is contained in:
dependabot[bot]
2022-03-16 10:04:52 +00:00
committed by Floris Bruynooghe
parent d6c9f5c64b
commit ae36a26045
3 changed files with 36 additions and 40 deletions

41
Cargo.lock generated
View File

@@ -1058,12 +1058,11 @@ dependencies = [
[[package]] [[package]]
name = "deflate" name = "deflate"
version = "0.8.6" version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "73770f8e1fe7d64df17ca66ad28994a0a623ea497fa69486e14984e715c5d174" checksum = "c86f7e25f518f4b81808a2cf1c50996a61f5c2eb394b2393bd87f2a4780a432f"
dependencies = [ dependencies = [
"adler32", "adler32",
"byteorder",
] ]
[[package]] [[package]]
@@ -1947,9 +1946,9 @@ dependencies = [
[[package]] [[package]]
name = "image" name = "image"
version = "0.23.14" version = "0.24.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "24ffcb7e7244a9bf19d35bf2883b9c080c4ced3c07a9895572178cdb8f13f6a1" checksum = "db207d030ae38f1eb6f240d5a1c1c88ff422aa005d10f8c6c6fc5e75286ab30e"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"byteorder", "byteorder",
@@ -2036,9 +2035,9 @@ checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35"
[[package]] [[package]]
name = "jpeg-decoder" name = "jpeg-decoder"
version = "0.1.22" version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "229d53d58899083193af11e15917b5640cd40b29ff475a1fe4ef725deb02d0f2" checksum = "105fb082d64e2100074587f59a74231f771750c664af903f1f9f76c9dedfc6f1"
[[package]] [[package]]
name = "js-sys" name = "js-sys"
@@ -2248,15 +2247,6 @@ dependencies = [
"unicase", "unicase",
] ]
[[package]]
name = "miniz_oxide"
version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435"
dependencies = [
"adler32",
]
[[package]] [[package]]
name = "miniz_oxide" name = "miniz_oxide"
version = "0.4.4" version = "0.4.4"
@@ -2267,6 +2257,15 @@ dependencies = [
"autocfg 1.1.0", "autocfg 1.1.0",
] ]
[[package]]
name = "miniz_oxide"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d2b29bd4bc3f33391105ebee3589c19197c4271e3e5a9ec9bfe8127eeff8f082"
dependencies = [
"adler",
]
[[package]] [[package]]
name = "mutate_once" name = "mutate_once"
version = "0.1.1" version = "0.1.1"
@@ -2411,9 +2410,9 @@ dependencies = [
[[package]] [[package]]
name = "num-rational" name = "num-rational"
version = "0.3.2" version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" checksum = "d41702bd167c2df5520b384281bc111a4b5efcf7fbc4c9c222c815b07e0a6a6a"
dependencies = [ dependencies = [
"autocfg 1.1.0", "autocfg 1.1.0",
"num-integer", "num-integer",
@@ -2739,14 +2738,14 @@ dependencies = [
[[package]] [[package]]
name = "png" name = "png"
version = "0.16.8" version = "0.17.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c3287920cb847dee3de33d301c463fba14dda99db24214ddf93f83d3021f4c6" checksum = "dc38c0ad57efb786dd57b9864e5b18bae478c00c824dc55a38bbc9da95dde3ba"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"crc32fast", "crc32fast",
"deflate", "deflate",
"miniz_oxide 0.3.7", "miniz_oxide 0.5.1",
] ]
[[package]] [[package]]

View File

@@ -34,7 +34,7 @@ encoded-words = { git = "https://github.com/async-email/encoded-words", branch="
escaper = "0.1" escaper = "0.1"
futures = "0.3" futures = "0.3"
hex = "0.4.0" hex = "0.4.0"
image = { version = "0.23.5", default-features=false, features = ["gif", "jpeg", "ico", "png", "pnm", "webp", "bmp"] } image = { version = "0.24.1", default-features=false, features = ["gif", "jpeg", "ico", "png", "pnm", "webp", "bmp"] }
kamadak-exif = "0.5" kamadak-exif = "0.5"
lettre_email = { git = "https://github.com/deltachat/lettre", branch = "master" } lettre_email = { git = "https://github.com/deltachat/lettre", branch = "master" }
libc = "0.2" libc = "0.2"

View File

@@ -3,17 +3,14 @@
use core::cmp::max; use core::cmp::max;
use std::ffi::OsStr; use std::ffi::OsStr;
use std::fmt; use std::fmt;
use std::io::Cursor;
use async_std::path::{Path, PathBuf}; use async_std::path::{Path, PathBuf};
use async_std::prelude::*; use async_std::prelude::*;
use async_std::{fs, io}; use async_std::{fs, io};
use anyhow::format_err; use anyhow::{format_err, Context as _, Error};
use anyhow::Context as _; use image::{DynamicImage, ImageFormat};
use anyhow::Error;
use image::DynamicImage;
use image::GenericImageView;
use image::ImageFormat;
use num_traits::FromPrimitive; use num_traits::FromPrimitive;
use thiserror::Error; use thiserror::Error;
@@ -449,7 +446,8 @@ impl<'a> BlobObject<'a> {
fn encode_img(img: &DynamicImage, encoded: &mut Vec<u8>) -> anyhow::Result<()> { fn encode_img(img: &DynamicImage, encoded: &mut Vec<u8>) -> anyhow::Result<()> {
encoded.clear(); encoded.clear();
img.write_to(encoded, image::ImageFormat::Jpeg)?; let mut buf = Cursor::new(encoded);
img.write_to(&mut buf, image::ImageFormat::Jpeg)?;
Ok(()) Ok(())
} }
fn encoded_img_exceeds_bytes( fn encoded_img_exceeds_bytes(
@@ -619,16 +617,14 @@ pub enum BlobError {
mod tests { mod tests {
use fs::File; use fs::File;
use super::*;
use crate::chat::{create_group_chat, ProtectionStatus};
use crate::{
chat,
message::Message,
test_utils::{self, TestContext},
};
use anyhow::Result; use anyhow::Result;
use image::Pixel; use image::{GenericImageView, Pixel};
use crate::chat::{self, create_group_chat, ProtectionStatus};
use crate::message::Message;
use crate::test_utils::{self, TestContext};
use super::*;
#[async_std::test] #[async_std::test]
async fn test_create() { async fn test_create() {
@@ -960,10 +956,11 @@ mod tests {
.unwrap(); .unwrap();
assert_correct_rotation(&img_rotated); assert_correct_rotation(&img_rotated);
let mut bytes = vec![]; let mut buf = Cursor::new(vec![]);
img_rotated img_rotated
.write_to(&mut bytes, image::ImageFormat::Jpeg) .write_to(&mut buf, image::ImageFormat::Jpeg)
.unwrap(); .unwrap();
let bytes = buf.into_inner();
let img_rotated = send_image_check_mediaquality( let img_rotated = send_image_check_mediaquality(
Some("0"), Some("0"),
&bytes, &bytes,