bendns' repos / remapper
remove car
Browse Source
bendn 3 weeks ago
parent 1c5222d · commit cf2c3dc
Diffstat
-rw-r--r--Cargo.lock6
-rw-r--r--Cargo.toml1
-rw-r--r--src/lib.rs13
-rw-r--r--src/ordered.rs3
4 files changed, 9 insertions, 14 deletions
diff --git a/Cargo.lock b/Cargo.lock
index d54982c..4f2b9af 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -81,8 +81,9 @@ checksum = "6a02dba6a60cd31533cf16561ced53239686d18f1464bff49579dd320fcea081"
[[package]]
name = "fimg"
-version = "0.4.52"
-source = "git+https://git.bendn.org/fimg#6db604c71c7e278c9d8c285510678dd46c49c4ab"
+version = "0.4.55"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d086d8ccfa70269fc0e33affce0bc1ddec2063350fd22ad1717f66baa0d4d38"
dependencies = [
"array_chunks",
"atools",
@@ -254,7 +255,6 @@ name = "remapper"
version = "0.1.0"
dependencies = [
"atools",
- "car",
"exoquant",
"fimg",
"hinted 0.0.2",
diff --git a/Cargo.toml b/Cargo.toml
index 93a067d..ee64d61 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2024"
[dependencies]
atools = "0.1.5"
-car = "0.1.1"
exoquant = "0.2.0"
fimg = { version = "0.4.52", default-features = false, features = [
"save",
diff --git a/src/lib.rs b/src/lib.rs
index 2cc8c8b..48e46e1 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -2,15 +2,12 @@
#![feature(
custom_inner_attributes,
proc_macro_hygiene,
- type_alias_impl_trait,
adt_const_params,
- stmt_expr_attributes,
- iter_array_chunks,
generic_const_exprs,
core_intrinsics,
- iter_intersperse,
- maybe_uninit_array_assume_init,
- iter_map_windows
+ const_closures,
+ const_array,
+ const_trait_impl
)]
#![allow(non_camel_case_types)]
#[derive(Copy, Clone)]
@@ -48,10 +45,10 @@ pub mod dumb;
use std::ops::Deref;
use atools::prelude::*;
-use dumb::Closest;
+pub use dumb::Closest;
use fimg::{Image, indexed::IndexedImage};
-fn dither<'a, const C: usize>(
+pub fn dither<'a, const C: usize>(
image: Image<impl AsRef<[f32]>, C>,
f: impl FnMut(((usize, usize), &[f32; C])) -> u32,
pal: pal<'a, C>,
diff --git a/src/ordered.rs b/src/ordered.rs
index 854b436..b2e2c84 100644
--- a/src/ordered.rs
+++ b/src/ordered.rs
@@ -5,8 +5,7 @@ use fimg::indexed::IndexedImage;
use super::*;
const fn threshold<const N: usize>(x: [u32; N]) -> [f32; N] {
- car::map!(x, |x| x as f32 * (1. / N as f32)
- - 0.5 * ((N - 1) as f32 * (1. / N as f32)))
+ x.map(const |x| x as f32 * (1. / N as f32) - 0.5 * ((N - 1) as f32 * (1. / N as f32)))
}
const fn next<const N: usize>(input: [u32; N]) -> [u32; N.isqrt() * 2 * N.isqrt() * 2]