rszr 0.8.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 035d5f7341e71cdc9b5ba70de6e116acd8d8459e
-  data.tar.gz: 3119e97a26295db8f3931821d6ae835aaa6166ee
+SHA256:
+  metadata.gz: ea3437991dd4694e35653020632c3fc360f787e1d391834780fdf118991a90ce
+  data.tar.gz: 37ccc3f8693e4fe9d41939cfc2d3786ef72ed24e344059f1dd4e4492efcae862
 SHA512:
-  metadata.gz: 003305cff18cc4678a13f238e17d709351a36efea86b5ca2de751d15f933211c0d107601f2be6aa70dfc92a30a87615fdf3372dae26552190d21911451d33445
-  data.tar.gz: 732e05777cf4adc9c87515e043a226ed42bd56d0c76e3a28bf645fa22b492fed2cb2a473dbdccd4980b76a23b2d7bf579ec45c68a305a07c77f890697ff82e66
+  metadata.gz: 35b8219e81c0f89e4b51719617c13edf71421d7e3ed4e1998f8e26fc017545da76c5164c0bbd63c16e5c617cfdd4f5cb1f07a8e0bbdc83b7bb90ea7fbbd71907
+  data.tar.gz: fd4361d89e0ff577032da1dea39686c035604d98e5b6b935ca8de8f1289bdfe6cf5678c8842406c0b9c5829cfab2c03af8350670638824a99deeb176e4675428

data/README.md

@@ -60,6 +60,9 @@ image.width => 400
 image.height => 300
 image.dimensions => [400, 300]
 image.format => "jpeg"
+image[0, 0] => <Rszr::Color::RGBA @red=38, @green=115, @blue=141, @alpha=255>
+image[0, 0].to_hex => "26738dff"
+image[0, 0].to_hex(rgb: true) => "26738d"
 ```
 
 ### Transformations
@@ -68,6 +71,8 @@ For each transformation, there is a bang! and non-bang method.
 The bang method changes the image in place, while the non-bang method
 creates a copy of the image in memory.
 
+#### Resizing
+
 ```ruby
 # auto height
 image.resize(400, :auto)
@@ -78,6 +83,22 @@ image.resize(:auto, 300)
 # scale factor
 image.resize(0.5)
 
+# resize to fill
+image.resize(400, 300, crop: true)
+
+# resize to fill with gravity
+# where gravity in [:n, :nw, :w, :sw, :w, :se, :e, :ne, :center]
+image.resize(400, 300, crop: gravity)
+
+# save memory, do not duplicate instance
+image.resize!(400, :auto)
+```
+
+Check out the [full list and demo of resize options](https://mtgrosser.github.io/rszr/resizing.html)!
+
+#### Other transformations
+
+```ruby
 # crop
 image.crop(200, 200, 100, 100)
 
@@ -98,9 +119,6 @@ image.flop
 
 # initialize copy
 image.dup
-
-# save memory, do not duplicate instance
-image.resize!(400, :auto)
 ```
 
 ### Filters
@@ -146,12 +164,12 @@ Rszr.autorotate = true
 
 ## Rails / ActiveStorage interface
 
-Rszr provides a drop-in interface to the `image_resizing` gem.
+Rszr provides a drop-in interface to the `image_processing` gem.
 It is faster than both `mini_magick` and `vips` and way easier to install than the latter.
 
 ```ruby
 # Gemfile
-gem 'image_resizing'
+gem 'image_processing'
 gem 'rszr'
 
 # config/initializers/rszr.rb

data/ext/rszr/image.c

@@ -140,6 +140,32 @@ static VALUE rszr_image_height(VALUE self)
   return INT2NUM(height);
 }
 
+
+static VALUE rszr_image__pixel_get(VALUE self, VALUE rb_x, VALUE rb_y)
+{
+  rszr_image_handle * handle;
+  Imlib_Color color_return;
+  VALUE rb_rgba;
+  int x, y;
+  
+  Check_Type(rb_x, T_FIXNUM);
+  x = FIX2INT(rb_x);
+  Check_Type(rb_y, T_FIXNUM);
+  y = FIX2INT(rb_y);
+  
+  Data_Get_Struct(self, rszr_image_handle, handle);
+  
+  imlib_context_set_image(handle->image);
+  imlib_image_query_pixel(x, y, &color_return);
+  
+  rb_rgba = rb_ary_new3(4, INT2NUM(color_return.red),
+                           INT2NUM(color_return.green),
+                           INT2NUM(color_return.blue),
+                           INT2NUM(color_return.alpha));
+  return rb_rgba;
+}
+
+
 /*
 static VALUE rszr_image_get_quality(VALUE self)
 {
@@ -309,7 +335,7 @@ static VALUE rszr_image__sharpen_bang(VALUE self, VALUE rb_radius)
   if (radius >= 0) {
     imlib_image_sharpen(radius);
   } else {
-    imlib_image_blur(radius);
+    imlib_image_blur(-radius);
   }
   
   return self;
@@ -475,6 +501,7 @@ void Init_rszr_image()
   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, "_save",       rszr_image__save, 3);
 }

data/lib/rszr/color.rb

@@ -0,0 +1,25 @@
+module Rszr
+  module Color
+
+    class RGBA
+      attr_reader :red, :green, :blue, :alpha
+
+      def initialize(red, green, blue, alpha = 255)
+        if red < 0 || red > 255 || green < 0 || green > 255 || blue < 0 || blue > 255 || alpha < 0 || alpha > 255
+          raise ArgumentError, 'color out of range'
+        end
+        @red, @green, @blue, @alpha = red, green, blue, alpha
+      end
+      
+      def to_i(rgb: false)
+        i = red.to_i << 24 | green.to_i << 16 | blue.to_i << 8 | alpha.to_i
+        rgb ? i >> 8 : i
+      end
+      
+      def to_hex(rgb: false)
+        "%0#{rgb ? 6 : 8}x" % to_i(rgb: rgb)
+      end
+    end
+
+  end
+end

data/lib/rszr/image.rb

@@ -1,5 +1,7 @@
 module Rszr
   class Image
+    GRAVITIES = [true, :center, :n, :nw, :w, :sw, :s, :se, :e, :ne].freeze
+    
     extend Identification
     include Buffered
     include Orientation
@@ -37,6 +39,12 @@ module Rszr
       fmt = fmt.to_s if fmt.is_a?(Symbol)
       self._format = fmt
     end
+    
+    def [](x, y)
+      if x >= 0 && x <= width - 1 && y >= 0 && y <= height - 1
+        Color::RGBA.new(*_pixel(x, y))
+      end
+    end
 
     def inspect
       fmt = format
@@ -166,47 +174,100 @@ module Rszr
     # 400, 300, background: rgba
     # 400, 300, skew: true
     
-    def calculate_size(*args, crop: nil, skew: nil)
-      options = args.last.is_a?(Hash) ? args.pop : {}
+    def calculate_size(*args, crop: nil, skew: nil, inflate: true)
+      #options = args.last.is_a?(Hash) ? args.pop : {}
       #assert_valid_keys options, :crop, :background, :skew  #:extend, :width, :height, :max_width, :max_height, :box
-      original_width, original_height = width, height
-      x, y, = 0, 0
       if args.size == 1
-        scale = args.first
-        raise ArgumentError, "scale factor #{scale.inspect} out of range" unless scale > 0 && scale < 1
-        new_width = original_width.to_f * scale
-        new_height = original_height.to_f * scale
+        calculate_size_for_scale(args.first)
       elsif args.size == 2
         box_width, box_height = args
-        if :auto == box_width && box_height.is_a?(Numeric)
-          new_height = box_height
-          new_width = box_height.to_f / original_height.to_f * original_width.to_f
-        elsif box_width.is_a?(Numeric) && :auto == box_height
-          new_width = box_width
-          new_height = box_width.to_f / original_width.to_f * original_height.to_f
+        if args.include?(:auto)
+          calculate_size_for_auto(box_width, box_height)
         elsif box_width.is_a?(Numeric) && box_height.is_a?(Numeric)
-          if skew
-            new_width, new_height = box_width, box_height
+          if not inflate and width <= box_width and height <= box_height
+            [0, 0, width, height, width, height]
+          elsif skew
+            calculate_size_for_skew(box_width, box_height)
           elsif crop
-            # TODO: calculate x, y offset if crop
+            calculate_size_for_crop(box_width, box_height, crop)
           else
-            scale = original_width.to_f / original_height.to_f
-            box_scale = box_width.to_f / box_height.to_f
-            if scale >= box_scale # wider
-              new_width = box_width
-              new_height = original_height.to_f * box_width.to_f / original_width.to_f
-            else # narrower
-              new_height = box_height
-              new_width = original_width.to_f * box_height.to_f / original_height.to_f
-            end
+            calculate_size_for_limit(box_width, box_height)
           end
-        else
-          raise ArgumentError, "unconclusive arguments #{args.inspect} #{options.inspect}"
         end
       else
         raise ArgumentError, "wrong number of arguments (#{args.size} for 1..2)"
       end
-      [x, y, original_width, original_height, new_width.round, new_height.round]
+    end
+    
+    def calculate_size_for_scale(factor)
+      raise ArgumentError, "scale factor #{factor.inspect} out of range" unless factor > 0 && factor < 1
+      [0, 0, width, height, (width.to_f * factor).round, (height.to_f * factor).round]
+    end
+    
+    def calculate_size_for_skew(box_width, box_height)
+      [0, 0, width, height, box_width, box_height]
+    end
+
+    def calculate_size_for_auto(box_width, box_height)
+      if :auto == box_width && box_height.is_a?(Numeric)
+        new_height = box_height
+        new_width = (box_height.to_f / height.to_f * width.to_f).round
+      elsif box_width.is_a?(Numeric) && :auto == box_height
+        new_width = box_width
+        new_height = (box_width.to_f / width.to_f * height.to_f).round
+      else
+        raise ArgumentError, "unconclusive arguments #{box_width.inspect}, #{box_height.inspect}"
+      end
+      [0, 0, width, height, new_width, new_height]
+    end
+
+    def calculate_size_for_crop(box_width, box_height, crop)
+      raise ArgumentError, "invalid crop gravity" unless GRAVITIES.include?(crop)
+      aspect = width.to_f / height.to_f
+      box_aspect = box_width.to_f / box_height.to_f
+      if aspect >= box_aspect # wider than box
+        src_width = (box_width.to_f * height.to_f / box_height.to_f).round
+        src_height = height
+        x = crop_horizontally(src_width, crop)
+        y = 0
+      else # narrower than box
+        src_width = width
+        src_height = (box_height.to_f * width.to_f / box_width.to_f).round
+        x = 0
+        y = crop_vertically(src_height, crop)
+      end
+      [x, y, src_width, src_height, box_width, box_height]
+    end
+    
+    def crop_horizontally(src_width, crop)
+      case crop
+      when :nw, :w, :sw then 0
+      when :ne, :e, :se then width - src_width
+      else
+        ((width - src_width).to_f / 2.to_f).round
+      end
+    end
+    
+    def crop_vertically(src_height, crop)
+      case crop
+      when :nw, :n, :ne then 0
+      when :sw, :s, :se then height - src_height
+      else
+        ((height - src_height).to_f / 2.to_f).round
+      end
+    end
+    
+    def calculate_size_for_limit(box_width, box_height)
+      scale = width.to_f / height.to_f
+      box_scale = box_width.to_f / box_height.to_f
+      if scale >= box_scale # wider
+        new_width = box_width
+        new_height = (height.to_f * box_width.to_f / width.to_f).round
+      else # narrower
+        new_height = box_height
+        new_width = (width.to_f * box_height.to_f / height.to_f).round
+      end
+      [0, 0, width, height, new_width, new_height]
     end
 
     def format_from_filename(path)

data/lib/rszr/image_processing.rb

@@ -51,7 +51,7 @@ module ImageProcessing
       # Resizes the image to not be larger than the specified dimensions.
       def resize_to_limit(width, height, **options)
         width, height = default_dimensions(width, height)
-        thumbnail(width, height, **options)
+        thumbnail(width, height, inflate: false, **options)
       end
 
       # Resizes the image to fit within the specified dimensions.
@@ -62,8 +62,8 @@ module ImageProcessing
 
       # Resizes the image to fill the specified dimensions, applying any
       # necessary cropping.
-      def resize_to_fill(width, height, **options)
-        thumbnail(width, height, crop: :center, **options)
+      def resize_to_fill(width, height, gravity: :center, **options)
+        thumbnail(width, height, crop: gravity, **options)
       end
 
       private

data/lib/rszr/stream.rb

@@ -13,7 +13,7 @@ module Rszr
         raise ArgumentError, "data must be File or String, got #{data.class}"
       end
       @data.binmode
-      @data.seek(start, IO::SEEK_CUR)
+      @data.seek(start)
       @pos = 0
     end
     
@@ -33,7 +33,7 @@ module Rszr
     end
 
     def substream
-      self.class.new(self, pos)
+      self.class.new(self, @data.pos)
     end
 
     def fast_forward

data/lib/rszr/version.rb

@@ -1,3 +1,3 @@
 module Rszr
-  VERSION = '0.8.0'
+  VERSION = '1.0.0'
 end

data/lib/rszr.rb

@@ -9,6 +9,7 @@ require 'rszr/stream'
 require 'rszr/identification'
 require 'rszr/orientation'
 require 'rszr/buffered'
+require 'rszr/color'
 require 'rszr/image'
 
 module Rszr

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rszr
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Matthias Grosser
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-08 00:00:00.000000000 Z
+date: 2021-10-31 00:00:00.000000000 Z
 dependencies: []
 description: Fast image resizer - do one thing and do it fast.
 email:
@@ -18,49 +18,49 @@ extensions:
 - ext/rszr/extconf.rb
 extra_rdoc_files: []
 files:
+- LICENSE
+- README.md
+- Rakefile
+- ext/rszr/errors.c
+- ext/rszr/errors.h
+- ext/rszr/extconf.rb
+- ext/rszr/image.c
+- ext/rszr/image.h
+- ext/rszr/rszr.c
+- ext/rszr/rszr.h
+- lib/rszr.rb
 - lib/rszr/batch_transformation.rb
 - lib/rszr/buffered.rb
+- lib/rszr/color.rb
 - lib/rszr/identification.rb
 - lib/rszr/image.rb
 - lib/rszr/image_processing.rb
 - lib/rszr/orientation.rb
 - lib/rszr/stream.rb
 - lib/rszr/version.rb
-- lib/rszr.rb
-- ext/rszr/extconf.rb
-- ext/rszr/errors.h
-- ext/rszr/image.h
-- ext/rszr/rszr.h
-- ext/rszr/errors.c
-- ext/rszr/image.c
-- ext/rszr/rszr.c
-- LICENSE
-- README.md
-- Rakefile
 homepage: https://github.com/mtgrosser/rszr
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 - ext
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
 - imlib2
-rubyforge_project: 
-rubygems_version: 2.0.14.1
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Fast image resizer
 test_files: []