easyimg_utils 0.6.3 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f68eb15dfa8aa18281bb8b71b6ad4ac8e0da01c5da5424d981388cfdee8cae7f
-  data.tar.gz: 10d4a0d5ad92f28723c9b4d2b025952723b8566d8cc9418e0e11191c70a407fe
+  metadata.gz: d5a7070bfe90782130922f1707f7143dbd2cbb8465197ff48055650f4fa137a2
+  data.tar.gz: 1b909e5e43b88e300b1542b44dfdb080c3c45da1f9b10e7da5ad6b3676f72118
 SHA512:
-  metadata.gz: c900ec2015da02a1eb2178feb88418792f19c8b806d84700931e8efa7cbdfef3cfe1144154d25b04c5fd4696e29fd4864d153a4906c8d637e57c50d08e7eca64
-  data.tar.gz: c1bdfcc930995773ffb921ad88d261d37a91c356a21accd1f18ffbcf4997ecd7d288b2d7fd70a42e54a5f9df6195e4f78e95097281749b15b61601485a16a7a3
+  metadata.gz: 3270ace1416ed3cd00b4d2e7ab942fdae8c1509d20d2f60cea12c488060e42b65520c08e5476a13aa603354e4300c7c9202de9b5cf8fc455efc7274f5b59b2f3
+  data.tar.gz: de164b42b68ca9708a8d712ee9b28e1bbdddab87d73357d254e41c883be698274bbb2cfbf8154f36c05e0cf9c88414f39ea825b1725754c43444073d6bb54aea

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
 
 
 
@@ -56,13 +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. EasyImgUtils.calc_resize '1449x1932', '640x480' #=> 480x640
+* 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 
@@ -88,15 +92,25 @@ 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(s, s2)
+  def self.calc_resize(geometry, new_geometry, force: false)
     
-    a = s.split('x',2).map(&:to_i).sort
-    a2 = s2.split('x',2).map(&:to_i).sort
-    
-    factor = a2.last / a.last.to_f
-    
-    a.map {|x| (x * factor).to_i}.join('x')    
+    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
   
@@ -184,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, 
@@ -288,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|
@@ -336,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.3
+  version: 0.7.1
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   KY48n99T12IOioQ4ghCO1L/UAg2taLOcZbMv4WpV1p9bXKhnrow81zeogZjjiNGS
   OmTAjCfyGFPC/1eXnSV5Smv8
   -----END CERTIFICATE-----
-date: 2021-03-20 00:00:00.000000000 Z
+date: 2021-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
@@ -117,6 +117,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: detectfaces
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 description: 
 email: digital.robertson@gmail.com
 executables: []