mark/image-similarity
1
0
Fork 0
Code Pull Requests Packages Projects Releases Activity

resize function refactor

Browse Source
This commit is contained in:
Mark Hoekveen
2024-05-04 10:57:42 +02:00
parent 3c861cb796
commit a9ee164b4f
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/descriptors.rs
+5 -2
View File
@@ -5,6 +5,9 @@ pub trait Descriptor {
fn info(&self) -> String { fn info(&self) -> String {
"Descriptor".to_string() "Descriptor".to_string()
} }
fn resize(&self, img: image::DynamicImage) -> image::DynamicImage {
img.grayscale().thumbnail_exact(8, 8)
}
fn describe(&self, img: image::DynamicImage) -> u64; fn describe(&self, img: image::DynamicImage) -> u64;
fn distance(&self, a: u64, b: u64) -> u64 { fn distance(&self, a: u64, b: u64) -> u64 {
(a^b).count_ones().into() (a^b).count_ones().into()
@@ -22,7 +25,7 @@ pub struct Median;
impl Descriptor for Median { impl Descriptor for Median {
fn describe(&self, img: image::DynamicImage) -> u64 { fn describe(&self, img: image::DynamicImage) -> u64 {
let img = img.grayscale().thumbnail_exact(8, 8); let img = self.resize(img);
let mut values: [u8; 64] = [0; 64]; let mut values: [u8; 64] = [0; 64];
let mut i: usize = 0; let mut i: usize = 0;
for (_, _, pix) in img.pixels() { for (_, _, pix) in img.pixels() {
@@ -47,7 +50,7 @@ pub struct DCT;
impl Descriptor for DCT { impl Descriptor for DCT {
fn describe(&self, img: image::DynamicImage) -> u64 { fn describe(&self, img: image::DynamicImage) -> u64 {
let mut dct_values: [f64; 64] = [0.0; 64]; let mut dct_values: [f64; 64] = [0.0; 64];
let img = img.grayscale().thumbnail_exact(8, 8); let img = self.resize(img);
let mut total_sum: f64 = 0.0; let mut total_sum: f64 = 0.0;
for j in 0..7 { for j in 0..7 {