imogen 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa9d6f61ab8d5aa8f99517c1d4d638cf3a5cb508179d05cf8262bd24f796df35
-  data.tar.gz: 27dc10c53681b2fbd7ea25b258dd5d049c5bbf5b31dc4e01d16d25f829798300
+  metadata.gz: f78baebd0825df57e7ddeea7a7ca02c95a9c2c064c264532a911b12e72d289ad
+  data.tar.gz: c2d64e9187fa67bf65c6be9eb256cd430155609b4e5c8a0f2d5a48742fc87ceb
 SHA512:
-  metadata.gz: f482b46a68ae037dd849cac3232ec7fe74a4902fde31a5c84c7ec323cbddb61a1138aa4192d58092b80acdbc0ae4475569e4d14bb4c17513d18cb8637cad5ae4
-  data.tar.gz: e54a8310bb1af53d1cb6f2287ea6aa23fade2cf51980cc3096dec7fe91844b77c982d46373df67c0028a385175e1276cc7deed5356515e695339cff912cf8bf3
+  metadata.gz: 72f13fe92f9dc14fb61131218d84eb6516dab1a3737839e7377f717d0badee2ffe0bd8b57bb0c6fb6ba056bf2ad151c910296d09f1943e20bcaf96621c1db20d
+  data.tar.gz: 9eb6bd80a0dfa8d797a39267d805acde74e7ac33fe9395556db2d143396fe7aef0dd2603b9fd8df58b4b2d519adf24019b82113cf7506fca867a53eeb43404c4

data/ext/imogencv/extconf.rb

@@ -0,0 +1,99 @@
+require 'mkmf-rice'
+
+osx = RbConfig::CONFIG['target_os'] =~ /darwin/
+
+if osx
+	$CFLAGS << " -x c++ -std=c++14"# damn the torpedoes!
+else
+	$CFLAGS << " -x c++"
+end
+
+def real_inc_dir(src)
+	 File.symlink?(src) ? File.realdirpath(src) : src
+end
+
+def add_flags_if_header(header, header_dir, lib_dir)
+	a_file = File.join(header_dir, header)
+	exists = File.exist?(a_file)
+	puts "#{a_file} exists ... #{exists}"
+	if exists
+		inc_opt = "-I#{header_dir}".quote
+		lib_opt = "-L#{lib_dir}".quote
+		puts "adding compiler flags:\n#{inc_opt}\n#{lib_opt}"
+		$INCFLAGS << " " << inc_opt
+		$LIBPATH = $LIBPATH | [lib_dir]
+	end
+	exists
+end
+
+incdir_default = "/usr/local/include"
+libdir_default = "/usr/local/lib"
+
+have_library('stdc++')
+# MakeMakefile::CONFTEST_C = "#{CONFTEST}.cc"
+
+required_headers = {}
+required_libs = {}
+
+required_headers['opencv4'] = [ 'opencv2/features2d.hpp' ]
+required_libs['opencv4'] = [
+	'opencv_core',
+	'opencv_imgcodecs',
+	'opencv_imgproc',
+	'opencv_features2d'
+]
+
+required_libs['zlib'] = ['z']
+required_libs['libwebp'] = ['webp']
+required_libs['libjpeg'] = ['jpeg']
+required_libs['libtiff-4'] = ['tiff']
+required_libs['libpng'] = ['png16']
+required_libs['jasper'] = [] # just run pkg-config if you can
+required_libs['OpenEXR'] = ['IlmImf']
+
+all_deps = (required_libs.keys | required_headers.keys).sort.uniq
+all_deps.each do |dep_key|
+	has_pkg_config = (pkg_config(dep_key) || []).detect { |c| c =~ /\-L\/\w+/ }
+
+	# expect to call with --with-opencv4-include=DIR and --with-opencv4-lib=DIR or --withopencv4-dir=DIR
+	incdir, libdir = dir_config(dep_key, incdir_default, libdir_default) unless has_pkg_config
+
+	unless !has_pkg_config && incdir && incdir != incdir_default
+		puts "using default #{dep_key} include path: #{incdir_default}"
+	end
+
+	unless !has_pkg_config && libdir && libdir != libdir_default
+		puts "using default #{dep_key} library path: #{libdir_default}"
+	end
+
+	include_paths = [incdir_default, "/usr/local"]
+	include_paths = ([incdir, File.join(incdir, dep_key)] | include_paths) if incdir
+
+	required_headers.fetch(dep_key, []).each do |hdr|
+		unless find_header(hdr, *include_paths.compact.uniq)
+			open(MakeMakefile::Logging.instance_variable_get(:@logfile), 'r') do |logblob|
+				logblob.each { |logline| puts logline.strip }
+			end
+			puts "Cannot find required header: #{hdr}"
+			puts "if this output is from rake compile, consider adding:"
+			puts "rake compile -- --with#{dep_key}-include=DIR"
+			exit 1
+		end
+	end
+
+	lib_paths = [libdir_default, "/usr/local"]
+	lib_paths.unshift(libdir) if libdir
+
+	required_libs.fetch(dep_key, []).each do |lib|
+		unless find_library(lib, nil, *lib_paths.compact.uniq)
+			puts "Cannot find required lib: #{lib}"
+			exit 1
+		end
+	end
+	append_cflags(lib_paths.compact.uniq.map {|x| "-L#{x}"}.join(' '))
+end
+
+append_cflags('-stdlib=libc++')
+@libdir_basename ||= 'lib'
+$LIBRUBYARG.prepend(' ') # there's some weird spacing issue in rice's lib linking routine
+create_makefile('imogencv')

data/ext/imogencv/imogencv.cpp

@@ -0,0 +1,87 @@
+#include "rice/Class.hpp"
+#include "rice/Constructor.hpp"
+#include "rice/Enum.hpp"
+#include "opencv2/features2d.hpp"
+#include "opencv2/imgproc.hpp"
+#include "opencv2/imgcodecs.hpp"
+
+using namespace Rice;
+
+Object process_kaze_features(Object r_image)
+{
+	cv::Mat image = from_ruby<cv::Mat>(r_image);
+	std::vector<cv::KeyPoint> keyPoints;
+	cv::Ptr<cv::KAZE> alg = cv::KAZE::create();
+	cv::Mat features;
+	alg->detectAndCompute(image, cv::noArray(), keyPoints, features);
+	Array a;
+	for(cv::KeyPoint keyPoint : keyPoints)
+	{
+		a.push(to_ruby<cv::Point2f>(keyPoint.pt));
+	}
+	keyPoints.clear();
+	return a;
+}
+
+Object load_grayscale(Object filename)
+{
+	Check_Type(filename, T_STRING);
+	cv::String const c_path = cv::String(String(filename).str());
+	cv::Mat image = imread(c_path, cv::IMREAD_GRAYSCALE);
+	return to_ruby<cv::Mat>(image);
+}
+
+Object point2f_x(Object self)
+{
+	cv::Point2f point = from_ruby<cv::Point2f>(self);
+	return to_ruby<int>(point.x);
+}
+
+Object point2f_y(Object self)
+{
+	cv::Point2f point = from_ruby<cv::Point2f>(self);
+	return to_ruby<int>(point.y);
+}
+
+Object mat_cols(Object self)
+{
+	cv::Mat image = from_ruby<cv::Mat>(self);
+	return to_ruby<int>(image.cols);
+}
+
+Object mat_rows(Object self)
+{
+	cv::Mat image = from_ruby<cv::Mat>(self);
+	return to_ruby<int>(image.rows);
+}
+
+Object mat_good_features_to_track(Object self, int maxCorners, double qualityLevel, double minDistance, int blockSize, bool useHarrisDetector, double k)
+{
+	cv::Mat image = from_ruby<cv::Mat>(self);
+	cv::Mat mask;
+	std::vector<cv::Point2f> corners;
+	cv::goodFeaturesToTrack(image, corners, maxCorners, qualityLevel, minDistance, mask, blockSize, useHarrisDetector, k);
+	Array a;
+	for(cv::Point2f corner : corners)
+	{
+		a.push(to_ruby<cv::Point2f>(corner));
+	}
+	corners.clear();
+	return a;
+}
+
+extern "C"
+void Init_imogencv()
+{
+	Module rb_mOpenCV = define_module("ImogenCV");
+	Class rb_cKazeFeatures = rb_mOpenCV.define_class("KazeFeatures");
+	rb_cKazeFeatures.define_singleton_method("process", &process_kaze_features);
+	Data_Type<cv::Mat> rb_cMat = rb_mOpenCV.define_class<cv::Mat>("Mat")
+		.define_method(Identifier("cols"), &mat_cols)
+		.define_method(Identifier("rows"), &mat_rows)
+		.define_method("good_features_to_track", &mat_good_features_to_track)
+		.define_singleton_method("load_grayscale", &load_grayscale);
+	Data_Type<cv::Point2f> rb_cPoint2f = rb_mOpenCV.define_class<cv::Point2f>("Point2f")
+		.define_method(Identifier("x"), &point2f_x)
+		.define_method(Identifier("y"), &point2f_y);
+}

data/lib/imogen/auto_crop/box.rb

@@ -1,10 +1,11 @@
 #!ruby
-require 'opencv'
+require 'imogencv'
 module Imogen::AutoCrop::Box
-  include OpenCV
+  include ImogenCV
   class Best
     def initialize(grayscale)
-      @corners = grayscale.good_features_to_track(0.3, 1.0, block_size: 3, max: 20)
+      # mat_good_features_to_track(std::int maxCorners, std::double qualityLevel, std:double minDistance, std::int blockSize, std::bool useHarrisDetector, std::double k)
+      @corners = grayscale.good_features_to_track(20, 0.3, 1.0, 3, false, 0.04)
       if @corners.nil? or @corners.length == 0
         @center = Center.new(grayscale)
       else
@@ -77,7 +78,7 @@ module Imogen::AutoCrop::Box
       dims = [img.width, img.height]
       ratio = dims.min.to_f / dims.max
       return ratio >= BoxInfo::SQUARISH
-    elsif img.is_a? OpenCV::CvMat
+    elsif img.is_a? ImogenCV::Mat
       dims = [img.cols, img.rows]
       ratio = dims.min.to_f / dims.max
       return ratio >= BoxInfo::SQUARISH

data/lib/imogen/auto_crop/edges.rb

@@ -1,67 +1,67 @@
 #!ruby
-require 'opencv'
+require 'imogencv'
 require 'free-image'
 require 'tempfile'
 
 module Imogen::AutoCrop
-class Edges
-  include OpenCV
-  def initialize(src)
-    @xoffset = 0
-    @yoffset = 0
-    if src.is_a? FreeImage::Bitmap
-      img = src
-      @xoffset = img.width.to_f/6
-      @yoffset = img.height.to_f/6
-      if Imogen::AutoCrop::Box.squarish? img
-        @xoffset = @xoffset/2
-        @yoffset = @yoffset/2
-      end
-      @tempfile = Tempfile.new(['crop','.png'])
+  class Edges
+    include ImogenCV
+    def initialize(src)
+      @xoffset = 0
+      @yoffset = 0
+      tempfile = nil
+      if src.is_a? FreeImage::Bitmap
+        img = src
+        @xoffset = img.width.to_f/6
+        @yoffset = img.height.to_f/6
+        if Imogen::AutoCrop::Box.squarish? img
+          @xoffset = @xoffset/2
+          @yoffset = @yoffset/2
+        end
+        tempfile = Tempfile.new(['crop','.png'])
 
-      img.copy(@xoffset,@yoffset,img.width-@xoffset,img.height-@yoffset) do |crop|
-        crop.save(@tempfile.path, :png)
-        crop.free
+        img.copy(@xoffset,@yoffset,img.width-@xoffset,img.height-@yoffset) do |crop|
+          crop.save(tempfile.path, :png)
+          crop.free
+        end
+      else
+        raise src.class.name
       end
-    else
-      raise src.class.name 
+      # use bigger features on bigger images
+      @grayscale = ImogenCV::Mat.load_grayscale(tempfile.path)
+      @xrange = (0..@grayscale.cols)
+      @yrange = (0..@grayscale.rows)
+    ensure
+      tempfile.unlink if tempfile
     end
-    # use bigger features on bigger images
-    @grayscale = CvMat.load(@tempfile.path, CV_LOAD_IMAGE_GRAYSCALE)
-    @xrange = (0..@grayscale.cols)
-    @yrange = (0..@grayscale.rows)
-  end
-
-  def bound_min(center)
-    [center.x - @xrange.min, @xrange.max - center.x, center.y - @yrange.min, @yrange.max - center.y].min
-  end
 
-  # returns leftX, topY, rightX, bottomY
-  def get(*args)
-    c = Imogen::AutoCrop::Box.info(@grayscale)
-    r = c.radius.floor
-    # adjust the box
-    coords = [c.x, c.y]
-    min_rad = args.max/2
-    unless r >= min_rad && r <= bound_min(c)
-      # first adjust to the lesser of max (half short dimension) and min (half requested length) radius
-      # this might require upscaling in rare situations to preserve bound safety
-      r = min_rad if r < min_rad
-      max_rad = [@xrange.max - @xrange.min, @yrange.max - @yrange.min].min / 2
-      r = max_rad if r > max_rad
-      # now move the center point minimally to accomodate the necessary radius
-      coords[0] = @xrange.max - r if (coords[0] + r) > @xrange.max  
-      coords[0] = @xrange.min + r if (coords[0] - r) < @xrange.min  
-      coords[1] = @yrange.max - r if (coords[1] + r) > @yrange.max  
-      coords[1] = @yrange.min + r if (coords[1] - r) < @yrange.min  
+    def bound_min(center)
+      [center.x - @xrange.min, @xrange.max - center.x, center.y - @yrange.min, @yrange.max - center.y].min
     end
-    coords = [coords[0] + @xoffset, coords[1] + @yoffset].collect {|i| i.floor}
-    c = coords
 
-    return [c[0]-r, c[1]-r, c[0]+r, c[1] + r]
-  end
-  def unlink
-    @tempfile.unlink
+    # returns leftX, topY, rightX, bottomY
+    def get(*args)
+      c = Imogen::AutoCrop::Box.info(@grayscale)
+      r = c.radius.floor
+      # adjust the box
+      coords = [c.x, c.y]
+      min_rad = args.max/2
+      unless r >= min_rad && r <= bound_min(c)
+        # first adjust to the lesser of max (half short dimension) and min (half requested length) radius
+        # this might require upscaling in rare situations to preserve bound safety
+        r = min_rad if r < min_rad
+        max_rad = [@xrange.max - @xrange.min, @yrange.max - @yrange.min].min / 2
+        r = max_rad if r > max_rad
+        # now move the center point minimally to accomodate the necessary radius
+        coords[0] = @xrange.max - r if (coords[0] + r) > @xrange.max
+        coords[0] = @xrange.min + r if (coords[0] - r) < @xrange.min
+        coords[1] = @yrange.max - r if (coords[1] + r) > @yrange.max
+        coords[1] = @yrange.min + r if (coords[1] - r) < @yrange.min
+      end
+      coords = [coords[0] + @xoffset, coords[1] + @yoffset].collect {|i| i.floor}
+      c = coords
+
+      return [c[0]-r, c[1]-r, c[0]+r, c[1] + r]
+    end
   end
 end
-end

data/lib/imogen/auto_crop.rb

@@ -14,7 +14,6 @@ module Imogen
           thumb.free
         end
       end
-      frame.unlink
     end
   end
-end
+end

data/lib/imogen/iiif/region.rb

@@ -46,15 +46,11 @@ class Region < Transform
     else
       if edges == :featured
         frame = Imogen::AutoCrop::Edges.new(img)
-        begin
-          edges = frame.get([img.width, img.height,768].min)
-        ensure
-          frame.unlink
-        end
+        edges = frame.get([img.width, img.height,768].min)
       end
       img.copy(*edges) {|crop| yield crop}
     end
   end
 end
 end
-end
+end

data/lib/imogen.rb

@@ -104,4 +104,5 @@ module Imogen
       FreeImage::Bitmap.new(ptr, nil, &block)
     end
   end
-end
+end
+require 'imogencv'

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: imogen
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Ben Armintor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-16 00:00:00.000000000 Z
+date: 2019-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ruby-opencv
+  name: rice
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -38,12 +38,29 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  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: 
 email: armintor@gmail.com
 executables: []
-extensions: []
+extensions:
+- ext/imogencv/extconf.rb
 extra_rdoc_files: []
 files:
+- ext/imogencv/extconf.rb
+- ext/imogencv/imogencv.cpp
 - lib/imogen.rb
 - lib/imogen/auto_crop.rb
 - lib/imogen/auto_crop/box.rb
@@ -55,6 +72,7 @@ files:
 - lib/imogen/iiif/size.rb
 - lib/imogen/iiif/tiles.rb
 - lib/imogen/zoomable.rb
+- lib/imogencv.bundle
 - spec/spec_helper.rb
 - spec/unit/imogen_iiif_quality_spec.rb
 - spec/unit/imogen_iiif_region_spec.rb