Merge branch 'main' into gpeacock/sign_file_peformance

Author: gpeacock

.gitignore

@@ -2,6 +2,7 @@
 # will have compiled files and executables
 debug/
 target/
+.idea
 
 venv/
 .venv/

Cargo.toml

@@ -11,7 +11,7 @@ crate-type = ["cdylib"]
 
 
 [dependencies]
-c2pa = {version = "0.32.4", features = ["unstable_api", "file_io", "openssl", "fetch_remote_manifests"]}
+c2pa = {version = "0.35.0", features = ["unstable_api", "file_io", "openssl", "pdf", "fetch_remote_manifests"]}
 pem = "3.0.3"
 serde = { version = "1.0.197", features = ["derive"] }
 serde_derive = "1.0"

src/lib.rs

@@ -140,7 +140,7 @@ impl Builder {
     ) -> Result<()> {
         if let Ok(mut builder) = self.builder.try_write() {
             let mut stream = StreamAdapter::from(stream);
-            builder.add_ingredient(ingredient_json, format, &mut stream)?;
+            builder.add_ingredient_from_stream(ingredient_json, format, &mut stream)?;
         } else {
             return Err(Error::RwLock);
         };

tests/fixtures/cloud.jpg

@@ -51,6 +51,11 @@ def getitem(d, key):
     ]
 }
 
+def test_v2_read_cloud_manifest():
+    reader = Reader.from_file("tests/fixtures/cloud.jpg")
+    manifest = reader.get_active_manifest()
+    assert manifest is not None
+
 def test_version():
     assert version() == "0.5.1"