c2pa-rs

commit 879bba6c88f425f7a9a2637eecce867b96d11072
parent 2955fdda1fe0e7fff2c2c202b7d74940012c24bc
Author: Gavin  Peacock <gpeacock@adobe.com>
Date:   Fri,  2 Dec 2022 16:50:50 -0800

Updates some cargo dependencies (#159)

* update some cargo dependencies
Diffstat:
M
make_test_images/Cargo.toml
 | 
4
++--
M
make_test_images/src/make_test_images.rs
 | 
3
+--
M
sdk/Cargo.toml
 | 
5
++---
M
sdk/src/store.rs
 | 
21
++++++---------------

4 files changed, 11 insertions(+), 22 deletions(-)
diff --git a/make_test_images/Cargo.toml b/make_test_images/Cargo.toml
@@ -10,9 +10,9 @@ rust-version = "1.61.0"
 anyhow = "1.0"
 blake3 = "1.0.0"
 c2pa = { path="../sdk", features = ["file_io", "xmp_write"] }
-env_logger = "0.9"
+env_logger = "0.10"
 log = "0.4" 
-image = "0.23.10"
+image = "0.24.5"
 nom = "7.1.1"
 regex = "1.5.6"
 serde = "1.0.137"
diff --git a/make_test_images/src/make_test_images.rs b/make_test_images/src/make_test_images.rs
@@ -23,7 +23,6 @@ use c2pa::{
     create_signer, jumbf_io, Error, Ingredient, IngredientOptions, Manifest, ManifestStore, Signer,
     SigningAlg,
 };
-use image::GenericImageView;
 use nom::AsBytes;
 use serde::Deserialize;
 use twoway::find_bytes;
@@ -283,7 +282,7 @@ impl MakeTestImages {
                 );
                 manifest.add_ingredient(ingredient);
 
-                x += width;
+                x += width as i64;
             }
             // record what we did as an action (only need to record this once)
             actions = actions.add_action(Action::new(c2pa_action::RESIZED));
diff --git a/sdk/Cargo.toml b/sdk/Cargo.toml
@@ -64,11 +64,10 @@ conv = "0.3.3"
 coset = "0.3.1"
 extfmt = "0.1.1"
 hex = "0.4.3"
-img-parts = "0.2.3"
+img-parts = "0.3.0"
 log = "0.4.8"
 multibase = "0.9.0"
 multihash = "0.11.4"
-nom = "6.0"
 png_pong = "0.8.2"
 quick-xml = "0.20.0"
 range-set = "0.0.9"
@@ -80,7 +79,7 @@ serde_json = "1.0.66"
 serde-transcode = "1.1.1"
 sha2 = "0.10.2"
 tempfile = "3.1.0"
-thiserror = ">= 1.0.20, < 1.0.32"
+thiserror = ">= 1.0.20, < 1.0.38"
 twoway = "0.2.1"
 url = "2.2.2"
 uuid = { version = "0.8.1", features = ["serde", "v4", "wasm-bindgen"] }
diff --git a/sdk/src/store.rs b/sdk/src/store.rs
@@ -2265,7 +2265,6 @@ pub mod tests {
     #![allow(clippy::unwrap_used)]
 
     use tempfile::tempdir;
-    use thiserror::private::PathAsDisplay;
     use twoway::find_bytes;
 
     use super::*;
@@ -2724,7 +2723,7 @@ pub mod tests {
         let mut report = DetailedStatusTracker::new();
         let result = Store::load_from_asset(&ap, true, &mut report);
         assert!(matches!(result, Err(Error::UnsupportedType)));
-        println!("Error report for {}: {:?}", ap.as_display(), report);
+        println!("Error report for {}: {:?}", ap.display(), report);
         assert!(!report.get_log().is_empty());
 
         assert!(report_has_err(report.get_log(), Error::UnsupportedType));
@@ -2738,7 +2737,7 @@ pub mod tests {
         let _r = Store::load_from_asset(&ap, true, &mut report);
 
         // error report
-        println!("Error report for {}: {:?}", ap.as_display(), report);
+        println!("Error report for {}: {:?}", ap.display(), report);
         assert!(!report.get_log().is_empty());
 
         assert!(report_has_err(report.get_log(), Error::PrereleaseError));
@@ -2752,7 +2751,7 @@ pub mod tests {
         Store::load_from_asset(&ap, true, &mut report).unwrap();
 
         // error report
-        println!("Error report for {}: {:?}", ap.as_display(), report);
+        println!("Error report for {}: {:?}", ap.display(), report);
         assert!(!report.get_log().is_empty());
 
         let errs = report_split_errors(report.get_log_mut());
@@ -2769,11 +2768,7 @@ pub mod tests {
         let mut report = DetailedStatusTracker::new();
         let _result = Store::load_from_asset(&ap, true, &mut report);
 
-        println!(
-            "Error report for {}: {:?}",
-            ap.as_display(),
-            report.get_log()
-        );
+        println!("Error report for {}: {:?}", ap.display(), report.get_log());
         assert!(!report.get_log().is_empty());
         let errors = report_split_errors(report.get_log_mut());
         assert!(errors[0].error_str().unwrap().starts_with("IoError"));
@@ -2785,11 +2780,7 @@ pub mod tests {
         let mut report = DetailedStatusTracker::new();
         let _r = Store::load_from_asset(&ap, true, &mut report);
 
-        println!(
-            "Error report for {}: {:?}",
-            ap.as_display(),
-            report.get_log()
-        );
+        println!("Error report for {}: {:?}", ap.display(), report.get_log());
         assert!(!report.get_log().is_empty());
         let errors = report_split_errors(report.get_log_mut());
         assert!(errors[0].error_str().unwrap().starts_with("Prerelease"));
@@ -3002,7 +2993,7 @@ pub mod tests {
 
         println!(
             "Error report for {}: {:?}",
-            ap.as_display(),
+            ap.display(),
             report.get_log()
         );
         assert!(report.get_log().is_empty());