morandi 0.10.2 → 0.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d118f4078309003e8bd209e5c48bb8ad8c941db5
-  data.tar.gz: efb35e2dd6f24382283e8ca637224cc381b7997a
+  metadata.gz: 6509e684d2ddcb40e40bd4e354a61ce7f1e5bcc3
+  data.tar.gz: 415f941df4d9440901415f2906862ef7a8730721
 SHA512:
-  metadata.gz: e0dde0ed3cdea1ad9457d2a7f4d0526d71d67966a7b7cc2cef37e8b8acfcf9d78e02dbd6a3ed4d5786a89c479c92636bdeb71c9405257287e778a2f961f6f0e7
-  data.tar.gz: f0e581e193edf104e48eef1857c842bcc2ca0c8e28712a15e09ad6b23f4922ded337d0551072113b9b06cd788d7bccedbee7508717ec8e9cf06d5b90f99af13d
+  metadata.gz: 020dd16c067e38f99d80cf4b3429ca956ec5999f0e0cc8f7f7298e81c356640451ad54c09a698330b1b8e9976cc802625c10776a585574ea9da8c1706eef6da8
+  data.tar.gz: 76f2c80deafe8bea29fc8e5a38c953437a1b85c13de94377a9952fa9f1b6f1e6f2ef2a5db3b869d3e640818d25bd76934d26be6d38c35c25c97bef8a9ca75be7

data/lib/morandi/image-ops.rb

@@ -263,35 +263,6 @@ class Gamma < ImageOp
   end
 end
 
-class RedEyeOp < ImageOp
-  attr_reader :x1, :y1, :x2, :y2, :sensitivity, :no_eyes
-  attr_accessor :order
-  def initialize(x1, y1, x2, y2, sensitivity, no_eyes)
-    super()
-    require 'redeye'
-    x1, x2 = x2, x1 if x1 > x2
-    y1, y2 = y2, y1 if y1 > y2
-    @x1, @y1, @x2, @y2, @sensitivity, @no_eyes =
-      x1, y1, x2, y2, sensitivity, no_eyes
-  end
-  def call(image, pixbuf)
-    @x2 = pixbuf.width if @x2 >= pixbuf.width
-    @y2 = pixbuf.height if @y2 >= pixbuf.height
-    @x1 = @x2 - 1 if @x1 >= @x2
-    @y1 = @y2 - 1 if @y1 >= @y2
-    redeye = ::RedEye.new(pixbuf.dup, @x1, @y1, @x2, @y2)
-    blobs = redeye.identify_blobs(@sensitivity).reject { |i|
-      i.noPixels < 2 or ! i.squareish?(0.5, 0.4)
-    }.sort_by { |i| i.noPixels }
-    biggest = blobs.size > @no_eyes ?  blobs[-1 * @no_eyes..-1] : blobs
-    biggest.each { |blob| redeye.correct_blob(blob.id) }
-    redeye.pixbuf
-  end
-  def priority
-    20 + @order
-  end
-end
-
 class Colourify < ImageOp
   attr_reader :op
   def initialize(op, alpha=255)

data/lib/morandi/redeye.rb

@@ -1,5 +1,14 @@
 require 'redeye'
 
+module Morandi
+  module RedEye
+    # The parameter determines how many reddish pixels needs to be in the area to consider it a valid red eye
+    # The reason for its existence is to prevent the situations when the bigger red area causes an excessive correction
+    # e.g. continuous red eyeglasses frame or sunburnt person's skin around eyes forming an area
+    RED_AREA_DENSITY_THRESHOLD = 0.3
+  end
+end
+
 module Morandi
 module RedEye
 module TapRedEye
@@ -14,20 +23,16 @@ module TapRedEye
     redeye = ::RedEye.new(pb, x1, y1, x2, y2)
 
     sensitivity = 2
-    blobs = redeye.identify_blobs(sensitivity).reject { |i|
-      i.noPixels < 4 or ! i.squareish?(0.5, 0.4)
-    }.sort_by { |i|
-      i.area_min_x = x1
-      i.area_min_y = y1
+    blobs = redeye.identify_blobs(sensitivity).reject { |region|
+      region.noPixels < 4 || !region.squareish?(0.5, RED_AREA_DENSITY_THRESHOLD)
+    }.sort_by { |region|
+      region.area_min_x = x1
+      region.area_min_y = y1
 
       # Higher is better
-      score = (i.noPixels) / (i.distance_from(x, y) ** 2)
+      score = (region.noPixels) / (region.distance_from(x, y) ** 2)
     }
 
-    #blobs.each do |blob|
-    #  p [ [x, y], blob.centre(), blob.distance_from(x, y), blob]
-    #end
-
     blob = blobs.last
     redeye.correct_blob(blob.id) if blob
     pb = redeye.pixbuf

data/lib/morandi/version.rb

@@ -1,3 +1,3 @@
 module Morandi
-  VERSION = "0.10.2"
+  VERSION = '0.10.3'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morandi
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.10.3
 platform: ruby
 authors:
 - |+
@@ -11,146 +11,146 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-03 00:00:00.000000000 Z
+date: 2018-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gtk2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: gdk_pixbuf2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cairo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pixbufutils
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: redeye
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pango
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: colorscore
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Apply simple edits to images
@@ -160,8 +160,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -187,17 +187,17 @@ require_paths:
 - lib
 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: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.5.2.2
 signing_key: 
 specification_version: 4
 summary: Simple Image Edits