Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Fix CI tests #520

Merged
merged 2 commits into from
Jul 22, 2024
Merged

Fix CI tests #520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
00eab6f
Update image reader
ok-nick Jul 22, 2024
62e6eb4
Merge branch 'main' into ok-nick/fix-ci-tests
ok-nick Jul 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions make_test_images/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ c2pa = { path = "../sdk", default-features = false, features = [
"unstable_api",
] }
env_logger = "0.11"
log = "0.4.8"
image = { version = "0.25.1", default-features = false, features = [
log = "0.4.8"
image = { version = "0.25.2", default-features = false, features = [
"jpeg",
"png",
] }
Expand Down
4 changes: 2 additions & 2 deletions make_test_images/src/make_thumbnail.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
use std::io::{Read, Seek};

use anyhow::{Error, Result};
use image::{io::Reader, ImageFormat};
use image::{ImageFormat, ImageReader};

// max edge size allowed in pixels for thumbnail creation
const THUMBNAIL_LONGEST_EDGE: u32 = 1024;
Expand All @@ -29,7 +29,7 @@ pub fn make_thumbnail_from_stream<R: Read + Seek + ?Sized>(
.or_else(|| ImageFormat::from_mime_type(format))
.ok_or(Error::msg(format!("format not supported {format}")))?;

let reader = Reader::with_format(std::io::BufReader::new(stream), format);
let reader = ImageReader::with_format(std::io::BufReader::new(stream), format);
let mut img = reader.decode()?;

let longest_edge = THUMBNAIL_LONGEST_EDGE;
Expand Down
Loading