magro 0.4.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8bfcf8b7886c7fa5d89556642be97b077f6bf96d7a1725fd2cb8cf1b15c0aef
-  data.tar.gz: b0ab5bff6959f1264ed584dcefc25fb7a64fc866164f73dcf11b1556e7cf6377
+  metadata.gz: bfa8a730f370ebbdf54c3bbbe2248046ec82e0dc759e14f974637d79d437e254
+  data.tar.gz: c907656b0d0732f095d103e0c2bfa76eca70859831c19426ebe517c7560d6592
 SHA512:
-  metadata.gz: f40b650588ec98b33aa8d88bd5c0fb11d4dc8b14faaa197751275f478c2c316e7348b5bd1ff4cc55d33e451036b6b6411fc4f60d9d374c787c91d30ff661abc4
-  data.tar.gz: 7df4bfc3e747f2e8d8fb2dad307df3a0b6370fae1b6c53df66797252629851cf57ab256fdcc64088950ce9177ee2d6ca3a694e498588dc3b4baeef17c771d928
+  metadata.gz: 8943d964496a118ee778532cfc5fe9cdf8ef4a9731b9217453c98f09ec5ef05be77a5d205ef7e6172e9e3d18475b4dcb336d0626ec458a74b957b1504e3f6e36
+  data.tar.gz: 14ef03b1c882e6d0c2502edce3a93b8bf805588e8ee319652bae5b39cb4d6f682df8387268b646e1e1c1b751db5b944247eec96ad7f7152813af97c3afadf74a

data/.clang-format

@@ -0,0 +1,149 @@
+---
+Language:        Cpp
+# BasedOnStyle:  LLVM
+AccessModifierOffset: -2
+AlignAfterOpenBracket: Align
+AlignConsecutiveMacros: false
+AlignConsecutiveAssignments: false
+AlignConsecutiveBitFields: false
+AlignConsecutiveDeclarations: false
+AlignEscapedNewlines: Right
+AlignOperands:   Align
+AlignTrailingComments: true
+AllowAllArgumentsOnNextLine: true
+AllowAllConstructorInitializersOnNextLine: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortEnumsOnASingleLine: true
+AllowShortBlocksOnASingleLine: Never
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: All
+AllowShortLambdasOnASingleLine: All
+AllowShortIfStatementsOnASingleLine: Never
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: MultiLine
+BinPackArguments: true
+BinPackParameters: true
+BraceWrapping:
+  AfterCaseLabel:  false
+  AfterClass:      false
+  AfterControlStatement: Never
+  AfterEnum:       false
+  AfterFunction:   false
+  AfterNamespace:  false
+  AfterObjCDeclaration: false
+  AfterStruct:     false
+  AfterUnion:      false
+  AfterExternBlock: false
+  BeforeCatch:     false
+  BeforeElse:      false
+  BeforeLambdaBody: false
+  BeforeWhile:     false
+  IndentBraces:    false
+  SplitEmptyFunction: true
+  SplitEmptyRecord: true
+  SplitEmptyNamespace: true
+BreakBeforeBinaryOperators: None
+BreakBeforeBraces: Attach
+BreakBeforeInheritanceComma: false
+BreakInheritanceList: BeforeColon
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializersBeforeComma: false
+BreakConstructorInitializers: BeforeColon
+BreakAfterJavaFieldAnnotations: false
+BreakStringLiterals: true
+ColumnLimit:     128
+CommentPragmas:  '^ IWYU pragma:'
+CompactNamespaces: false
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DeriveLineEnding: true
+DerivePointerAlignment: false
+DisableFormat:   false
+ExperimentalAutoDetectBinPacking: false
+FixNamespaceComments: true
+ForEachMacros:
+  - foreach
+  - Q_FOREACH
+  - BOOST_FOREACH
+IncludeBlocks:   Preserve
+IncludeCategories:
+  - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
+    Priority:        2
+    SortPriority:    0
+  - Regex:           '^(<|"(gtest|gmock|isl|json)/)'
+    Priority:        3
+    SortPriority:    0
+  - Regex:           '.*'
+    Priority:        1
+    SortPriority:    0
+IncludeIsMainRegex: '(Test)?$'
+IncludeIsMainSourceRegex: ''
+IndentCaseLabels: false
+IndentCaseBlocks: false
+IndentGotoLabels: true
+IndentPPDirectives: None
+IndentExternBlock: AfterExternBlock
+IndentWidth:     2
+IndentWrappedFunctionNames: false
+InsertTrailingCommas: None
+JavaScriptQuotes: Leave
+JavaScriptWrapImports: true
+KeepEmptyLinesAtTheStartOfBlocks: true
+MacroBlockBegin: ''
+MacroBlockEnd:   ''
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+ObjCBinPackProtocolList: Auto
+ObjCBlockIndentWidth: 2
+ObjCBreakBeforeNestedBlockParam: true
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: true
+PenaltyBreakAssignment: 2
+PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
+PenaltyBreakTemplateDeclaration: 10
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 60
+PointerAlignment: Left
+ReflowComments:  true
+SortIncludes:    true
+SortUsingDeclarations: true
+SpaceAfterCStyleCast: false
+SpaceAfterLogicalNot: false
+SpaceAfterTemplateKeyword: true
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCpp11BracedList: false
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
+SpaceBeforeParens: ControlStatements
+SpaceBeforeRangeBasedForLoopColon: true
+SpaceInEmptyBlock: false
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles:  false
+SpacesInConditionalStatement: false
+SpacesInContainerLiterals: true
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+SpaceBeforeSquareBrackets: false
+Standard:        Latest
+StatementMacros:
+  - Q_UNUSED
+  - QT_REQUIRE_VERSION
+TabWidth:        8
+UseCRLF:         false
+UseTab:          Never
+WhitespaceSensitiveMacros:
+  - STRINGIZE
+  - PP_STRINGIZE
+  - BOOST_PP_STRINGIZE
+...
+

data/.coveralls.yml

@@ -1 +1 @@
-service_name: travis-ci
+service_name: github-ci

data/.github/workflows/build.yml

@@ -0,0 +1,23 @@
+name: build
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        ruby: [ '2.6', '2.7', '3.0' ]
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install libpng and libjpeg
+        run: sudo apt-get install -y libpng-dev libjpeg-dev
+      - name: Set up Ruby ${{ matrix.ruby }}
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - name: Build and test with Rake
+        run: |
+          gem install --no-document bundler
+          bundle install --jobs 4 --retry 3
+          bundle exec rake

data/.github/workflows/coverage.yml

@@ -0,0 +1,29 @@
+name: coverage
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  coverage:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install libpng and libjpeg
+        run: sudo apt-get install -y libpng-dev libjpeg-dev
+      - uses: actions/checkout@v2
+      - name: Set up Ruby 2.7
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: '2.7'
+      - name: Build and test with Rake
+        run: |
+          gem install bundler
+          bundle install
+          bundle exec rake
+      - name: Coveralls GitHub Action
+        uses: coverallsapp/github-action@v1.1.2
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+# 0.5.1
+- Fix version specifier of runtime dependencies.
+
+# 0.5.0
+- Add type declaration files.
+- Refactor some codes.
+
+# 0.4.3
+- Fix imread method to read image from URL.
+- Fix some configulation files.
+
+# 0.4.2
+- Add GC guard to reading and writing image methods.
+
+# 0.4.1
+- Add GC guard to narray given to native extension method.
+- Fix some configulation files.
+
 # 0.4.0
 - Rename extension file for reading and writing image file.
 - Update documentations.

data/Gemfile

@@ -3,8 +3,11 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in magro.gemspec
 gemspec
 
-gem 'coveralls', '~> 0.8'
 gem 'bundler', '~> 2.0'
-gem 'rake', '~> 12.0'
+gem 'rake', '~> 13.0'
 gem 'rake-compiler', '~> 1.0'
 gem 'rspec', '~> 3.0'
+gem 'simplecov', '~> 0.19'
+gem 'simplecov-lcov', '~> 0.8'
+gem 'rbs', '~> 1.2'
+gem 'steep', '~> 0.44'

data/LICENSE.txt

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

data/README.md

@@ -1,9 +1,9 @@
 # Magro
 
-[![Build Status](https://travis-ci.org/yoshoku/magro.svg?branch=master)](https://travis-ci.org/yoshoku/magro)
-[![Coverage Status](https://coveralls.io/repos/github/yoshoku/magro/badge.svg?branch=master)](https://coveralls.io/github/yoshoku/magro?branch=master)
+[![Build Status](https://github.com/yoshoku/magro/workflows/build/badge.svg)](https://github.com/yoshoku/magro/actions?query=workflow%3Abuild)
+[![Coverage Status](https://coveralls.io/repos/github/yoshoku/magro/badge.svg?branch=main)](https://coveralls.io/github/yoshoku/magro?branch=main)
 [![Gem Version](https://badge.fury.io/rb/magro.svg)](https://badge.fury.io/rb/magro)
-[![BSD 3-Clause License](https://img.shields.io/badge/License-BSD%203--Clause-orange.svg)](https://github.com/yoshoku/numo-liblinear/blob/master/LICENSE.txt)
+[![BSD 3-Clause License](https://img.shields.io/badge/License-BSD%203--Clause-orange.svg)](https://github.com/yoshoku/numo-liblinear/blob/main/LICENSE.txt)
 [![Documentation](http://img.shields.io/badge/api-reference-blue.svg)](https://yoshoku.github.io/magro/doc/)
 
 Magro is a minimal image processing library in Ruby.
@@ -63,4 +63,4 @@ This project is intended to be a safe, welcoming space for collaboration, and co
 
 ## Code of Conduct
 
-Everyone interacting in the Magro project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/yoshoku/magro/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the Magro project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/yoshoku/magro/blob/main/CODE_OF_CONDUCT.md).

data/Steepfile

@@ -0,0 +1,20 @@
+target :lib do
+  signature "sig"
+#
+  check "lib"                       # Directory name
+#   check "Gemfile"                   # File name
+#   check "app/models/**/*.rb"        # Glob
+#   # ignore "lib/templates/*.rb"
+#
+#   # library "pathname", "set"       # Standard libraries
+#   # library "strong_json"           # Gems
+end
+
+# target :spec do
+#   signature "sig", "sig-private"
+#
+#   check "spec"
+#
+#   # library "pathname", "set"       # Standard libraries
+#   # library "rspec"
+# end

data/ext/magro/imgrw.c

@@ -5,9 +5,7 @@ RUBY_EXTERN VALUE mMagro;
 /**
  * @!visibility private
  */
-static
-VALUE magro_io_read_png(VALUE self, VALUE filename_)
-{
+static VALUE magro_io_read_png(VALUE self, VALUE filename_) {
   char* filename = StringValuePtr(filename_);
   FILE* file_ptr = fopen(filename, "rb");
   unsigned char header[8];
@@ -21,7 +19,7 @@ VALUE magro_io_read_png(VALUE self, VALUE filename_)
   png_uint_32 y;
   int n_dims = 0;
   int n_ch;
-  size_t shape[3] = { 0 };
+  size_t shape[3] = {0};
   VALUE nary;
   uint8_t* nary_ptr;
 
@@ -76,36 +74,36 @@ VALUE magro_io_read_png(VALUE self, VALUE filename_)
   }
 
   switch (color_type) {
-    case PNG_COLOR_TYPE_GRAY:
-      n_ch = 1;
-      n_dims = 2;
-      shape[0] = height;
-      shape[1] = width;
-      break;
-    case PNG_COLOR_TYPE_GRAY_ALPHA:
-      n_ch = 2;
-      n_dims = 3;
-      shape[0] = height;
-      shape[1] = width;
-      shape[2] = 2;
-      break;
-    case PNG_COLOR_TYPE_RGB:
-      n_ch = 3;
-      n_dims = 3;
-      shape[0] = height;
-      shape[1] = width;
-      shape[2] = 3;
-      break;
-    case PNG_COLOR_TYPE_RGB_ALPHA:
-      n_ch = 4;
-      n_dims = 3;
-      shape[0] = height;
-      shape[1] = width;
-      shape[2] = 4;
-      break;
-    default:
-      n_dims = 0;
-      break;
+  case PNG_COLOR_TYPE_GRAY:
+    n_ch = 1;
+    n_dims = 2;
+    shape[0] = height;
+    shape[1] = width;
+    break;
+  case PNG_COLOR_TYPE_GRAY_ALPHA:
+    n_ch = 2;
+    n_dims = 3;
+    shape[0] = height;
+    shape[1] = width;
+    shape[2] = 2;
+    break;
+  case PNG_COLOR_TYPE_RGB:
+    n_ch = 3;
+    n_dims = 3;
+    shape[0] = height;
+    shape[1] = width;
+    shape[2] = 3;
+    break;
+  case PNG_COLOR_TYPE_RGB_ALPHA:
+    n_ch = 4;
+    n_dims = 3;
+    shape[0] = height;
+    shape[1] = width;
+    shape[2] = 4;
+    break;
+  default:
+    n_dims = 0;
+    break;
   }
 
   if (n_dims == 0) {
@@ -126,15 +124,15 @@ VALUE magro_io_read_png(VALUE self, VALUE filename_)
   fclose(file_ptr);
   png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
 
+  RB_GC_GUARD(filename_);
+
   return nary;
 }
 
 /**
  * @!visibility private
  */
-static
-VALUE magro_io_save_png(VALUE self, VALUE filename_, VALUE image)
-{
+static VALUE magro_io_save_png(VALUE self, VALUE filename_, VALUE image) {
   char* filename = StringValuePtr(filename_);
   FILE* file_ptr = fopen(filename, "wb");
   png_structp png_ptr;
@@ -173,18 +171,18 @@ VALUE magro_io_save_png(VALUE self, VALUE filename_, VALUE image)
   }
 
   switch (n_ch) {
-    case 4:
-      color_type = PNG_COLOR_TYPE_RGBA;
-      break;
-    case 3:
-      color_type = PNG_COLOR_TYPE_RGB;
-      break;
-    case 2:
-      color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
-      break;
-    default:
-      color_type = PNG_COLOR_TYPE_GRAY;
-      break;
+  case 4:
+    color_type = PNG_COLOR_TYPE_RGBA;
+    break;
+  case 3:
+    color_type = PNG_COLOR_TYPE_RGB;
+    break;
+  case 2:
+    color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
+    break;
+  default:
+    color_type = PNG_COLOR_TYPE_GRAY;
+    break;
   }
 
   png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
@@ -206,8 +204,8 @@ VALUE magro_io_save_png(VALUE self, VALUE filename_, VALUE image)
     return Qfalse;
   }
 
-  png_set_IHDR(png_ptr, info_ptr, width, height, bit_depth, color_type,
-    PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
+  png_set_IHDR(png_ptr, info_ptr, width, height, bit_depth, color_type, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
+               PNG_FILTER_TYPE_DEFAULT);
 
   row_ptr_ptr = png_malloc(png_ptr, height * sizeof(png_bytep));
   for (y = 0; y < height; y++) {
@@ -226,6 +224,9 @@ VALUE magro_io_save_png(VALUE self, VALUE filename_, VALUE image)
   png_free(png_ptr, row_ptr_ptr);
   png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
 
+  RB_GC_GUARD(image);
+  RB_GC_GUARD(filename_);
+
   return Qtrue;
 }
 
@@ -234,9 +235,7 @@ struct my_error_mgr {
   jmp_buf setjmp_buffer;
 };
 
-static void
-my_error_exit(j_common_ptr cinfo)
-{
+static void my_error_exit(j_common_ptr cinfo) {
   struct my_error_mgr* my_err = (struct my_error_mgr*)cinfo->err;
   (*cinfo->err->output_message)(cinfo);
   longjmp(my_err->setjmp_buffer, 1);
@@ -245,16 +244,14 @@ my_error_exit(j_common_ptr cinfo)
 /**
  * @!visibility private
  */
-static
-VALUE magro_io_read_jpg(VALUE self, VALUE filename_)
-{
+static VALUE magro_io_read_jpg(VALUE self, VALUE filename_) {
   char* filename = StringValuePtr(filename_);
   FILE* file_ptr = fopen(filename, "rb");
   struct jpeg_decompress_struct jpeg;
   struct my_error_mgr err;
   unsigned int width, height;
   int n_colors;
-  size_t shape[3] = { 0 };
+  size_t shape[3] = {0};
   int n_dims;
   unsigned int y;
   VALUE nary;
@@ -298,15 +295,15 @@ VALUE magro_io_read_jpg(VALUE self, VALUE filename_)
   jpeg_finish_decompress(&jpeg);
   jpeg_destroy_decompress(&jpeg);
 
+  RB_GC_GUARD(filename_);
+
   return nary;
 }
 
 /**
  * @!visibility private
  */
-static
-VALUE magro_io_save_jpg(int argc, VALUE* argv, VALUE self)
-{
+static VALUE magro_io_save_jpg(int argc, VALUE* argv, VALUE self) {
   VALUE filename_;
   VALUE image;
   VALUE quality_;
@@ -371,15 +368,15 @@ VALUE magro_io_save_jpg(int argc, VALUE* argv, VALUE self)
   jpeg.input_components = n_ch;
 
   switch (n_ch) {
-    case 3:
-      jpeg.in_color_space = JCS_RGB;
-      break;
-    case 1:
-      jpeg.in_color_space = JCS_GRAYSCALE;
-      break;
-    default:
-      jpeg.in_color_space = JCS_UNKNOWN;
-      break;
+  case 3:
+    jpeg.in_color_space = JCS_RGB;
+    break;
+  case 1:
+    jpeg.in_color_space = JCS_GRAYSCALE;
+    break;
+  default:
+    jpeg.in_color_space = JCS_UNKNOWN;
+    break;
   }
 
   jpeg_set_defaults(&jpeg);
@@ -398,11 +395,13 @@ VALUE magro_io_save_jpg(int argc, VALUE* argv, VALUE self)
 
   fclose(file_ptr);
 
+  RB_GC_GUARD(image);
+  RB_GC_GUARD(filename_);
+
   return Qtrue;
 }
 
-void init_io_module()
-{
+void init_io_module() {
   VALUE mIO = rb_define_module_under(mMagro, "IO");
   rb_define_module_function(mIO, "read_png", magro_io_read_png, 1);
   rb_define_module_function(mIO, "save_png", magro_io_save_png, 2);

data/ext/magro/imgrw.h

@@ -6,10 +6,12 @@
 #include <string.h>
 
 #include <setjmp.h>
-#include <png.h>
+
 #include <jpeglib.h>
+#include <png.h>
 
 #include <ruby.h>
+
 #include <numo/narray.h>
 #include <numo/template.h>
 

data/ext/magro/magro.c

@@ -2,8 +2,7 @@
 
 VALUE mMagro;
 
-void Init_magro()
-{
+void Init_magro() {
   mMagro = rb_define_module("Magro");
 
   init_io_module();

data/lib/magro/filter.rb

@@ -32,7 +32,7 @@ module Magro
       if n_channels.nil?
         filter1ch(padded, kernel, scale, offset)
       else
-        image.class.zeros(*image.shape).tap do |filtered|
+        image.class.zeros(image.shape).tap do |filtered|
           n_channels.times do |c|
             filtered[true, true, c] = filter1ch(padded[true, true, c], kernel, scale, offset)
           end

data/lib/magro/io.rb

@@ -1,12 +1,15 @@
 # frozen_string_literal: true
 
+require 'open-uri'
+require 'tempfile'
+
 module Magro
   # IO module provides functions for input and output of image file.
   module IO
     module_function
 
     # Loads an image from file.
-    # @param filename [String] Path to image file to be loaded.
+    # @param filename [String] File path or URL of image file to be loaded.
     #   Currently, the following file formats are support:
     #   Portbale Network Graphics (*.png) and JPEG files (*.jpeg, *.jpg, *jpe).
     # @raise [ArgumentError] This error is raised when filename is not String.
@@ -15,8 +18,27 @@ module Magro
     # @return [Numo::UInt8] (shape: [height, width, n_channels]) Loaded image.
     def imread(filename)
       raise ArgumentError, 'Expect class of filename to be String.' unless filename.is_a?(String)
-      return read_jpg(filename) if filename.downcase =~ /\.(jpeg|jpg|jpe)$/
-      return read_png(filename) if filename.downcase =~ /\.png$/
+
+      unless url?(filename)
+        return case filename.downcase
+               when /\.(jpeg|jpg|jpe)$/
+                 read_jpg(filename)
+               when /\.png$/
+                 read_png(filename)
+               end
+      end
+
+      uri = URI.parse(filename)
+      ext = File.extname(uri.path).downcase
+      raise IOError, 'Failed to detect file extension from given URL.' unless ext =~ /\.(jpeg|jpg|jpe|png)$/
+
+      uri.open do |file|
+        temp = Tempfile.new(['magro_', ext])
+        temp.binmode
+        temp.write(file.read)
+        temp.rewind
+        imread(temp.path)
+      end
     end
 
     # Saves an image to file.
@@ -46,6 +68,11 @@ module Magro
       false
     end
 
-    private_class_method :read_jpg, :read_png, :save_jpg, :save_png
+    def url?(str)
+      uri = URI.parse(str)
+      uri.is_a?(URI::HTTP) || uri.is_a?(URI::HTTPS)
+    end
+
+    private_class_method :read_jpg, :read_png, :save_jpg, :save_png, :url?
   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.4.0'
+  VERSION = '0.5.1'
 end

data/magro.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = 'https://github.com/yoshoku/magro'
-  spec.metadata['changelog_uri'] = 'https://github.com/yoshoku/magro/blob/master/CHANGELOG.md'
+  spec.metadata['changelog_uri'] = 'https://github.com/yoshoku/magro/blob/main/CHANGELOG.md'
   spec.metadata['documentation_uri'] = 'https://yoshoku.github.io/magro/doc/'
 
   # Specify which files should be added to the gem when it is released.
@@ -35,5 +35,5 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.extensions    = ['ext/magro/extconf.rb']
 
-  spec.add_runtime_dependency 'numo-narray', '~> 0.9.1'
+  spec.add_runtime_dependency 'numo-narray', '>= 0.9.1'
 end

data/sig/magro.rbs

@@ -0,0 +1,9 @@
+module Magro
+  VERSION: String
+
+  type magro_image_narray = (
+    Numo::Int8 | Numo::Int16 | Numo::Int32 | Numo::Int64 |
+    Numo::UInt8 | Numo::UInt16 | Numo::UInt32 | Numo::UInt64 |
+    Numo::SFloat | Numo::DFloat
+  )
+end

data/sig/magro/filter.rbs

@@ -0,0 +1,20 @@
+module Magro
+  module Filter
+    def self?.filter2d: (Numo::UInt8 image, Numo::DFloat kernel, ?scale: Float? scale, ?offset: Integer offset) -> Numo::UInt8
+    def self?.convolve2d: (magro_image_narray arr1, magro_image_narray arr2) -> magro_image_narray
+
+    private
+
+    INTEGER_NARRAY: Array[String]
+
+    #def self?.zero_padding: (magro_image_narray image, Integer filter_h, Integer filter_w) -> magro_image_narray
+    #def self?.filter1ch: (magro_image_narray image, Numo::DFloat kernel, Float? scale, Integer offset) -> magro_image_narray
+    #def self?.im2col: (magro_image_narray image, Integer filter_h, Integer filter_w) -> magro_image_narray
+    #def self?.integer_narray?: (Numo::NArray image) -> bool
+
+    def self?.zero_padding: (untyped image, Integer filter_h, Integer filter_w) -> untyped
+    def self?.filter1ch: (untyped image, Numo::DFloat kernel, Float? scale, Integer offset) -> untyped
+    def self?.im2col: (untyped image, Integer filter_h, Integer filter_w) -> untyped
+    def self?.integer_narray?: (Numo::NArray image) -> bool
+  end
+end

data/sig/magro/io.rbs

@@ -0,0 +1,14 @@
+module Magro
+  module IO
+    def self?.imread: (String filename) -> Numo::UInt8?
+    def self?.imsave: (String filename, Numo::UInt8 image, ?quality: Integer) -> bool
+
+    private
+
+    def self?.read_jpg: (String filename) -> Numo::UInt8
+    def self?.read_png: (String filename) -> Numo::UInt8
+    def self?.save_jpg: (String filename, Numo::UInt8 image, Integer? quality) -> bool
+    def self?.save_png: (String filename, Numo::UInt8 image) -> bool
+    def self?.url?: (String str) -> bool
+  end
+end

data/sig/magro/transform.rbs

@@ -0,0 +1,12 @@
+module Magro
+  module Transform
+    def self?.resize: (Numo::UInt8 image, height: Integer height, width: Integer width) -> Numo::UInt8
+
+    private
+
+    INTEGER_NARRAY: Array[String]
+
+    def self?.bilinear_resize: (Numo::UInt8 image, Integer new_height, Integer new_width) -> Numo::UInt8
+    def self?.integer_narray?: (Numo::NArray image) -> bool
+  end
+end

data/sig/patch.rbs

@@ -0,0 +1,90 @@
+module Numo
+  class NArray
+    def self.cast: (untyped a) -> untyped
+    def self.zeros: (*Integer) -> untyped
+    def self.[]: (*untyped) -> untyped
+    def []: () -> untyped
+    def []=: () -> untyped
+    def +: (untyped) -> untyped
+    def empty?: () -> bool
+    def flatten: () -> untyped
+    def initialize: (*untyped) -> untyped
+    def ndim: () -> Integer
+    def shape: () -> [Integer, Integer]
+    def swapaxes: (Integer, Integer) -> untyped
+    def transpose: (*untyped) -> untyped
+  end
+
+  class Int8 < NArray
+    def *: (untyped) -> untyped
+    def +: (untyped) -> untyped
+    def []: (*untyped) -> untyped
+    def []=: (*untyped) -> untyped
+  end
+
+  class Int16 < NArray
+    def *: (untyped) -> untyped
+    def +: (untyped) -> untyped
+    def []: (*untyped) -> untyped
+    def []=: (*untyped) -> untyped
+  end
+
+  class Int32 < NArray
+    def *: (untyped) -> untyped
+    def +: (untyped) -> untyped
+    def []: (*untyped) -> untyped
+    def []=: (*untyped) -> untyped
+    def seq: (*untyped) -> untyped
+  end
+
+  class Int64 < NArray
+    def *: (untyped) -> untyped
+    def +: (untyped) -> untyped
+    def []: (*untyped) -> untyped
+    def []=: (*untyped) -> untyped
+  end
+
+  class UInt8 < NArray
+    def *: (untyped) -> untyped
+    def +: (untyped) -> untyped
+    def []: (*untyped) -> untyped
+    def []=: (*untyped) -> untyped
+  end
+
+  class UInt16 < NArray
+    def *: (untyped) -> untyped
+    def +: (untyped) -> untyped
+    def []: (*untyped) -> untyped
+    def []=: (*untyped) -> untyped
+  end
+
+  class UInt32 < NArray
+    def *: (untyped) -> untyped
+    def +: (untyped) -> untyped
+    def []: (*untyped) -> untyped
+    def []=: (*untyped) -> untyped
+  end
+
+  class UInt64 < NArray
+    def *: (untyped) -> untyped
+    def +: (untyped) -> untyped
+    def []: (*untyped) -> untyped
+    def []=: (*untyped) -> untyped
+  end
+
+  class SFloat < NArray
+    def sum: (*untyped) -> untyped
+    def *: (untyped) -> untyped
+    def +: (untyped) -> untyped
+    def []: (*untyped) -> untyped
+    def []=: (*untyped) -> untyped
+  end
+
+  class DFloat < NArray
+    def sum: (*untyped) -> untyped
+    def *: (untyped) -> untyped
+    def +: (untyped) -> untyped
+    def []: (*untyped) -> untyped
+    def []=: (*untyped) -> untyped
+  end
+end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: magro
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.1
 platform: ruby
 authors:
 - yoshoku
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-25 00:00:00.000000000 Z
+date: 2021-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: numo-narray
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.1
 description: |
@@ -36,16 +36,19 @@ extensions:
 - ext/magro/extconf.rb
 extra_rdoc_files: []
 files:
+- ".clang-format"
 - ".coveralls.yml"
+- ".github/workflows/build.yml"
+- ".github/workflows/coverage.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- Steepfile
 - bin/console
 - bin/setup
 - ext/magro/extconf.rb
@@ -59,15 +62,20 @@ files:
 - lib/magro/transform.rb
 - lib/magro/version.rb
 - magro.gemspec
+- sig/magro.rbs
+- sig/magro/filter.rbs
+- sig/magro/io.rbs
+- sig/magro/transform.rbs
+- sig/patch.rbs
 homepage: https://github.com/yoshoku/magro
 licenses:
 - BSD-3-Clause
 metadata:
   homepage_uri: https://github.com/yoshoku/magro
   source_code_uri: https://github.com/yoshoku/magro
-  changelog_uri: https://github.com/yoshoku/magro/blob/master/CHANGELOG.md
+  changelog_uri: https://github.com/yoshoku/magro/blob/main/CHANGELOG.md
   documentation_uri: https://yoshoku.github.io/magro/doc/
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -82,8 +90,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubygems_version: 3.2.21
+signing_key: 
 specification_version: 4
 summary: Magro is a minimal image processing library for Ruby.
 test_files: []

data/.travis.yml

@@ -1,19 +0,0 @@
----
-os: linux
-dist: bionic
-language: ruby
-cache: bundler
-rvm:
-  - '2.4'
-  - '2.5'
-  - '2.6'
-  - '2.7'
-
-addons:
-  apt:
-    packages:
-      - libpng-dev
-      - libjpeg-dev
-
-before_install:
-  - gem install bundler -v 2.1.4