image_match 0.0.2 → 0.0.3

data/README.md

@@ -1,3 +1,5 @@
+[![Gem Version](https://badge.fury.io/rb/image_match.svg)](http://badge.fury.io/rb/image_match)
+
 # ImageMatch
 
 An simple image match library for view test.
@@ -52,7 +54,7 @@ Following 3 functions are prepared.
 
 2. perfect_match_template function : 
   Try to find template image in scene image.
-  This function requires that template image's size is smaller than image2.
+  This function requires that template image's size is smaller than scene image.
   This returns true if match score is higher than limit_similarity.
   When you set true to is_output, you can check matching result with image.
   The output image will be created at your current directory.
@@ -63,7 +65,7 @@ Following 3 functions are prepared.
 
 3. fuzzy_match_template function : 
   Try to find template image in scene image.
-  This function requires that template image's size is smaller(or equal) than image2.
+  This function requires that template image's size is smaller(or equal) than scene image.
   This function ignore image size, color and image detail.
   When you set true to is_output, you can check matching result with image.
   The output image will be created at your current directory.
@@ -73,6 +75,18 @@ Following 3 functions are prepared.
   fuzzy_match_template(scene_filename, template_filename, is_output=false)
   ```
 
+4. match_template_ignore_size function : 
+  Try to find template image in scene image.
+  This function requires that template image's size is smaller(or equal) than scene image.
+  This function ignore image size.
+  When you set true to is_output, you can check matching result with image.
+  The output image will be created at your current directory.
+  Note that some times this is useful I think, but accuracy is not so high currently.
+
+  ```ruby
+  match_template_ignore_size(scene_filename, template_filename, limit_similarity=0.9, is_output=false)
+  ```
+
 ### Sample Code
 
 A sample to take screen shot on http://google.com/ and compare screen shot and prepared logo image.

data/image_match.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Hidetomo Suzuki"]
   spec.email         = ["zuqqhi2@gmail.com"]
   spec.summary       = %q{Check web page or widget design with image file automatically}
-  spec.description   = %q{1.Make page or widget image file. 2.Get current page or widget image on the web. 3.Compare them with this gem.}
+  spec.description   = %q{This image maching utility allows us to, for example, test web page design automatically.}
   spec.homepage      = "https://github.com/zuqqhi2/image_match"
   spec.license       = "The BSD Liscense"
 

data/lib/image_match.rb

@@ -91,6 +91,35 @@ module ImageMatch
 	
 	  dst_corners
 	end
+
+
+  def get_object_location(scene_filename, template_filename)
+	  scene, template = nil, nil
+	  begin  
+	    scene    = IplImage.load(scene_filename, CV_LOAD_IMAGE_GRAYSCALE)
+		  template = IplImage.load(template_filename, CV_LOAD_IMAGE_GRAYSCALE)
+	  rescue
+	    raise RuntimeError, 'Couldn\'t read image files correctly'
+	    return false
+	  end
+	
+	  return nil unless scene.width >= template.width and scene.height >= template.height
+		
+		param = CvSURFParams.new(1500)
+	  template_keypoints, template_descriptors = template.extract_surf(param)
+		scene_keypoints, scene_descriptors       = scene.extract_surf(param)
+		
+		src_corners = [CvPoint.new(0, 0), 
+	                 CvPoint.new(template.width, 0),
+		               CvPoint.new(template.width, template.height),
+	                 CvPoint.new(0, template.height)]
+		return locate_planar_template(template_keypoints, 
+	                                template_descriptors,
+		                              scene_keypoints,
+	                                scene_descriptors,
+	                                src_corners)
+  end
+
 	
 	#====================================================================
 	# Public Interface
@@ -248,5 +277,60 @@ module ImageMatch
 	  
 	  return (dst_corners ? true : false)
 	end
+	
+	##
+	#
+	# Calculate matching score of 1st input image and 2nd input image.
+	# The 2nd input image size must be smaller than 1st input image.
+	# This function is robust for brightness and size.
+	#
+	# @param [String] scene_filename     Scene image file path
+	# @param [String] template_filename  template image file path which you want find in scene image
+	# @param [Int] limit_similarity      Accepting similarity (default is 90% matching)
+	# @param [Boolean] is_output         if you set true, you can get match result with image (default is false)
+	# @return [Boolean]                  true  if matching score is higher than limit_similarity
+	#                                    false otherwise
+	#
+	def match_template_ignore_size(scene_filename, template_filename, limit_similarity=0.9, is_output=false)
+	  raise ArgumentError, 'File does not exists.' unless File.exist?(scene_filename) and File.exist?(template_filename)
+	  raise ArgumentError, 'is_output must be true or false.' unless is_output == false or is_output == true
+
+    dst_corners = get_object_location(scene_filename, template_filename)
+    
+	  scene, template = nil, nil
+	  begin  
+	    scene    = IplImage.load(scene_filename)
+		  template = IplImage.load(template_filename)
+	  rescue
+	    raise RuntimeError, 'Couldn\'t read image files correctly'
+	    return false
+	  end
+	
+	  return false unless scene.width >= template.width and scene.height >= template.height
+		
+    if dst_corners
+		  src_corners = [CvPoint.new(0, 0), 
+	                   CvPoint.new(template.width, 0),
+		                 CvPoint.new(template.width, template.height),
+	                   CvPoint.new(0, template.height)]
+
+      resize_width  = (dst_corners[1].x - dst_corners[0].x) - src_corners[1].x
+      resize_height = (dst_corners[3].y - dst_corners[0].y) - src_corners[3].y
+
+      template = template.resize(CvSize.new(template.width + resize_width, template.height + resize_height))
+    end
+
+	  result   = scene.match_template(template, :ccoeff_normed)
+	  min_score, max_score, min_point, max_point = result.min_max_loc
+
+	  if is_output
+	    from = max_point
+	    to = CvPoint.new(from.x + template.width, from.y + template.height)
+	    scene.rectangle!(from, to, :color => CvColor::Red, :thickness => 3)
+	    scene.save_image(Time.now.to_i.to_s + "_match_result.png")
+	  end
+	
+	  return (max_score >= limit_similarity ? true : false)
+	end
 
 end

data/lib/image_match/version.rb

@@ -1,3 +1,3 @@
 module ImageMatch
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/image_match_spec.rb

@@ -80,10 +80,10 @@ describe ImageMatch do
       expect(result).to eq true
 
       # Set is_output
-      result = fuzzy_match_template(@image_dir + '/box_in_scene.jpg', @image_dir + '/box.jpg')
+      result = fuzzy_match_template(@image_dir + '/box_in_scene.jpg', @image_dir + '/box.jpg', true)
       path = File.expand_path(File.dirname(__FILE__))
       result = `ls #{path}/../*_match_result.png | wc -l`
-      expect(result.chomp).to eq '1'
+      expect(result.chomp).to eq '2'
     end
 
     it 'finds that 1st input image doesn\'t contains 2nd input image' do
@@ -99,6 +99,39 @@ describe ImageMatch do
       expect{ fuzzy_match_template(@image_dir + '/lena.jpg', @image_dir + '/lena-eyes-2nd.jpg') }.to raise_error      
     end
   end
+  
+  describe 'match_template_ignore_size' do
+    it 'finds that 2nd input image is a part of 1st input image' do
+      # Same
+      result = match_template_ignore_size(@image_dir + '/stuff.jpg', @image_dir + '/stuff.jpg')
+      expect(result).to eq true
+    
+      # Template
+      result = match_template_ignore_size(@image_dir + '/stuff.jpg', @image_dir + '/stuff-lighter.jpg')
+      expect(result).to eq true
+      result = match_template_ignore_size(@image_dir + '/stuff.jpg', @image_dir + '/stuff-lighter-small.jpg')
+      expect(result).to eq true
+
+      # Set is_output
+      result = match_template_ignore_size(@image_dir + '/stuff.jpg', @image_dir + '/stuff-lighter-small.jpg', 0.9, true)
+      path = File.expand_path(File.dirname(__FILE__))
+      result = `ls #{path}/../*_match_result.png | wc -l`
+      expect(result.chomp).to eq '3'
+    end
+
+    it 'finds that 1st input image doesn\'t contains 2nd input image' do
+      # No correlation images
+      result = match_template_ignore_size(@image_dir + '/box.jpg', @image_dir + '/lena-eyes.jpg', 0.9, true)
+      expect(result).to eq false
+
+      # Size not match
+      result = match_template_ignore_size(@image_dir + '/lena.jpg', @image_dir + '/box_in_scene.jpg')
+      expect(result).to eq false
+      
+      # File does not exists
+      expect{ match_template_ignore_size(@image_dir + '/lena.jpg', @image_dir + '/lena-eyes-2nd.jpg') }.to raise_error      
+    end
+  end
 
   after :all do
     # Delete created files

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: image_match
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-16 00:00:00.000000000 Z
+date: 2014-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,8 +75,8 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.13
-description: 1.Make page or widget image file. 2.Get current page or widget image
-  on the web. 3.Compare them with this gem.
+description: This image maching utility allows us to, for example, test web page design
+  automatically.
 email:
 - zuqqhi2@gmail.com
 executables: []
@@ -100,9 +100,13 @@ files:
 - spec/image_match_spec.rb
 - spec/images/box.jpg
 - spec/images/box_in_scene.jpg
+- spec/images/lena-eyes-small.jpg
 - spec/images/lena-eyes.jpg
 - spec/images/lena-noise.jpg
 - spec/images/lena.jpg
+- spec/images/stuff-lighter-small.jpg
+- spec/images/stuff-lighter.jpg
+- spec/images/stuff.jpg
 - spec/spec_helper.rb
 homepage: https://github.com/zuqqhi2/image_match
 licenses:
@@ -119,7 +123,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1656355716927277807
+      hash: -2888227142270713127
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -128,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1656355716927277807
+      hash: -2888227142270713127
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23.2
@@ -139,7 +143,11 @@ test_files:
 - spec/image_match_spec.rb
 - spec/images/box.jpg
 - spec/images/box_in_scene.jpg
+- spec/images/lena-eyes-small.jpg
 - spec/images/lena-eyes.jpg
 - spec/images/lena-noise.jpg
 - spec/images/lena.jpg
+- spec/images/stuff-lighter-small.jpg
+- spec/images/stuff-lighter.jpg
+- spec/images/stuff.jpg
 - spec/spec_helper.rb