morandi 0.12.1 → 0.99.4

data/lib/morandi/profiled_pixbuf.rb

@@ -1,82 +1,29 @@
-require 'gdk_pixbuf2'
-
-class Morandi::ProfiledPixbuf < GdkPixbuf::Pixbuf
-  def valid_jpeg?(filename)
-    return false unless File.exist?(filename)
-    return false unless File.size(filename) > 0
-
-    type, _, _ = GdkPixbuf::Pixbuf.get_file_info(filename)
-
-    type && type.name.eql?('jpeg')
-  rescue
-    false
-  end
-
-  def self.from_string(string, loader: nil, chunk_size: 4096)
-    loader ||= GdkPixbuf::PixbufLoader.new
-    ((string.bytesize + chunk_size - 1) / chunk_size).times do |i|
-      loader.write(string.byteslice(i * chunk_size, chunk_size))
-    end
-    loader.close
-    loader.pixbuf
-  end
-
-  def self.default_icc_path(path)
-    "#{path}.icc.jpg"
-  end
-
-  def initialize(*args)
-    @local_options = args.last.is_a?(Hash) && args.pop || {}
+# frozen_string_literal: true
 
-    if args[0].is_a?(String)
-      @file = args[0]
-
-      if suitable_for_jpegicc?
-        icc_file = icc_cache_path
+require 'gdk_pixbuf2'
+require 'morandi/srgb_conversion'
 
-        args[0] = icc_file if valid_jpeg?(icc_file) || system("jpgicc", "-q97", @file, icc_file)
-      end
-    end
+module Morandi
+  # ProfiledPixbuf is a descendent of GdkPixbuf::Pixbuf with ICC support.
+  # It attempts to load an image using jpegicc/littlecms to ensure that it is sRGB.
+  # NOTE: pixbuf supports colour profiles, but it requires an explicit icc-profile option to embed it when saving file
+  class ProfiledPixbuf < GdkPixbuf::Pixbuf
+    def initialize(path, local_options, max_size_px = nil)
+      @local_options = local_options
 
-    # TODO: This is to fix some deprecation warnings. This needs refactoring.
-    # All can be implemented without having to hack on the PixBuff gem.
-    case args.size
-    when 1
-      super(file: args.first)
-    when 3
-      super(path: args[0], width: args[1], height: args[2])
-    else
-      super(*args)
-    end
-  rescue GdkPixbuf::PixbufError::CorruptImage => e
-    if args[0].is_a?(String) && defined? Tempfile
-      temp =  Tempfile.new
-      pixbuf = self.class.from_string(File.read(args[0]))
-      pixbuf.save(temp.path, 'jpeg')
-      args[0] = temp.path
+      path = srgb_path(path) || path
 
-      if args.size == 1
-        super file: args.first
+      if max_size_px
+        super(file: path, width: max_size_px, height: max_size_px)
       else
-        super(*args)
+        super(file: path)
       end
-
-      temp.close
-      temp.unlink
-    else
-      throw e
     end
-  end
-
 
-  protected
-  def suitable_for_jpegicc?
-    type, _, _ = GdkPixbuf::Pixbuf.get_file_info(@file)
+    private
 
-    type && type.name.eql?('jpeg')
-  end
-
-  def icc_cache_path
-    @local_options['path.icc'] || Morandi::ProfiledPixbuf.default_icc_path(@file)
+    def srgb_path(original_path)
+      Morandi::SrgbConversion.perform(original_path, target_path: @local_options['path.icc'])
+    end
   end
 end

data/lib/morandi/redeye.rb

@@ -1,4 +1,4 @@
-require 'redeye'
+# frozen_string_literal: true
 
 module Morandi
   module RedEye
@@ -6,57 +6,45 @@ module Morandi
     # 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
-  module_function
-  def tap_on(pb, x, y)
-    n = ([pb.height,pb.width].max / 10)
-    x1  = [x - n, 0].max
-    x2  = [x + n, pb.width].min
-    y1  = [y - n, 0].max
-    y2  = [y + n, pb.height].min
-    return pb unless (x1 >= 0) && (x2 > x1) && (y1 >= 0) && (y2 > y1)
-    redeye = ::RedEye.new(pb, x1, y1, x2, y2)
-
-    sensitivity = 2
-    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 = (region.noPixels) / (region.distance_from(x, y) ** 2)
-    }
-
-    blob = blobs.last
-    redeye.correct_blob(blob.id) if blob
-    pb = redeye.pixbuf
-  end
-end
-end
-end
+    # RedEye finder that looks for "eye" closest to a point
+    module TapRedEye
+      module_function
 
-class ::RedEye::Region
-  attr_accessor :area_min_x
-  attr_accessor :area_min_y
-  def centre
-    [@area_min_x.to_i + ((maxX + minX) >> 1),
-     @area_min_y.to_i + ((maxY + minY) >> 1)]
-  end
+      def tap_on(pixbuf, x_coord, y_coord)
+        n = ([pixbuf.height, pixbuf.width].max / 10)
+        x1  = [x_coord - n, 0].max
+        x2  = [x_coord + n, pixbuf.width].min
+        y1  = [y_coord - n, 0].max
+        y2  = [y_coord + n, pixbuf.height].min
+
+        return pixbuf unless (x1 >= 0) && (x2 > x1) && (y1 >= 0) && (y2 > y1)
 
-  # Pythagorean
-  def distance_from(x,y)
-    cx,cy = centre()
+        red_eye = MorandiNative::RedEye.new(pixbuf, x1, y1, x2, y2)
 
-    dx = cx - x
-    dy = cy - y
+        sensitivity = 2
+        blobs = red_eye.identify_blobs(sensitivity).reject do |region|
+          region.noPixels < 4 || !region.squareish?(0.5, RED_AREA_DENSITY_THRESHOLD)
+        end
 
-    Math.sqrt( (dx * dx) + (dy * dy) )
+        sorted_blobs = blobs.sort_by do |region|
+          region.area_min_x = x1
+          region.area_min_y = y1
+        end
+
+        blob = sorted_blobs.last
+        red_eye.correct_blob(blob.id) if blob
+        red_eye.pixbuf
+      end
+    end
   end
 end
 
+module MorandiNative
+  class RedEye
+    # Represents an area with a suspected red eye
+    class Region
+      attr_accessor :area_min_x, :area_min_y
+    end
+  end
+end

data/lib/morandi/srgb_conversion.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'gdk_pixbuf2'
+
+module Morandi
+  # Converts the file under `path` to sRGB colour space
+  class SrgbConversion
+    # Performs a conversion to srgb colour space if possible
+    # Returns a path to converted file on success or nil on failure
+    def self.perform(path, target_path: nil)
+      return unless suitable_for_jpegicc?(path)
+
+      icc_file_path = target_path || default_icc_path(path)
+      return icc_file_path if valid_jpeg?(icc_file_path)
+
+      system('jpgicc', '-q97', path, icc_file_path, out: '/dev/null', err: '/dev/null')
+
+      return unless valid_jpeg?(icc_file_path)
+
+      icc_file_path
+    end
+
+    def self.default_icc_path(path)
+      "#{path}.icc.jpg"
+    end
+
+    def self.valid_jpeg?(path)
+      return false unless File.exist?(path)
+      return false unless File.size(path).positive?
+
+      type, = GdkPixbuf::Pixbuf.get_file_info(path)
+
+      type && type.name.eql?('jpeg')
+    rescue StandardError
+      false
+    end
+
+    def self.suitable_for_jpegicc?(path)
+      valid_jpeg?(path)
+    end
+  end
+end

data/lib/morandi/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Morandi
-  VERSION = '0.12.1'.freeze
+  VERSION = '0.99.4'
 end

data/lib/morandi.rb

@@ -1,20 +1,50 @@
-require "morandi/version"
-require 'gtk2/base'
-require 'cairo'
-require 'gdk_pixbuf2'
-require 'pixbufutils'
-require 'redeye'
+# frozen_string_literal: true
 
+require 'morandi/version'
+require 'morandi_native'
+
+require 'morandi/cairo_ext'
+require 'morandi/pixbuf_ext'
+require 'morandi/errors'
 require 'morandi/image_processor'
-require 'morandi/utils'
-require 'morandi/image-ops'
 require 'morandi/redeye'
+require 'morandi/crop_utils'
 
+# Morandi namespace should contain all the functionality of the gem
 module Morandi
   module_function
-  def process(file_in, options, out_file, local_options = {})
-    pro = ImageProcessor.new(file_in, options, local_options)
-    pro.process!
-    pro.write_to_jpeg(out_file)
+
+  # The main entry point for the library
+  #
+  # @param source [String|GdkPixbuf::Pixbuf] source image
+  # @param [Hash] options The options describing expected processing to perform
+  # @option options [Integer] 'brighten' Change image brightness (-20..20)
+  # @option options [Float] 'gamma' Gamma correct image
+  # @option options [Integer] 'contrast' Change image contrast (-20..20)
+  # @option options [Integer] 'sharpen' Sharpen (1..5) / Blur (-1..-5)
+  # @option options [Array[[Integer,Integer],...]] 'redeye' Apply redeye correction at point
+  # @option options [Integer] 'angle' Rotate image clockwise by multiple of 90 (0, 90, 180, 270)
+  # @option options [Array[Integer,Integer,Integer,Integer]] 'crop' Crop image (x, y, width, height)
+  # @option options [String] 'fx' Apply colour filters ('greyscale', 'sepia', 'bluetone')
+  # @option options [String] 'border-style' Set border style ('square', 'retro')
+  # @option options [String] 'background-style' Set border colour ('retro', 'black', 'white', 'dominant')
+  # @option options [Integer] 'quality' (97) Set JPG compression value (1 to 100)
+  # @option options [Integer] 'output.max' Downscales the image to fit within the square of given size before
+  #                                        processing to limit the required resources
+  # @option options [Integer] 'output.width' Sets desired width of resulting image
+  # @option options [Integer] 'output.height' Sets desired height of resulting image
+  # @option options [TrueClass|FalseClass] 'image.auto-crop' (true) If the output dimensions are set and this is true,
+  #                                                                image is cropped automatically to the desired
+  #                                                                dimensions.
+  # @option options [TrueClass|FalseClass] 'output.limit' (false) If the output dimensions are defined and this is true,
+  #                                                              the output image is scaled down to fit within square of
+  #                                                              size of the longer edge (ignoring shorter dimension!)
+  # @param target_path [String] target location for image
+  # @param local_options [Hash] Hash of options other than desired transformations
+  # @option local_options [String] 'path.icc' A path to store the input after converting to sRGB colour space
+  def process(source, options, target_path, local_options = {})
+    pro = ImageProcessor.new(source, options, local_options)
+    pro.result
+    pro.write_to_jpeg(target_path)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morandi
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.99.4
 platform: ruby
 authors:
 - |+
@@ -11,192 +11,135 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-10 00:00:00.000000000 Z
+date: 2024-11-22 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
+  name: atk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: cairo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: pixbufutils
+  name: colorscore
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.0'
 - !ruby/object:Gem::Dependency
-  name: redeye
+  name: gdk_pixbuf2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: pango
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: colorscore
+  name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
   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: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  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: 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'
+        version: '1.2'
 description: Apply simple edits to images
 email:
 - git@intersect-uk.co.uk
 executables: []
-extensions: []
+extensions:
+- ext/morandi_native/extconf.rb
+- ext/gdk_pixbuf_cairo/extconf.rb
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".ruby-version"
 - CHANGELOG.md
-- Gemfile
 - LICENSE.txt
 - README.md
-- Rakefile
+- ext/gdk_pixbuf_cairo/extconf.rb
+- ext/gdk_pixbuf_cairo/gdk_pixbuf_cairo.c
+- ext/morandi_native/extconf.rb
+- ext/morandi_native/filter.h
+- ext/morandi_native/gamma.h
+- ext/morandi_native/mask.h
+- ext/morandi_native/morandi_native.c
+- ext/morandi_native/rotate.h
+- ext/morandi_native/tint.h
+- lib/gdk_pixbuf_cairo.so
 - lib/morandi.rb
-- lib/morandi/image-ops.rb
+- lib/morandi/cairo_ext.rb
+- lib/morandi/crop_utils.rb
+- lib/morandi/errors.rb
+- lib/morandi/image_operation.rb
 - lib/morandi/image_processor.rb
+- lib/morandi/operation/colourify.rb
+- lib/morandi/operation/image_border.rb
+- lib/morandi/operation/straighten.rb
+- lib/morandi/pixbuf_ext.rb
 - lib/morandi/profiled_pixbuf.rb
 - lib/morandi/redeye.rb
-- lib/morandi/utils.rb
+- lib/morandi/srgb_conversion.rb
 - lib/morandi/version.rb
-- morandi.gemspec
-- sample/sample.jpg
-- spec/morandi_spec.rb
-- spec/spec_helper.rb
-homepage: ''
+- lib/morandi_native.so
+homepage: https://github.com/livelink/morandi-rb
 licenses:
 - MIT
-metadata: {}
+metadata:
+  source_code_uri: https://github.com/livelink/morandi-rb
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -205,7 +148,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -216,7 +159,5 @@ rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: Simple Image Edits
-test_files:
-- spec/morandi_spec.rb
-- spec/spec_helper.rb
+test_files: []
 ...

data/.gitignore

@@ -1,18 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.DS_Store
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp

data/.rspec

@@ -1,3 +0,0 @@
---color
---format progress
---require spec_helper

data/.ruby-version

@@ -1 +0,0 @@
-2.7.1

data/Gemfile

@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in morandi.gemspec
-gemspec

data/Rakefile

@@ -1 +0,0 @@
-require "bundler/gem_tasks"