summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHubert Figuière <hub@figuiere.net>2023-08-19 11:33:27 -0400
committerHubert Figuière <hub@figuiere.net>2023-08-19 11:33:27 -0400
commite7d9462efb93cc7dada674d7fe5f1fb33859f827 (patch)
tree68f46914df81ffb3860bd24e08f4dcfb9c045c96
parent392eaf2ceed97e52141d9aa1cecabe4a8dd706e1 (diff)
tiff: remove violation of minimum Rust version
-rw-r--r--src/tiff/dir.rs9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/tiff/dir.rs b/src/tiff/dir.rs
index 316985d..accf1ff 100644
--- a/src/tiff/dir.rs
+++ b/src/tiff/dir.rs
@@ -46,6 +46,7 @@ use crate::sigma;
use crate::sony;
use crate::tiff;
use crate::tiff::exif;
+use crate::utils;
#[cfg(feature = "dump")]
use crate::Dump;
use crate::Type as RawType;
@@ -750,15 +751,11 @@ impl Dump for Dir {
where
W: std::io::Write + ?Sized,
{
- let id_converted = std::ffi::CStr::from_bytes_until_nul(&self.id);
- let id = match id_converted {
- Ok(id) => format!(" id={id:?}"),
- Err(err) => format!(" id=Err({err:?})"),
- };
+ let id = utils::from_maybe_nul_terminated(&self.id);
dump_writeln!(
out,
indent,
- "<IFD type={:?}{} {} entries next=@{}>",
+ "<IFD type={:?} id=\"{}\" {} entries next=@{}>",
self.type_,
id,
self.num_entries(),