rszr 1.4.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42f7ff2b0188f0d494a5ec087af2d15c835d309d276c0d4d2074138aa88e621b
-  data.tar.gz: e808c1406cec89ce6d65a111531742140b678f003c9c786f172a1d5f14bc01fe
+  metadata.gz: 2f2a52f40e9ac6688345bcb8fcd3a27b14a7e9e50783751c0067a8eb678414cd
+  data.tar.gz: 6845fdceafd2abc6bc6ff1daca9186d930f7f9c27ce5f607dfa4e0be049cd98b
 SHA512:
-  metadata.gz: 206c800ef7aad7318e4ad417332ab8c2647f7f05e1e92365be749833cfddd90e11048aa9088b390b8e8dfed820482b1955e1d4868fb7c15b365e1acd8e9ca55c
-  data.tar.gz: 92299076d2bdb47a383692d5c26387969cf680d22806640503090acba11c1eb74310a71adf3ca33bde211e296a98de0f92ae2d04d25f8fc962296096991ac99d
+  metadata.gz: cd6170c8710307867de88a376edd1635d1afa239719e76a1c5dca13e5b0936b617f8f4b5183d2ede01825102cea3a9a343bf3508bed88a948c685560e645afb7
+  data.tar.gz: 55874169e944187bea206565fe823b4fb49f52d8dd25e633eb20a00a8359258bab037584712ac2337046ac5a250e83563752918a4ab3b769be26ac2af4c2d6df

data/README.md

@@ -238,6 +238,14 @@ image.contrast(0.5)
 
 # gamma
 image.gamma(1.1)
+
+# convert to grayscale (automatic mode)
+image.desaturate
+
+# convert to grayscale with mode
+image.desaturate(:lightness)
+image.desaturate(:luminosity)
+image.desaturate(:average)
 ```
 
 ### Image auto orientation

data/ext/rszr/errors.h

@@ -6,6 +6,7 @@ void rszr_raise_load_error(Imlib_Load_Error error);
 void rszr_raise_save_error(Imlib_Load_Error error);
 
 extern VALUE eRszrError;
+extern VALUE eRszrInternalError;
 extern VALUE eRszrFileNotFound;
 extern VALUE eRszrTransformationError;
 extern VALUE eRszrErrorWithMessage;

data/ext/rszr/image.c

@@ -27,14 +27,14 @@ static void rszr_image_deallocate(rszr_image_handle * handle)
     rszr_free_image(handle->image);
     handle->image = NULL;
   }
-  free(handle);
+  xfree(handle);
   // fprintf(stderr, "\n");
 }
 
 static VALUE rszr_image_s_allocate(VALUE klass)
 {
-  rszr_image_handle * handle = calloc(1, sizeof(rszr_image_handle));
-  return Data_Wrap_Struct(klass, NULL, rszr_image_deallocate, handle);
+  rszr_image_handle * handle;
+  return Data_Make_Struct(klass, rszr_image_handle, NULL, rszr_image_deallocate, handle);
 }
 
 
@@ -49,6 +49,13 @@ static VALUE rszr_image__initialize(VALUE self, VALUE rb_width, VALUE rb_height)
   
   handle->image = imlib_create_image(FIX2INT(rb_width), FIX2INT(rb_height));
 
+  if (!handle->image) {
+    rb_raise(eRszrInternalError, "error creating image");
+  }
+
+  imlib_context_set_image(handle->image);
+  imlib_image_clear();
+
   return self;
 }
 
@@ -394,6 +401,54 @@ static VALUE rszr_image__sharpen_bang(VALUE self, VALUE rb_radius)
 }
 
 
+static void rszr_desaturate_pixel(rszr_raw_pixel * pixel, int mode)
+{
+  uint8_t grey;
+  if (mode == 2 || (mode == 0 && (pixel->blue > pixel->red && pixel->blue > pixel->green))) {
+    // lightness
+    grey = (pixel->blue + (pixel->red > pixel->green ? pixel->green : pixel->red)) / 2;
+  } else if (mode == 1 || mode == 0) {
+    // luminosity
+    grey = 0.21 * pixel->red + 0.72 * pixel->green + 0.07 * pixel->blue;
+  } else {
+    // average
+    grey = (pixel->red + pixel->green + pixel->blue) / 3;
+  }
+  pixel->red = grey;
+  pixel->green = grey;
+  pixel->blue = grey;
+}
+
+static VALUE rszr_image__desaturate_bang(VALUE self, VALUE rb_mode)
+{
+  rszr_image_handle * handle;
+  rszr_raw_pixel * pixels;
+  uint64_t size;
+  int mode;
+  
+  mode = NUM2INT(rb_mode);
+  
+  Data_Get_Struct(self, rszr_image_handle, handle);
+  
+  imlib_context_set_image(handle->image);
+  
+  pixels = (rszr_raw_pixel *) imlib_image_get_data();
+  if (pixels == NULL) {
+    rb_raise(eRszrTransformationError, "error desaturating image");
+    return Qnil;
+  }
+  
+  size = imlib_image_get_width() * imlib_image_get_height();
+  for (uint64_t i = 0; i < size; i++) {
+    rszr_desaturate_pixel(&pixels[i], mode);
+  }
+  
+  imlib_image_put_back_data((uint32_t *) pixels);
+  
+  return self;
+}
+
+
 static Imlib_Image rszr_create_cropped_scaled_image(const Imlib_Image image, VALUE rb_src_x, VALUE rb_src_y, VALUE rb_src_w, VALUE rb_src_h, VALUE rb_dst_w, VALUE rb_dst_h)
 {
   Imlib_Image resized_image;
@@ -688,15 +743,16 @@ void Init_rszr_image()
   rb_define_protected_method(cImage, "_format",  rszr_image__format_get, 0);
   rb_define_protected_method(cImage, "_format=", rszr_image__format_set, 1);
 
-  rb_define_private_method(cImage, "_initialize", rszr_image__initialize, 2);
-  rb_define_private_method(cImage, "_resize",     rszr_image__resize, 7);
-  rb_define_private_method(cImage, "_crop",       rszr_image__crop, 5);
-  rb_define_private_method(cImage, "_turn!",      rszr_image__turn_bang, 1);
-  rb_define_private_method(cImage, "_rotate",     rszr_image__rotate, 2);
-  rb_define_private_method(cImage, "_sharpen!",   rszr_image__sharpen_bang, 1);
-  rb_define_private_method(cImage, "_pixel",      rszr_image__pixel_get, 2);
-  rb_define_private_method(cImage, "_blend",      rszr_image__blend, 11);
-  rb_define_private_method(cImage, "_rectangle!", rszr_image__rectangle_bang, 5);
+  rb_define_private_method(cImage, "_initialize",   rszr_image__initialize, 2);
+  rb_define_private_method(cImage, "_resize",       rszr_image__resize, 7);
+  rb_define_private_method(cImage, "_crop",         rszr_image__crop, 5);
+  rb_define_private_method(cImage, "_turn!",        rszr_image__turn_bang, 1);
+  rb_define_private_method(cImage, "_rotate",       rszr_image__rotate, 2);
+  rb_define_private_method(cImage, "_sharpen!",     rszr_image__sharpen_bang, 1);
+  rb_define_private_method(cImage, "_desaturate!",  rszr_image__desaturate_bang, 1);
+  rb_define_private_method(cImage, "_pixel",        rszr_image__pixel_get, 2);
+  rb_define_private_method(cImage, "_blend",        rszr_image__blend, 11);
+  rb_define_private_method(cImage, "_rectangle!",   rszr_image__rectangle_bang, 5);
 
   rb_define_private_method(cImage, "_save",       rszr_image__save, 4);
 }

data/ext/rszr/image.h

@@ -5,6 +5,10 @@ typedef struct {
   Imlib_Image image;
 } rszr_image_handle;
 
+typedef struct {
+  uint8_t blue, green, red, alpha; //alpha, red, green, blue;
+} rszr_raw_pixel;
+
 extern VALUE cImage;
 
 void Init_rszr_image();

data/lib/rszr/image.rb

@@ -2,6 +2,7 @@ module Rszr
   class Image
     GRAVITIES = [true, :center, :n, :nw, :w, :sw, :s, :se, :e, :ne].freeze
     BLENDING_MODES = %i[copy add subtract reshade].freeze
+    DESATURATION_MODES = %i[dynamic luminosity lightness average].freeze
     
     extend Identification
     include Buffered
@@ -119,6 +120,16 @@ module Rszr
         _sharpen!(-radius)
       end
       
+      def desaturate!(mode = :dynamic)
+        _mode = DESATURATION_MODES.index(mode)
+        raise ArgumentError, 'illegal mode' unless _mode
+        _desaturate!(_mode);
+      end
+      
+      def desaturate(*args, **opts)
+        dup.desaturate!(*args, **opts)
+      end
+      
       def filter(filter_expr)
         dup.filter!(filter_expr)
       end

data/lib/rszr/version.rb

@@ -1,3 +1,3 @@
 module Rszr
-  VERSION = '1.4.0'
+  VERSION = '1.5.1'
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rszr
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Matthias Grosser
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-10 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies: []
 description: Fast image resizer - do one thing and do it fast.
 email:
@@ -48,7 +47,6 @@ homepage: https://github.com/mtgrosser/rszr
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -65,8 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - imlib2
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Fast image resizer
 test_files: []