0.0.9

bumped deps
dropped ordered-float

Author: eadf

.cargo/config.toml

@@ -2,3 +2,4 @@
 test-all = "test --all --features=clang-runtime"
 clippy-all = "clippy --all --all-targets --features=clang-runtime"
 fmt-all = "fmt --all"
+doc-all = "rustdoc"

.github/workflows/rust.yml

@@ -43,7 +43,7 @@ jobs:
       - name: Clone OpenCV repositories
         run: |
           set -e  # Exit immediately on error
-          OPENCV_VERSION=4.11.0
+          OPENCV_VERSION=4.12.0
           git clone --depth 1 --branch $OPENCV_VERSION https://github.com/opencv/opencv.git
           git clone --depth 1 --branch $OPENCV_VERSION https://github.com/opencv/opencv_contrib.git
           mkdir -p opencv/build
@@ -61,7 +61,7 @@ jobs:
           path: |
             opencv/build
             ${{ github.workspace }}/opencv_install
-          key: opencv-${{ runner.os }}-${{ hashFiles('opencv/CMakeLists.txt') }}-4.11.0
+          key: opencv-${{ runner.os }}-${{ hashFiles('opencv/CMakeLists.txt') }}-4.12.0
 
       # Build OpenCV if cache miss
       - name: Build OpenCV from source

Cargo.toml

@@ -2,23 +2,23 @@
 authors = ["eadf <lacklustr@protonmail.com>"]
 name = "libstacker"
 license = "MIT OR Apache-2.0"
-version = "0.0.8"
+version = "0.0.9"
 edition = "2024"
 readme = "README.md"
 keywords = ["opencv", "image_stacking"]
 repository = "https://github.com/eadf/libstacker.rs"
 description = "Image alignment and stacking functions based on OpenCV and Rayon"
-rust-version = "1.85.1"
+rust-version = "1.87.0"
 
 [[example]]
 name = "main"
 path = "examples/main.rs"
+doc = false
 
 [dependencies]
-opencv = { version = "0.94.3" , features = ["features2d"] }
-thiserror = "2.0.12"
-ordered-float = "5.0.0"
-rayon = "1.10.0"
+opencv = { version = "0.97.2", features = ["features2d"] }
+thiserror = "2.0.17"
+rayon = "1.11.0"
 
 [features]
 default = ["clang-runtime"]

README.md

@@ -2,7 +2,8 @@
 [![Documentation](https://docs.rs/libstacker/badge.svg)](https://docs.rs/libstacker)
 [![Rust test](https://github.com/eadf/libstacker.rs/actions/workflows/rust.yml/badge.svg?branch=main)](https://github.com/eadf/libstacker.rs/actions/workflows/rust.yml)
 [![dependency status](https://deps.rs/crate/libstacker/0.0.8/status.svg)](https://deps.rs/crate/libstacker/0.0.8)
-![license](https://img.shields.io/crates/l/libstacker)
+[![license](https://img.shields.io/crates/l/libstacker?maxAge=2592000)](https://github.com/eadf/libstacker.rs#license)
+[![Sponsor](https://img.shields.io/static/v1?label=Sponsor&message=%E2%9D%A4&logo=GitHub&color=%23fe8e86)](https://github.com/sponsors/eadf)
 
 # libstacker
 A multithreaded port of the python code found [here: github.com/maitek/image_stacking](https://github.com/maitek/image_stacking) 
@@ -20,7 +21,7 @@ Read more about image alignment with OpenCV [here](https://learnopencv.com/image
 Opencv-rust can be little tricky to install. Follow the instructions from [rust opencv](https://crates.io/crates/opencv)
 
 You will need the "clang-runtime" feature if you <a href="https://github.com/twistedfall/opencv-rust#Troubleshooting">experience problems with your clang environment</a>
-Disclaimer: the library is only built and tested against opencv 4.11.0.
+Disclaimer: the library is only built and tested against opencv 4.12.0.
 
 ```bash
 cargo build --release
@@ -91,3 +92,9 @@ Licensed under either of
 * MIT license ([LICENSE-MIT](LICENSE-MIT) or <http://opensource.org/licenses/MIT)>
 
 at your option.
+
+## Contribution
+
+Unless explicitly stated otherwise, any contribution intentionally submitted  
+for inclusion in the project by you, as defined in the Apache-2.0 license,  
+shall be dual-licensed as above, without any additional terms or conditions.

examples/main.rs

@@ -50,7 +50,7 @@ fn main() -> Result<(), StackerError> {
     println!("Calculated sharpness() in {:?}", now.elapsed());
 
     // sort images by sharpness using TENG for now
-    files.sort_by_key(|f| ordered_float::OrderedFloat(f.3));
+    files.sort_by(|a, b| a.3.partial_cmp(&b.3).unwrap_or(std::cmp::Ordering::Equal));
 
     println!("Files ordered by TENG (low quality first)");
     for f in files.iter() {

src/lib.rs

@@ -7,7 +7,7 @@
 //! Copyright (c) 2021, 2025 Eadf <lacklustr@protonmail.com>.
 //! License: MIT/Apache 2.0
 //!
-//! The is a port of code written by Mathias Sundholm.
+//! This is a port of code written by Mathias Sundholm.
 //! Copyright (c) 2021 <https://github.com/maitek/image_stacking>
 //! License: MIT
 //!
@@ -19,7 +19,6 @@ pub mod utils;
 pub use opencv;
 use opencv::core::{Point2f, Vector};
 use opencv::{calib3d, core, features2d, imgcodecs, imgproc, prelude::*};
-use ordered_float::OrderedFloat;
 use rayon::prelude::*;
 use std::path::PathBuf;
 use thiserror::Error;
@@ -231,8 +230,7 @@ where
                                 .collect::<Vec<_>>();
 
                             // Sort by distance
-                            filtered_matches.sort_by(|a, b| OrderedFloat(a.distance).cmp(&OrderedFloat(b.distance)));
-
+                            filtered_matches.sort_by(|a, b| a.distance.partial_cmp(&b.distance).unwrap_or(std::cmp::Ordering::Equal));
                             // Keep only the best 50% of matches (optional)
                             let num_to_keep = (filtered_matches.len() as f32 * params.match_keep_ratio).round() as usize;
                             filtered_matches.truncate(num_to_keep);
@@ -464,7 +462,9 @@ where
 
                             // Sort by distance
                             filtered_matches.sort_by(|a, b| {
-                                OrderedFloat(a.distance).cmp(&OrderedFloat(b.distance))
+                                a.distance
+                                    .partial_cmp(&b.distance)
+                                    .unwrap_or(std::cmp::Ordering::Equal)
                             });
 
                             // Keep only the best 50% of matches (optional)

src/utils.rs

@@ -34,7 +34,7 @@ unsafe impl Sync for UnsafeVectorKeyPointSyncWrapper {}
 pub(super) struct UnsafeMatSyncWrapper(pub(super) Mat);
 unsafe impl Sync for UnsafeMatSyncWrapper {}
 
-/// Trait for setting value in a 2d Mat<T>
+/// Trait for setting value in a 2d `Mat<T>`
 /// Todo:There must be a better way to do this
 pub trait SetMValue {
     fn set_2d<T: opencv::prelude::DataType>(