Fixed filter weights

Author: awxkee

app/src/main.rs

@@ -28,15 +28,12 @@
  */
 mod image_wrapper;
 
-use image::{
-    imageops, EncodableLayout, GenericImageView,
-    ImageReader,
-};
+use fast_image_resize::images::Image;
+use fast_image_resize::{CpuExtensions, FilterType, PixelType, ResizeAlg, ResizeOptions, Resizer};
+use image::{imageops, EncodableLayout, GenericImageView, ImageReader};
 use pic_scale_safe::{resize_rgb8, resize_rgba8, ImageSize, ResamplingFunction};
 use std::ops::{BitXor, Shr};
 use std::time::Instant;
-use fast_image_resize::images::Image;
-use fast_image_resize::{CpuExtensions, FilterType, PixelType, ResizeAlg, ResizeOptions, Resizer};
 
 fn main() {
     let img = ImageReader::open("./assets/test_alpha.JPG")
@@ -50,7 +47,7 @@ fn main() {
 
     let src_size = ImageSize::new(dimensions.0 as usize, dimensions.1 as usize);
     // let dst_size = ImageSize::new(dimensions.0 as usize / 4, dimensions.1 as usize / 4);
-    let dst_size = ImageSize::new(src_size.width / 6, src_size.height /6);
+    let dst_size = ImageSize::new(3240, 2160);
 
     // let start_mul = Instant::now();
     //
@@ -64,7 +61,7 @@ fn main() {
         &working_store,
         src_size,
         dst_size,
-        ResamplingFunction::Lanczos3,
+        ResamplingFunction::CatmullRom,
     )
     .unwrap();
 
@@ -113,7 +110,7 @@ fn main() {
     //     .unwrap();
     //
     // println!("Working time {:?}", start.elapsed());
-    
+
     // let img = u8_to_u16(dst_image.buffer());
     //
     // let rgba_image = DynamicImage::ImageRgb8(RgbImage::from_raw(dst_image.width() as u32, dst_image.height() as u32, dst_image.buffer().to_vec()).unwrap());

src/compute_weights.rs

@@ -69,7 +69,7 @@ where
         true => scale.max(1f32.as_()),
         false => 1f32.as_(),
     };
-    let filter_base_size = resampling_filter.min_kernel_size;
+    let filter_base_size = resampling_filter.min_kernel_size * 2.;
     let resampling_function = resampling_filter.kernel;
     let window_func = resampling_filter.window;
 

src/floating_point_horizontal.rs

@@ -27,8 +27,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 use crate::color_group::{
-    load_color_group, load_color_group_with_offset, fast_mixed_store_color_group,
-    ColorGroup,
+    fast_mixed_store_color_group, load_color_group, load_color_group_with_offset, ColorGroup,
 };
 use crate::filter_weights::FilterWeights;
 use crate::mixed_storage::MixedStorage;

src/floating_point_vertical.rs

@@ -27,8 +27,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 use crate::color_group::{
-    load_color_group, load_color_group_with_offset, fast_mixed_store_color_group,
-    ColorGroup,
+    fast_mixed_store_color_group, load_color_group, load_color_group_with_offset, ColorGroup,
 };
 use crate::filter_weights::FilterBounds;
 use crate::mixed_storage::MixedStorage;
@@ -86,11 +85,10 @@ pub(crate) fn convolve_column_handler_floating_point_4<
             load_color_group_with_offset!(src_ptr1, CHANNELS, 0, J),
             weight1,
         );
-        sums1 = (load_color_group_with_offset!(src_ptr0, CHANNELS, CHANNELS, J) * weight0)
-            .mul_add(
-                load_color_group_with_offset!(src_ptr1, CHANNELS, CHANNELS, J),
-                weight1,
-            );
+        sums1 = (load_color_group_with_offset!(src_ptr0, CHANNELS, CHANNELS, J) * weight0).mul_add(
+            load_color_group_with_offset!(src_ptr1, CHANNELS, CHANNELS, J),
+            weight1,
+        );
         sums2 = (load_color_group_with_offset!(src_ptr0, CHANNELS, CHANNELS * 2, J) * weight0)
             .mul_add(
                 load_color_group_with_offset!(src_ptr1, CHANNELS, CHANNELS * 2, J),

src/sampler.rs

@@ -248,8 +248,8 @@ impl ResamplingFunction {
         usize: AsPrimitive<T>,
     {
         match self {
-            ResamplingFunction::Bilinear => ResamplingFilter::new(bilinear, 2f32),
-            ResamplingFunction::Area => ResamplingFilter::new_area(box_weight, 2f32),
+            ResamplingFunction::Bilinear => ResamplingFilter::new(bilinear, 1f32),
+            ResamplingFunction::Area => ResamplingFilter::new_area(box_weight, 0.5f32),
             ResamplingFunction::Nearest => {
                 // Just a stab for nearest
                 ResamplingFilter::new(bilinear, 2f32)
@@ -266,7 +266,7 @@ impl ResamplingFunction {
             ResamplingFunction::Bicubic => ResamplingFilter::new(bicubic_spline, 2f32),
             ResamplingFunction::Lanczos4 => ResamplingFilter::new(lanczos4, 4f32),
             ResamplingFunction::Lanczos2 => ResamplingFilter::new(lanczos2, 2f32),
-            ResamplingFunction::Hamming => ResamplingFilter::new(hamming, 2f32),
+            ResamplingFunction::Hamming => ResamplingFilter::new(hamming, 1f32),
             ResamplingFunction::Hanning => ResamplingFilter::new(hanning, 2f32),
             ResamplingFunction::Welch => ResamplingFilter::new(welch, 2f32),
             ResamplingFunction::Quadric => ResamplingFilter::new(quadric, 2f32),