compix 0.0.5 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb42dd67dc46a435223d649a19c74494e9f6a920
-  data.tar.gz: 4608581180744a8fc6df686c71fdcc99df1fa673
+  metadata.gz: d31400ba7b637660ef09a34d8c45228d25811274
+  data.tar.gz: 2c5589a1b5da50cd87e2d4ad50a908168139acf7
 SHA512:
-  metadata.gz: 5861d769b5ee93c95c6811a931dd782e7f8def8117f04162b7c9150a7255e10648e2197bf843de3bc98e31466b9d20e4b3c157dee16ee42250474ef16822ac4f
-  data.tar.gz: a5328685d480d67477f3624b00e8a2c09648bdadf1c02f5ee0c835c2869ca0fbf5f7686e5733ae085acf6582884bcb23ca44e37bb9222629de1c677ba7a9752f
+  metadata.gz: 6676275970f1c794242b386f74f0fc5fd419a96800e758db97d57ce7b79741092638098a9a15a36d683d3f2ebae9d9f589ebb23ebffa0e007db491e30ea13b04
+  data.tar.gz: 07740fd33ca945ab6c89c7d522ff284561823b3701696a62b45c7806c2b49420e4693715f701ccb34db94cb5cc7cd1960ee2650599139e9309e68a4899a69a9f

data/ext/compix/compix.c

@@ -1,146 +1,132 @@
-#include <ruby.h>
-#include <stdbool.h>
-
-// Types and macros from OilyPNG for compatibility
-typedef unsigned int PIXEL; // Pixels use 32 bits unsigned integers
-typedef unsigned char BYTE; // Bytes use 8 bits unsigned integers
-#define R_BYTE(pixel)  ((BYTE) (((pixel) & (PIXEL) 0xff000000) >> 24))
-#define G_BYTE(pixel)  ((BYTE) (((pixel) & (PIXEL) 0x00ff0000) >> 16))
-#define B_BYTE(pixel)  ((BYTE) (((pixel) & (PIXEL) 0x0000ff00) >> 8))
-#define A_BYTE(pixel)  ((BYTE) (((pixel) & (PIXEL) 0x000000ff)))
-
-void Init_compix();
-VALUE compix_compare_pixels(VALUE self, VALUE subimage, VALUE bigimage, 
-                            VALUE minCoord, VALUE maxCoord, VALUE threshold);
-                            
-void Init_compix(){
-  VALUE klass = rb_define_class("Compix", rb_cObject);
-  rb_define_singleton_method(klass, "compare_pixels", compix_compare_pixels, 5);
-}
-
-int getImgWidth(VALUE img){
-  int width = NUM2INT(rb_funcall(img, rb_intern("width"), 0));
-  return width;
-}
-
-int getImgHeight(VALUE img){
-  int height = NUM2INT(rb_funcall(img, rb_intern("height"), 0));
-  return height;
-}
-
-int comparePixels(PIXEL pone, PIXEL ptwo, int threshold){
-  unsigned char ored = R_BYTE(pone);
-  unsigned char ogreen = G_BYTE(pone);
-  unsigned char oblue = B_BYTE(pone);
-  unsigned char tred = R_BYTE(ptwo);
-  unsigned char tgreen = G_BYTE(ptwo);
-  unsigned char tblue = B_BYTE(ptwo);
-  if(ored - tred > threshold || tred - ored > threshold ||
-      ogreen - tgreen > threshold || tgreen - ogreen > threshold ||
-      oblue - tblue > threshold || tblue - oblue > threshold){
-      return false;
-  }
-  return true;
-}
-
-int compareAt(unsigned int *pixelsSmall, unsigned int *pixelsBig, int thres, int bigXoffset, int bigYoffset,
-              int siwidth, int siheight, int sswidth, int ssheight){
-  PIXEL firstPixel;
-  PIXEL secPixel;
-  int match = 0;
-  int unmatch = 0;
-  int x, y;
-  int small_image_coord;
-  int bigCoord = 0;
-  for(y = 0; y < siheight; y++){    
-    for(x = 0; x < siwidth; x++){
-      small_image_coord = y * siwidth + x;
-      firstPixel = pixelsSmall[small_image_coord];
-      bigCoord = sswidth*(y+bigYoffset)+(x+bigXoffset);
-      if(bigCoord >= (sswidth)*(ssheight) - 2 ){
-        break;
-      }
-      secPixel = pixelsBig[bigCoord];
-      if(comparePixels(firstPixel, secPixel, thres)){
-        match++;
-      } 
-      else {
-        unmatch++;
-      }
-    }
-    if(unmatch > match){
-      break;
-    }
-  }
-  return match;
-}
-
-VALUE compix_compare_pixels(VALUE self, VALUE subimage, VALUE bigimage, 
-                            VALUE minCoord, VALUE maxCoord, VALUE threshold){  
-  VALUE pixelsf = rb_funcall(subimage, rb_intern("pixels"), 0);
-  VALUE pixelss = rb_funcall(bigimage, rb_intern("pixels"), 0);    
-  
-  int siwidth = getImgWidth(subimage);
-  int siheight = getImgHeight(subimage);
-  int sswidth = getImgWidth(bigimage);
-  int ssheight = getImgHeight(bigimage);
-  
-  unsigned int *bytearray_subimg = malloc(siwidth * siheight * sizeof(unsigned int));
-  unsigned int *bytearray_screenshot = malloc(sswidth * ssheight * sizeof(unsigned int));
-  
-  int thres = NUM2UINT(threshold);
-  int match = 0;
-  int maxmatch = 0;
-  int maxX = -1;
-  int maxY = -1;
-  int xLeftLimit = NUM2INT(rb_ary_entry(minCoord, 0));
-  int yTopLimit = NUM2INT(rb_ary_entry(minCoord, 1));
-  int xRightLimit = NUM2INT(rb_ary_entry(maxCoord, 0));
-  int yBottomLimit = NUM2INT(rb_ary_entry(maxCoord, 1));
-  // I didn't want to break backwards compatibility, so while this is less legible
-  // and slower if old version of compix is used, it will still work.
-  // The third and fourth entry in the array specifies from where to start checking the big image.
-  // Used for e.g. findAllSubImages in rubypng
-  int xstart = 0; //NUM2INT(rb_ary_entry(minCoord, 2));
-  int ystart = 0 ; //NUM2INT(rb_ary_entry(minCoord, 3));
-  int x, y;
-  int pixels = 0;
-  int compPix = siwidth * siheight;
-  VALUE retArr;
-  int matchPercent;
-  
-  // Create bytearrays for pixels
-  for(y = 0 ; y < siheight ; y++){
-	  for(x = 0 ; x < siwidth ; x++){
-	    bytearray_subimg[y*siwidth + x] = NUM2UINT(rb_ary_entry(pixelsf,y*siwidth + x));
-	  }
-  }
-  for(y = 0 ; y < ssheight ; y++){
-	  for(x = 0 ; x < sswidth ; x++){
-	    bytearray_screenshot[y*sswidth + x] = NUM2UINT(rb_ary_entry(pixelss,y*sswidth + x));
-	  }
-  }
-  
-  
-  for(y = ystart ; y < yBottomLimit-siheight; y++){
-    for(x = xstart ; x < xRightLimit-siwidth; x++){
-      match = compareAt(bytearray_subimg, bytearray_screenshot, thres, x, y,
-                        siwidth, siheight, sswidth, ssheight);
-      if(match > maxmatch){
-        maxmatch = match;
-        maxX = x;
-        maxY = y;
-      }      
-    }
-  }
-  free(bytearray_subimg);
-  free(bytearray_screenshot);
-  pixels = x * ( ssheight - siheight ) + y;
-  matchPercent = (100 * maxmatch) / compPix;
-  retArr = rb_ary_new();
-  rb_ary_push(retArr, INT2NUM(matchPercent));
-  rb_ary_push(retArr, INT2NUM(maxX));
-  rb_ary_push(retArr, INT2NUM(maxY));
-  rb_ary_push(retArr, INT2NUM(pixels));
-  return retArr;
-}
+#include <ruby.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include "compix.h"
+
+void Init_compix(){
+  VALUE CompixModule = rb_define_module("Compix");
+  rb_define_singleton_method(CompixModule, "find_subimage", find_subimage, 3);
+}
+
+bool compare_pixels(PIXEL pone, PIXEL ptwo, int threshold){
+  BYTE ored = R_BYTE(pone);
+  BYTE ogreen = G_BYTE(pone);
+  BYTE oblue = B_BYTE(pone);
+  BYTE tred = R_BYTE(ptwo);
+  BYTE tgreen = G_BYTE(ptwo);
+  BYTE tblue = B_BYTE(ptwo);
+  if(ored - tred > threshold || tred - ored > threshold ||
+      ogreen - tgreen > threshold || tgreen - ogreen > threshold ||
+      oblue - tblue > threshold || tblue - oblue > threshold){
+      return false;
+  }
+  return true;
+}
+
+int compare_at(PIXEL *pixelsSmall, PIXEL *pixelsBig, int thres, int bigXoffset, int bigYoffset,
+              int siwidth, int siheight, int sswidth, int ssheight){
+  PIXEL firstPixel;
+  PIXEL secPixel;
+  int match = 0;
+  int unmatch = 0;
+  int x, y;
+  int small_image_coord;
+  int bigCoord = 0;
+  for(y = 0; y < siheight; y++){
+    for(x = 0; x < siwidth; x++){
+      small_image_coord = y * siwidth + x;
+      firstPixel = pixelsSmall[small_image_coord];
+      bigCoord = sswidth*(y+bigYoffset)+(x+bigXoffset);
+      if(bigCoord >= (sswidth)*(ssheight) ){
+        break;
+      }
+      secPixel = pixelsBig[bigCoord];
+      if(compare_pixels(firstPixel, secPixel, thres)){
+        match++;
+      } 
+      else {
+        unmatch++;
+      }
+    }
+    if(unmatch > match){
+      break;
+    }
+  }
+  return match;
+}
+
+PIXEL* image_to_bytearray(PIXEL *bytearray_ptr, VALUE image){
+  VALUE pixels = rb_funcall(image, rb_intern("pixels"), 0);
+  int x, y;
+
+  int width = NUM2INT(rb_funcall(image, rb_intern("width"), 0));
+  int height = NUM2INT(rb_funcall(image, rb_intern("height"), 0));
+
+  for(y = 0 ; y < height ; y++){
+    for(x = 0 ; x < width ; x++){
+      bytearray_ptr[y * width + x] = NUM2UINT(rb_ary_entry(pixels, y * width + x));
+    }
+  }
+  return bytearray_ptr;
+}
+
+VALUE find_subimage(VALUE self, VALUE subimage, VALUE bigimage, VALUE threshold){
+  VALUE subimage_match_obj;
+  
+  int siwidth = NUM2INT(rb_funcall(subimage, rb_intern("width"), 0));
+  int siheight = NUM2INT(rb_funcall(subimage, rb_intern("height"), 0));
+  int sswidth = NUM2INT(rb_funcall(bigimage, rb_intern("width"), 0));
+  int ssheight = NUM2INT(rb_funcall(bigimage, rb_intern("height"), 0));
+  
+  PIXEL *bytearray_subimg = malloc(siwidth * siheight * sizeof(PIXEL));
+  PIXEL *bytearray_big_image = malloc(sswidth * ssheight * sizeof(PIXEL));
+  
+  int thres = NUM2UINT(threshold);
+  int match = 0;
+  int maxmatch = 0;
+  int maxX = -1;
+  int maxY = -1;
+  //int xLeftLimit = NUM2INT(rb_ary_entry(minCoord, 0));
+  //int yTopLimit = NUM2INT(rb_ary_entry(minCoord, 1));
+  //int xRightLimit = NUM2INT(rb_ary_entry(maxCoord, 0));
+  //int yBottomLimit = NUM2INT(rb_ary_entry(maxCoord, 1));
+  // I didn't want to break backwards compatibility, so while this is less legible
+  // and slower if old version of compix is used, it will still work.
+  // The third and fourth entry in the array specifies from where to start checking the big image.
+  // Used for e.g. findAllSubImages in rubypng
+  int xstart = 0; //NUM2INT(rb_ary_entry(minCoord, 2));
+  int ystart = 0 ; //NUM2INT(rb_ary_entry(minCoord, 3));
+  int x, y;
+  int compPix = siwidth * siheight;
+  
+  // Create bytearrays for pixels
+  bytearray_subimg = image_to_bytearray(bytearray_subimg, subimage);
+  bytearray_big_image = image_to_bytearray(bytearray_big_image, bigimage);
+  
+  for(y = ystart ; y <= ssheight - siheight; y++){
+    for(x = xstart ; x <= sswidth - siwidth; x++){
+      match = compare_at(bytearray_subimg, bytearray_big_image, thres, x, y,
+                        siwidth, siheight, sswidth, ssheight);
+      if(match > maxmatch){
+        maxmatch = match;
+        maxX = x;
+        maxY = y;
+      }      
+    }
+  }
+
+  free(bytearray_subimg);
+  free(bytearray_big_image);
+
+  subimage_match_obj = initialize_subimage_match_obj(maxX, maxY, compPix, maxmatch);
+  return subimage_match_obj;
+}
+
+VALUE initialize_subimage_match_obj(int coord_x, int coord_y, int pixels_compared, int pixels_matched){
+  VALUE mCompixModule = rb_const_get(rb_cObject, rb_intern("Compix"));
+  VALUE cSubimageMatch = rb_const_get(mCompixModule, rb_intern("SubimageMatch"));
+
+  VALUE match_obj = rb_funcall(cSubimageMatch, rb_intern("new"), 4, INT2NUM(coord_x), INT2NUM(coord_y),
+                                         INT2NUM(pixels_compared), INT2NUM(pixels_matched));
+  return match_obj;
+}

data/ext/compix/compix.h

@@ -0,0 +1,31 @@
+#ifndef COMPIX_H
+#define COMPIX_H
+
+#include <ruby.h>
+#include <stdbool.h>
+
+
+
+// Types and macros from OilyPNG for compatibility
+typedef uint32_t PIXEL; // Pixels use 32 bits unsigned integers
+typedef unsigned char BYTE; // Bytes use 8 bits unsigned integers
+#define R_BYTE(pixel)  ((BYTE) (((pixel) & (PIXEL) 0xff000000) >> 24))
+#define G_BYTE(pixel)  ((BYTE) (((pixel) & (PIXEL) 0x00ff0000) >> 16))
+#define B_BYTE(pixel)  ((BYTE) (((pixel) & (PIXEL) 0x0000ff00) >> 8))
+#define A_BYTE(pixel)  ((BYTE) (((pixel) & (PIXEL) 0x000000ff)))
+
+void Init_compix();
+
+VALUE find_subimage(VALUE self, VALUE subimage, VALUE bigimage, VALUE threshold);
+
+VALUE initialize_subimage_match_obj(int coord_x, int coord_y, int pixels_compared, int pixels_matched);
+
+int compare_at(PIXEL *pixelsSmall, PIXEL *pixelsBig, int thres, int bigXoffset, int bigYoffset,
+              int siwidth, int siheight, int sswidth, int ssheight);
+
+bool compare_pixels(PIXEL pone, PIXEL ptwo, int threshold);
+
+// The bytearray_ptr should be allocated for the correct size.
+PIXEL* image_to_bytearray(PIXEL *bytearray_ptr, VALUE image);
+
+#endif

data/lib/compix.rb

@@ -1,7 +1,6 @@
-require 'compix.so'
-
-#class Compix
-#  module CompareImagePixels
-#  
-#  end
-#end
+require 'compix.so'
+require 'compix/match.rb'
+
+module Compix
+
+end

data/lib/compix/match.rb

@@ -0,0 +1,27 @@
+require 'chunky_png'
+
+
+class Compix::SubimageMatch
+  attr_reader :coordinate_x, :coordinate_y, :pixels_compared, :pixels_matched
+
+  def initialize(coord_x, coord_y, pixels_compared, pixels_matched)
+    raise ArgumentError.new("Matched more pixels ('#{pixels_matched}') than compared ('#{pixels_compared}')") if pixels_compared < pixels_matched
+    @coordinate_x = coord_x
+    @coordinate_y = coord_y
+    @pixels_compared = pixels_compared
+    @pixels_matched = pixels_matched
+  end
+
+  def match_percentage
+    return 0 if pixels_compared == 0
+    pixels_matched.to_f / pixels_compared
+  end
+
+  def eql?(other)
+    other.class.eql?(self.class) && other.state.eql?(self.state)
+  end
+
+  def state
+    [@coordinate_x, @coordinate_y, @pixels_compared, @pixels_matched]
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: compix
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.1
 platform: ruby
 authors:
 - Jon Appelberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-24 00:00:00.000000000 Z
+date: 2014-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -24,6 +24,48 @@ dependencies:
     - - ">="
       - !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'
+- !ruby/object:Gem::Dependency
+  name: oily_png
+  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'
 description: 
 email: 
 executables: []
@@ -32,9 +74,11 @@ extensions:
 extra_rdoc_files: []
 files:
 - ext/compix/compix.c
+- ext/compix/compix.h
 - ext/compix/extconf.rb
 - lib/compix.rb
-homepage: 
+- lib/compix/match.rb
+homepage: https://github.com/jappelbe/compix_tmp
 licenses: []
 metadata: {}
 post_install_message: