danvics/oxipng
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Optimize co-occurence matrix

Browse source
This commit is contained in:
Kornel 2024-03-26 15:23:16 +00:00 committed by andrews05
parent 36de54318d
commit a3590df20c
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/reduction/palette.rs
View file

@ -201,14 +201,18 @@ fn most_popular_edge_color(num_colors: usize, png: &PngImage) -> usize {
} }
// Calculate co-occurences matrix // Calculate co-occurences matrix
fn co_occurrence_matrix(num_colors: usize, png: &PngImage) -> Vec<Vec<usize>> { fn co_occurrence_matrix(num_colors: usize, png: &PngImage) -> Vec<Vec<u32>> {
let mut matrix = vec![vec![0; num_colors]; num_colors]; let mut matrix = vec![vec![0u32; num_colors]; num_colors];
let mut prev: Option<ScanLine> = None; let mut prev: Option<ScanLine> = None;
let mut prev_val = None;
for line in png.scan_lines(false) { for line in png.scan_lines(false) {
for i in 0..line.data.len() { for i in 0..line.data.len() {
let val = line.data[i] as usize; let val = line.data[i] as usize;
if i > 0 { if val > num_colors {
matrix[line.data[i - 1] as usize][val] += 1; continue;
}
if let Some(prev_val) = prev_val.replace(val) {
matrix[prev_val][val] += 1;
} }
if let Some(prev) = &prev { if let Some(prev) = &prev {
matrix[prev.data[i] as usize][val] += 1; matrix[prev.data[i] as usize][val] += 1;
@ -220,7 +224,7 @@ fn co_occurrence_matrix(num_colors: usize, png: &PngImage) -> Vec<Vec<usize>> {
} }
// Calculate edge list sorted by weight // Calculate edge list sorted by weight
fn weighted_edges(matrix: &[Vec<usize>]) -> Vec<(usize, usize)> { fn weighted_edges(matrix: &[Vec<u32>]) -> Vec<(usize, usize)> {
let mut edges = Vec::new(); let mut edges = Vec::new();
for i in 0..matrix.len() { for i in 0..matrix.len() {
for j in 0..i { for j in 0..i {