magro 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: dcc8f3016f64b8b1c8f99fc81bc0e25970b2a027
-  data.tar.gz: 7a5b1842fd84fe2983b9524eb4dd32194a6ead6e
+SHA256:
+  metadata.gz: 4e24a0d3e82248b27f8a652e84ebe382363234a082732af2b1c18a55ea0dc6c3
+  data.tar.gz: dc3bc91550338e59455d2ea51effcaf6934b0970c7169434a2cce7422c852252
 SHA512:
-  metadata.gz: 673cf64674cf0d5b89141594ec8407b9057df9b8cf1c344b6bf3c0a1040d212a04773c70c3a552277c9b1f4ec5553c681a6724a7f3a68d2d25fa406d6ac98a2e
-  data.tar.gz: 61fd9e68c424f24534814ce5e5cc48ccde3dc7333a2001b3b5cd14d1562371600ef581a6af1fd91cd5bd607b13d7962d320149deb7c00f5874050b029d45c122
+  metadata.gz: 000e7447d4f24a0dd6c97610c5c057ee96feb6eb0698a4e3564e7cec29ce6103a1ac3479f12a90fd1d1436ea89329418097197ad346879cc00018cca25e25aa0
+  data.tar.gz: f8a09aad3d5fcadc92e753a453213f8c33e66fbde0522a263afeb02b7a3ceaaf3245c6801f9d61bde41fe7015070391bd3cba8298dc2a1ca275e4ed4e110c60b

data/.travis.yml

@@ -1,5 +1,4 @@
 ---
-sudo: true
 os: linux
 dist: bionic
 language: ruby
@@ -8,7 +7,13 @@ rvm:
   - '2.4'
   - '2.5'
   - '2.6'
+  - '2.7'
+
+addons:
+  apt:
+    packages:
+      - libpng-dev
+      - libjpeg-dev
 
 before_install:
-  - sudo apt-get install -y libpng-dev libjpeg-dev
-  - gem install bundler -v 2.0.2
+  - gem install bundler -v 2.1.4

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.2.0
+- Add [transform module](https://yoshoku.github.io/magro/doc/Magro/Transform.html) and resize method.
+- Fix some configulation files.
+
 # 0.1.2
 - Fix bug that fails to read and save file with upper case file extension.
 

data/Gemfile

@@ -1,4 +1,9 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in magro.gemspec
 gemspec
+
+gem 'bundler', '~> 2.0'
+gem 'rake', '~> 12.0'
+gem 'rake-compiler', '~> 1.0'
+gem 'rspec', '~> 3.0'

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2019 Atsushi Tatsuma
+Copyright (c) 2019-2020 Atsushi Tatsuma
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/README.md

@@ -10,13 +10,14 @@ Magro uses [Numo::NArray](https://github.com/ruby-numo/numo-narray) arrays as im
 
 ## Installation
 
-Magro dependents some external libraries to provides functions loading image file.
+Magro dependents libpng and libjpeg to provides functions loading image file.
+It is recommended that using libpng version 1.6 or later.
 
 macOS:
 
     $ brew install libpng libjpeg
 
-Ubuntu:
+Ubuntu (bionic):
 
     $ sudo apt-get install libpng-dev libjpeg-dev
 

data/lib/magro.rb

@@ -6,3 +6,4 @@ require 'magro/version'
 require 'magro/magro'
 
 require 'magro/io'
+require 'magro/transform'

data/lib/magro/transform.rb

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+module Magro
+  # Transform module provide functions of image transfom.
+  module Transform
+    module_function
+
+    # Resizes an image with bilinear interpolation method.
+    #
+    # @example
+    #   require 'numo/narray'
+    #   require 'magro'
+    #
+    #   image = Numo::UInt8.new(16, 16).seq
+    #   resized = Magro::Transform.resize(image, height: 64, width: 64)
+    #
+    # @param image [Numo::UInt8] (shape: [height, width, n_channels] or [height, width]) Image data to be saved.
+    # @param height [Integer] Requested height in pixels.
+    # @param width [Integer] Requested width in pixels.
+    # @return [Numo::UInt8] (shape: [height, width, n_channels] or [height, width]) Resized image data.
+    def resize(image, height:, width:)
+      n_channels = image.shape[2]
+
+      if n_channels.nil?
+        bilinear_resize(image, height, width)
+      else
+        resized = image.class.zeros(height, width, n_channels)
+        n_channels.times { |c| resized[true, true, c] = bilinear_resize(image[true, true, c], height, width) }
+        resized
+      end
+    end
+
+    # private
+
+    def bilinear_resize(image, new_height, new_width)
+      height, width = image.shape
+
+      y_ratio = height.fdiv(new_height)
+      x_ratio = width.fdiv(new_width)
+
+      y, x = Numo::Int32.new(new_height * new_width).seq.divmod(new_width)
+
+      y_p = Numo::Int32.cast((y_ratio * (y + 0.5) - 0.5).floor).clip(0, height - 1)
+      x_p = Numo::Int32.cast((x_ratio * (x + 0.5) - 0.5).floor).clip(0, width - 1)
+      y_n = Numo::Int32.cast((y_ratio * (y + 0.5) - 0.5).ceil).clip(0, height - 1)
+      x_n = Numo::Int32.cast((x_ratio * (x + 0.5) - 0.5).ceil).clip(0, width - 1)
+
+      flt = image.flatten
+      a = flt[y_p * width + x_p]
+      b = flt[y_p * width + x_n]
+      c = flt[y_n * width + x_p]
+      d = flt[y_n * width + x_n]
+
+      y_d = y_ratio * (y + 0.5) - 0.5
+      x_d = x_ratio * (x + 0.5) - 0.5
+      y_d = y_d.class.maximum(0, y_d - y_d.floor)
+      x_d = x_d.class.maximum(0, x_d - x_d.floor)
+
+      resized = a * (1 - x_d) * (1 - y_d) + b * x_d * (1 - y_d) + c * (1 - x_d) * y_d + d * x_d * y_d
+
+      resized = resized.ceil.clip(image.class::MIN, image.class::MAX) if integer_narray?(image)
+      resized = image.class.cast(resized) unless resized.is_a?(image.class)
+      resized.reshape(new_height, new_width)
+    end
+
+    INTEGER_NARRAY = %w[Numo::Int8 Numo::Int16 Numo::Int32 Numo::Int64
+                        Numo::UInt8 Numo::UInt16 Numo::UInt32 Numo::UInt64].freeze
+
+    private_constant :INTEGER_NARRAY
+
+    def integer_narray?(image)
+      INTEGER_NARRAY.include?(image.class.to_s)
+    end
+
+    private_class_method :bilinear_resize, :integer_narray?
+  end
+end

data/lib/magro/version.rb

@@ -3,5 +3,5 @@
 # Magro is an image processing library in Ruby.
 module Magro
   # The version of Magro you are using.
-  VERSION = '0.1.2'
+  VERSION = '0.2.0'
 end

data/magro.gemspec

@@ -26,9 +26,4 @@ Gem::Specification.new do |spec|
   spec.extensions    = ['ext/magro/extconf.rb']
 
   spec.add_runtime_dependency 'numo-narray', '~> 0.9.1'
-
-  spec.add_development_dependency 'bundler', '~> 2.0'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rake-compiler', '~> 1.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magro
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - yoshoku
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-08 00:00:00.000000000 Z
+date: 2020-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: numo-narray
@@ -24,62 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.1
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: rake-compiler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
 description: Magro is an image processing library for Ruby.
 email:
 - yoshoku@outlook.com
@@ -106,6 +50,7 @@ files:
 - ext/magro/magro.h
 - lib/magro.rb
 - lib/magro/io.rb
+- lib/magro/transform.rb
 - lib/magro/version.rb
 - magro.gemspec
 homepage: https://github.com/yoshoku/magro
@@ -127,8 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.4
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Magro is an image processing library for Ruby.