easyimg_utils 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 747675b404e492bb0c25b254a1e3ec332de6a9d52bd85f32b19849388e579b34
-  data.tar.gz: eabc7fd2465441173854d524071d38d295eb390d9b1fe8b0032c93aaec67095e
+  metadata.gz: 1770c2dc6e430a4cbb3af042379344927227ea4a2e7ae8aabd57be362c956ea5
+  data.tar.gz: b53d0b56ee4c884edecfae57500ec8ff41a927e7dd172d144108787c895d5d51
 SHA512:
-  metadata.gz: 8c02de630ce978236b4e8461be3f980f85960447579961db87f2e74b85304f9861def010c03e42d9049e759cf9ad752a40d58c6fa40ca1f8f701f92a57a8bb8f
-  data.tar.gz: 856e1609c06583611f9a5cb98e31de21395b8d67586cf20f6439fe9ed603849f3a3808c5d0bf4e9d8f7f0ebd3396fddbc93598d97e26562cd111c3efe96d7f95
+  metadata.gz: e8a5e8046f81af69d57dd8b6b53c242d7378a37892c4a960115577746e22928614d7d53c32cff9947ffaa1825fde3808b9d7f0180acb8b56f6fc7e98a61dabd2
+  data.tar.gz: 65dd367226a621b13179ce3d58bc228e9c6afdde398c13d95b33c2e6751ecbb224fee977959d5568c45d7dfaece13cb51b4d131d702b1cba4df7ec69e04b4fa4

data/lib/easyimg_utils.rb

@@ -7,6 +7,7 @@ require 'x4ss'
 require 'rmagick'
 require 'webp_ffi'
 require 'rxfhelper'
+require 'detectfaces'
 
 # requirements:
 #
@@ -19,6 +20,8 @@ require 'rxfhelper'
 # webp-ffi dependencies
 # apt-get install libjpeg-dev libpng-dev libtiff-dev libwebp-dev
 #
+# detectfaces dependencies
+# apt-get install libopencv-dev
 
 
 
@@ -47,6 +50,7 @@ class EasyImgUtils
   extend CommandHelper
   include Magick
   include RXFHelperModule
+    
 
 @commands = "
 * add rectangle # usage: add_rectangle(color: 'green', x1: 12, y1: 12, x2: 24, y2: 24)
@@ -55,12 +59,14 @@ class EasyImgUtils
 * animate Creates an animated gif e.g. animate('/tmp/a%d.png', '/tmp/b.gif')
 * blur # e.g. blur(x: 231, y: 123, w: 85, h: 85)
 * capture_screen # takes a screenshot of the desktop
+* calc_resize # e.g. calc_resize '640x480' #=> 640x491
 * center_crop # crops from the centre of an image. Usage center_crop(width, height)
 * composite # overlay a smaller image on top of an image
 * contrast # changes the intensity between lighter and darker elements
 * convert # convert from 1 img format to another
 * crop # e.g. crop(x: 231, y: 123, w: 85, h: 85)
 * fax_effect # Produces a high-contrast, two colour image
+* faces # Returns an array of bounding boxes for detected faces
 * greyscale # Reduces the image to 256 shades of grey
 * info # returns the dimension of the image in a Hash object
 * make_thumbnail # similar to resize but faster for sizes less than 10% of original image 
@@ -85,6 +91,29 @@ class EasyImgUtils
 
   end
   
+  # e.g. calc_resize '1449x1932', '640x480' #=> 480x640
+  # e.g. calc_resize '518x1024', '*518x500' #=> "518x1024" 
+  # the asterisk denotes a guaranteed the image will be resized using x or y
+  #
+  def self.calc_resize(geometry, new_geometry, force: false)
+    
+    xy = geometry.split('x',2)
+    xy2 = new_geometry.split('x',2)
+
+    # find any locked geometry which guarantees the resize on either x or y
+    lock = xy2.find {|x| x =~ /^\*/}
+
+    a = xy.map {|x| x[/\d+/].to_i}
+    a2 = xy2.map {|x| x[/\d+/].to_i}
+
+    i = lock ? a2.index(lock[1..-1].to_i) : a.index(a.max)
+
+    factor = a2[i] / a[i].to_f
+
+    s3 = a.map {|x| (x * factor).round}.join('x')    
+    
+  end
+  
   def add_rectangle(a=[], quality: nil, color: 'green', stroke_width: 5, 
                     x1: 0, y1: 0, x2: 0, y2: 0)
     
@@ -169,6 +198,12 @@ class EasyImgUtils
     end
   end
   
+  # calculates the new geometry after a resize
+  #
+  def calc_resize(geometry)    
+    EasyImgUtils.calc_resize(info()[:geometry], geometry)
+  end
+  
   def capture_screen(quality: nil)
     
     # defaults (silent=false, frame=false, descend=false, 
@@ -273,6 +308,10 @@ class EasyImgUtils
     
   end
   
+  def faces()
+    DetectFaces.new(@file_in).faces
+  end
+  
   def fax_effect(threshold: 0.55, quality: nil)
 
     read() do |img|
@@ -321,8 +360,10 @@ class EasyImgUtils
 
   # defines the maximum size of an image while maintaining aspect ratio
   #
-  def resize(geometry='320x240', quality: nil)
+  def resize(raw_geometry='320x240', quality: nil)
     
+    geometry = calc_resize(raw_geometry
+                             )
     read() do |preview|
     
       preview.change_geometry!(geometry) do |cols, rows, img|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easyimg_utils
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   KY48n99T12IOioQ4ghCO1L/UAg2taLOcZbMv4WpV1p9bXKhnrow81zeogZjjiNGS
   OmTAjCfyGFPC/1eXnSV5Smv8
   -----END CERTIFICATE-----
-date: 2020-07-14 00:00:00.000000000 Z
+date: 2021-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
@@ -43,60 +43,60 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.2
+        version: 4.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.2
+        version: 4.2.2
 - !ruby/object:Gem::Dependency
   name: rxfhelper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.3
 - !ruby/object:Gem::Dependency
   name: webp-ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.7
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.7
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: x4ss
   requirement: !ruby/object:Gem::Requirement
@@ -118,7 +118,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.2'
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -143,7 +143,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.10
 signing_key: 
 specification_version: 4
 summary: Makes manipulating images from 1 line of code easier.