From d459729f67e4a83ce361dcf2bc6d5d75f427e23d Mon Sep 17 00:00:00 2001 From: cc Date: Wed, 20 Aug 2025 20:11:11 -0700 Subject: More descriptive names --- src/label_formats/large_label_format.rs | 20 ++++++++++---------- src/tiff.rs | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) (limited to 'src') diff --git a/src/label_formats/large_label_format.rs b/src/label_formats/large_label_format.rs index 121a4df..f717ac5 100644 --- a/src/label_formats/large_label_format.rs +++ b/src/label_formats/large_label_format.rs @@ -42,25 +42,25 @@ fn flood(source: &LargeLabelFormat, destination: &mut Vec, } } -pub fn compress_large_labels(buffer: LargeLabelFormat) -> LabelFormat { +pub fn compress_large_labels(largelabels: LargeLabelFormat) -> LabelFormat { let mut label: u16 = 1; - let mut output_buffer: Vec = vec![0u16; buffer.buffer.len()]; - for y in 0..buffer.height { - for x in 0..buffer.width { - let index = x + y*buffer.width; - if buffer.buffer[index] == 0 { + let mut output_buffer: Vec = vec![0u16; largelabels.buffer.len()]; + for y in 0..largelabels.height { + for x in 0..largelabels.width { + let index = x + y*largelabels.width; + if largelabels.buffer[index] == 0 { continue; } if output_buffer[index] == 0 { - let color = buffer.buffer[index]; - flood(&buffer, &mut output_buffer, x, y, color, label); + let color = largelabels.buffer[index]; + flood(&largelabels, &mut output_buffer, x, y, color, label); label += 1; } } } return LabelFormat { buffer: output_buffer, - width: buffer.width, - height: buffer.height, + width: largelabels.width, + height: largelabels.height, }; } diff --git a/src/tiff.rs b/src/tiff.rs index 67d4aec..d223961 100644 --- a/src/tiff.rs +++ b/src/tiff.rs @@ -149,7 +149,7 @@ pub fn to_large_labels(tiff_file_name: &str) -> Option { } let width = width_opt.expect("Width Prechecked"); let height = height_opt.expect("Height Prechecked"); - let mut standard_buffer = vec![0u32; (width*height) as usize]; + let mut large_label_buffer = vec![0u32; (width*height) as usize]; let tiff_data = read(tiff); for x in 0..width { for y in 0..height { @@ -160,13 +160,13 @@ pub fn to_large_labels(tiff_file_name: &str) -> Option { if (channels == 4) && (c == 3) { data = 0; } - standard_buffer[x + width*y] += data; + large_label_buffer[x + width*y] += data; } } } close(tiff); return Some(LargeLabelFormat { - buffer: standard_buffer, + buffer: large_label_buffer, width, height, }); -- cgit v1.2.1