wim/image-tiff
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: simplify hash computation and remove unused benchmark

Browse Source 
Address PR review feedback:

- Remove benches/decode.rs which referenced non-existent gen_bench_tiff.c
- Simplify compute_tiff_hash: replace 66-line match block with
  as_buffer().as_bytes() + ByteOrder::convert for LE normalization
- Use TIFF Type repr(u16) as hash discriminant instead of ad-hoc u8
- Rename all 74 seq test images to match updated hashes
This commit is contained in:
Lilith River committed 2026-03-10 14:43:07 -06:00
1 parent 3434d0220b
commit 2d6d92e81d
77 files changed
+23 -111
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tests/decode_images.rs
+23 -68
View File
@@ -1,6 +1,7 @@
extern crate tiff;
use tiff::decoder::{ifd, Decoder, DecodingResult};
use tiff::tags::{ByteOrder, Type};
use tiff::ColorType;
use std::fs::File;
@@ -83,7 +84,7 @@ fn compute_tiff_hash<R: Read + Seek>(reader: R) -> u32 {
decoder.next_image().expect("Cannot read image IFD");
let (width, height) = decoder.dimensions().unwrap();
let color_type = decoder.colortype().unwrap();
let result = decoder.read_image().unwrap();
let mut result = decoder.read_image().unwrap();
// Hash page index + dimensions
hasher.update(&page.to_le_bytes());
@@ -111,73 +112,27 @@ fn compute_tiff_hash<R: Read + Seek>(reader: R) -> u32 {
other => panic!("compute_tiff_hash: unhandled ColorType {other:?}"),
}
// Hash decoded data with type discriminant + LE sample bytes
match result {
DecodingResult::U8(ref data) => {
hasher.update(&[0]);
hasher.update(data);
}
DecodingResult::U16(ref data) => {
hasher.update(&[1]);
for v in data {
hasher.update(&v.to_le_bytes());
}
}
DecodingResult::U32(ref data) => {
hasher.update(&[2]);
for v in data {
hasher.update(&v.to_le_bytes());
}
}
DecodingResult::U64(ref data) => {
hasher.update(&[3]);
for v in data {
hasher.update(&v.to_le_bytes());
}
}
DecodingResult::F16(ref data) => {
hasher.update(&[4]);
for v in data {
hasher.update(&v.to_le_bytes());
}
}
DecodingResult::F32(ref data) => {
hasher.update(&[5]);
for v in data {
hasher.update(&v.to_le_bytes());
}
}
DecodingResult::F64(ref data) => {
hasher.update(&[6]);
for v in data {
hasher.update(&v.to_le_bytes());
}
}
DecodingResult::I8(ref data) => {
hasher.update(&[7]);
for v in data {
hasher.update(&v.to_le_bytes());
}
}
DecodingResult::I16(ref data) => {
hasher.update(&[8]);
for v in data {
hasher.update(&v.to_le_bytes());
}
}
DecodingResult::I32(ref data) => {
hasher.update(&[9]);
for v in data {
hasher.update(&v.to_le_bytes());
}
}
DecodingResult::I64(ref data) => {
hasher.update(&[10]);
for v in data {
hasher.update(&v.to_le_bytes());
}
}
}
// Hash decoded data: TIFF type tag (u16 repr) + LE sample bytes.
// Map each variant to the corresponding TIFF Type for byte-order normalization.
let sample_type = match &result {
DecodingResult::U8(_) => Type::BYTE,
DecodingResult::I8(_) => Type::SBYTE,
DecodingResult::U16(_) => Type::SHORT,
DecodingResult::I16(_) => Type::SSHORT,
DecodingResult::U32(_) => Type::LONG,
DecodingResult::I32(_) => Type::SLONG,
DecodingResult::F32(_) => Type::FLOAT,
DecodingResult::U64(_) => Type::LONG8,
DecodingResult::I64(_) => Type::SLONG8,
DecodingResult::F64(_) => Type::DOUBLE,
DecodingResult::F16(_) => Type::SHORT, // f16 is 2 bytes like SHORT
};
hasher.update(&sample_type.to_u16().to_le_bytes());
let mut buf = result.as_buffer(0);
let bytes = buf.as_bytes_mut();
ByteOrder::native().convert(sample_type, bytes, ByteOrder::LittleEndian);
hasher.update(bytes);
page += 1;
if !decoder.more_images() {