c2pa-rs

A fork of https://github.com/contentauth/c2pa-rs/
git clone git://archive.git.mtrnord.blog/mtrnords-photography-manager/c2pa-rs.git
Log | Files | Refs | README

commit d771b144e79a1a26c7ff57f452063ec7a1a57c5d
parent ea8bc5d8103513019b1111b1b95a9cdcbfcd7ce3
Author: MTRNord <mtrnord1@gmail.com>
Date:   Sun, 23 Jun 2024 16:24:17 +0200

Ensure we use the correct type

Diffstat:
Msdk/src/builder.rs | 14+++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/sdk/src/builder.rs b/sdk/src/builder.rs @@ -20,7 +20,10 @@ use async_generic::async_generic; use serde::{de::DeserializeOwned, Deserialize, Serialize}; use serde_with::skip_serializing_none; use uuid::Uuid; -use zip::{write::FileOptions, ZipArchive, ZipWriter}; +use zip::{ + write::SimpleFileOptions, + ZipArchive, ZipWriter, +}; use crate::{ assertion::{AssertionBase, AssertionDecodeError}, @@ -356,16 +359,13 @@ impl Builder { /// * `stream` - A stream to write the zip into. /// # Errors /// * If the archive cannot be written. - pub fn to_archive<T: zip::write::FileOptionExtension + std::marker::Copy>( - &mut self, - stream: impl Write + Seek, - ) -> Result<()> { + pub fn to_archive(&mut self, stream: impl Write + Seek) -> Result<()> { drop( // this drop seems to be required to force a flush before reading back. { let mut zip = ZipWriter::new(stream); - let options: FileOptions<'_, T> = - FileOptions::default().compression_method(zip::CompressionMethod::Stored); + let options = + SimpleFileOptions::default().compression_method(zip::CompressionMethod::Stored); zip.start_file("manifest.json", options) .map_err(|e| Error::OtherError(Box::new(e)))?; zip.write_all(&serde_json::to_vec(self)?)?;