morandi 0.12.0 → 0.99.03

data/lib/morandi.rb

@@ -1,20 +1,42 @@
-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/image_processor'
-require 'morandi/utils'
-require 'morandi/image-ops'
+require 'morandi/image_operation'
 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 = {})
+
+  # The main entry point for the libray
+  #
+  # @param in_file [String|GdkPixbuf::Pixbuf] source image
+  # @param settings [Hash]
+  # @param out_file [String] target location for image
+  # @param local_options [Hash]
+  #
+  # Settings Key | Values | Description
+  # -------------|--------|---------------
+  # brighten     | Integer -20..20 | Change image brightness
+  # gamma        | Float  | Gamma correct image
+  # contrast     | Integer -20..20  | Change image contrast
+  # sharpen      | Integer -5..5  | Sharpen / Blur (negative value)
+  # redeye       | Array[[Integer,Integer],...]  | Apply redeye correction at point
+  # angle        | Integer 0,90,180,270  | Rotate image
+  # crop         | Array[Integer,Integer,Integer,Integer] | Crop image
+  # fx           | String greyscale,sepia,bluetone | Apply colour filters
+  # border-style  | String square,retro | Set border style
+  # background-style  | String retro,black,white | Set border colour
+  # quality       | String '1'..'100' | Set JPG compression value, defaults to 97%
+  def process(file_in, options, file_out, local_options = {})
     pro = ImageProcessor.new(file_in, options, local_options)
-    pro.process!
-    pro.write_to_jpeg(out_file)
+    pro.result
+    pro.write_to_jpeg(file_out)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morandi
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.99.03
 platform: ruby
 authors:
 - |+
@@ -11,193 +11,130 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-10 00:00:00.000000000 Z
+date: 2024-09-19 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/image_operation.rb
 - lib/morandi/image_processor.rb
+- lib/morandi/pixbuf_ext.rb
 - lib/morandi/profiled_pixbuf.rb
 - lib/morandi/redeye.rb
-- lib/morandi/utils.rb
 - lib/morandi/version.rb
-- morandi.gemspec
-- sample/100_mb_image.jpg
-- 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:
@@ -206,7 +143,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -217,7 +154,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"

data/lib/morandi/image-ops.rb

@@ -1,307 +0,0 @@
-require 'pango'
-require 'colorscore'
-
-module Morandi
-class ImageOp
-  class << self
-    def new_from_hash(hash)
-      op = allocate()
-      hash.each_pair do |key,val|
-        op.instance_variable_set("@#{key}", val) if op.respond_to?(key.intern)
-      end
-      op
-    end
-  end
-  def initialize()
-  end
-  def priority
-    100
-  end
-end
-class Crop < ImageOp
-  attr_accessor :area
-  def initialize(area=nil)
-    super()
-    @area = area
-  end
-  def constrain(val,min,max)
-    if val < min
-      min
-    elsif val > max
-      max
-    else
-      val
-    end
-  end
-  def call(image, pixbuf)
-    if @area and (not @area.width.zero?) and (not @area.height.zero?)
-      # NB: Cheap - fast & shares memory
-      GdkPixbuf::Pixbuf.new(pixbuf, @area.x, @area.y,
-          @area.width, @area.height)
-    else
-      pixbuf
-    end
-  end
-end
-class Rotate < ImageOp
-  attr_accessor :angle
-  def initialize(angle=0)
-    super()
-    @angle = angle
-  end
-  def call(image, pixbuf)
-    if @angle.zero?
-      pixbuf
-    else
-      case @angle
-      when 0, 90, 180, 270
-        PixbufUtils::rotate(pixbuf, @angle)
-      else
-        raise "Not a valid angle"
-      end
-    end
-  end
-end
-class Straighten < ImageOp
-  attr_accessor :angle
-  def initialize(angle=0)
-    super()
-    @angle = angle
-  end
-  def call(image, pixbuf)
-    if @angle.zero?
-      pixbuf
-    else
-      surface = Cairo::ImageSurface.new(:rgb24, pixbuf.width, pixbuf.height)
-
-      rotationValueRad = @angle * (Math::PI/180)
-
-      ratio = pixbuf.width.to_f/pixbuf.height
-      rh = (pixbuf.height) / ((ratio * Math.sin(rotationValueRad.abs)) + Math.cos(rotationValueRad.abs))
-      scale = pixbuf.height / rh.to_f.abs
-
-      a_ratio = pixbuf.height.to_f/pixbuf.width
-      a_rh = (pixbuf.width) / ((a_ratio * Math.sin(rotationValueRad.abs)) + Math.cos(rotationValueRad.abs))
-      a_scale = pixbuf.width / a_rh.to_f.abs
-
-      scale = a_scale if a_scale > scale
-
-      cr = Cairo::Context.new(surface)
-      #p [@angle, rotationValueRad, rh, scale, pixbuf.height]
-
-      cr.translate(pixbuf.width / 2.0, pixbuf.height / 2.0)
-      cr.rotate(rotationValueRad)
-      cr.scale(scale, scale)
-      cr.translate(pixbuf.width / -2.0, pixbuf.height / - 2.0)
-      cr.set_source_pixbuf(pixbuf)
-
-      cr.rectangle(0, 0, pixbuf.width, pixbuf.height)
-      cr.paint(1.0)
-      final_pb = surface.to_pixbuf
-      cr.destroy
-      surface.destroy
-      return final_pb
-    end
-  end
-end
-
-class ImageCaption < ImageOp
-  attr_accessor :text, :font, :position
-  def initialize()
-    super()
-  end
-
-  def font
-    @font || "Open Sans Condensed Light #{ ([@pixbuf.width,@pixbuf.height].max/80.0).to_i }"
-  end
-
-  def position
-    @position ||
-    (@pixbuf ? ([ [@pixbuf.width,@pixbuf.height].max/20 ] * 2) : [100, 100])
-  end
-
-  def call(image, pixbuf)
-    @pixbuf = pixbuf
-    surface = Cairo::ImageSurface.new(:rgb24, pixbuf.width, pixbuf.height)
-    cr = Cairo::Context.new(surface)
-
-    cr.save do
-      cr.set_source_pixbuf(pixbuf)
-      #cr.rectangle(0, 0, pixbuf.width, pixbuf.height)
-      cr.paint(1.0)
-      cr.translate(*self.position)
-
-      layout = cr.create_pango_layout
-      layout.set_text(self.text)
-      fd = Pango::FontDescription.new(self.font)
-      layout.font_description = fd
-      layout.set_width((pixbuf.width - self.position[0] - 100)*Pango::SCALE)
-      layout.context_changed
-      ink, _ = layout.pixel_extents
-      cr.set_source_rgba(0, 0, 0, 0.3)
-      cr.rectangle(-25, -25, ink.width + 50, ink.height + 50)
-      cr.fill
-      cr.set_source_rgb(1, 1, 1)
-      cr.show_pango_layout(layout)
-    end
-
-
-    final_pb = surface.to_pixbuf
-    cr.destroy
-    surface.destroy
-    return final_pb
-  end
-end
-
-class ImageBorder < ImageOp
-  attr_accessor :style, :colour, :crop, :size, :print_size, :shrink, :border_size
-  def initialize(style='none', colour='white')
-    super()
-    @style = style
-    @colour = colour
-  end
-
-  def call(image, pixbuf)
-    return pixbuf unless %w[square retro].include? @style
-    surface = Cairo::ImageSurface.new(:rgb24, pixbuf.width, pixbuf.height)
-    cr = Cairo::Context.new(surface)
-
-    img_width = pixbuf.width
-    img_height = pixbuf.height
-
-    cr.save do
-      if @crop
-        if @crop[0] < 0 || @crop[1] < 0
-          img_width = size[0]
-          img_height = size[1]
-          cr.translate( - @crop[0], - @crop[1])
-        end
-      end
-
-      cr.save do
-        cr.set_operator :source
-        cr.set_source_rgb 1, 1, 1
-        cr.paint
-
-        cr.rectangle(0, 0, img_width, img_height)
-        case colour
-        when 'dominant'
-          pixbuf.scale_max(400).save(fn="/tmp/hist-#{$$}.#{Time.now.to_i}", 'jpeg')
-          hgram = Colorscore::Histogram.new(fn)
-          File.unlink(fn) rescue nil
-          col =  hgram.scores.first[1]
-          cr.set_source_rgb col.red/256.0, col.green/256.0, col.blue/256.0
-        when 'retro'
-          cr.set_source_rgb 1, 1, 0.8
-        when 'black'
-          cr.set_source_rgb 0, 0, 0
-        else
-          cr.set_source_rgb 1, 1, 1
-        end
-        cr.fill
-      end
-    end
-
-    border_scale =  [img_width,img_height].max.to_f / print_size.max.to_i
-    size = @border_size
-    size *= border_scale
-    x, y = size, size
-
-    # This biggest impact will be on the smallest side, so to avoid white
-    # edges between photo and border scale by the longest changed side.
-    longest_side = [pixbuf.width, pixbuf.height].max.to_f
-
-    # Should be less than 1
-    pb_scale = (longest_side - (size * 2)) / longest_side
-
-    if @crop
-      if @crop[0] < 0 || @crop[1] < 0
-        x -= @crop[0]
-        y -= @crop[1]
-      end
-    end
-
-    case style
-    when 'retro'
-      # WARNING: CairoUtils class is not available in this gem!
-      CairoUtils.rounded_rectangle(cr, x, y,
-                                   img_width + x - (size*2), img_height+y-(size*2), size)
-    when 'square'
-        cr.rectangle(x, y, img_width - (size*2), img_height - (size*2))
-    end
-    cr.clip()
-
-    if @shrink
-      cr.translate(size, size)
-      cr.scale(pb_scale, pb_scale)
-    end
-    cr.set_source_pixbuf(pixbuf)
-    cr.rectangle(0, 0, pixbuf.width, pixbuf.height)
-
-    cr.paint(1.0)
-    final_pb = surface.to_pixbuf
-    cr.destroy
-    surface.destroy
-    return final_pb
-  end
-end
-
-class Gamma < ImageOp
-  attr_reader :gamma
-  def initialize(gamma=1.0)
-    super()
-    @gamma = gamma
-  end
-  def call(image, pixbuf)
-    if @gamma == 1.0
-      pixbuf
-    else
-      PixbufUtils.gamma(pixbuf, @gamma)
-    end
-  end
-  def priority
-    90
-  end
-end
-
-class Colourify < ImageOp
-  attr_reader :op
-  def initialize(op, alpha=255)
-    super()
-    @op = op
-    @alpha = alpha
-  end
-
-  def alpha
-    @alpha || 255
-  end
-
-  def sepia(pixbuf)
-    PixbufUtils.tint(pixbuf, 25, 5, -25, alpha)
-  end
-
-  def bluetone(pixbuf)
-    PixbufUtils.tint(pixbuf, -10, 5, 25, alpha)
-  end
-
-  def null(pixbuf)
-    pixbuf
-  end
-  alias :full :null # WebKiosk
-  alias :colour :null # WebKiosk
-
-  def greyscale(pixbuf)
-    PixbufUtils.tint(pixbuf, 0, 0, 0, alpha)
-  end
-  alias :bw :greyscale # WebKiosk
-
-  def call(image, pixbuf)
-    if @op and respond_to?(@op)
-      __send__(@op, pixbuf)
-    else
-      pixbuf # Default is nothing
-    end
-  end
-end
-
-end