similie 0.3.1 → 0.3.2

data/ext/extconf.rb

@@ -10,17 +10,25 @@ def lib_paths lib, defaults
   path.size > 0 ? path : defaults.map {|name| "-L#{name}"}.join(' ')
 end
 
-def lib_names lib, defaults
+def lib_flags lib, defaults
   path = %x{pkg-config #{lib}  --libs-only-l 2>/dev/null}.strip
-  path.size > 0 ? path : defaults.map {|name| "-l#{name}"}.join(' ')
+  path.size > 0 ? path.split(/\s+/).select {|name| %r{core|highgui}.match(name)}.join(' ')
+                : defaults.map {|name| "-l#{name}"}.join(' ')
 end
 
-$CFLAGS  = inc_paths('opencv', %w(/usr/include/opencv)) + ' -Wall'
-$LDFLAGS = lib_names('opencv', %w(highgui cxcore))
+def lib_name re
+  $LDFLAGS.scan(re).flatten.first
+end
+
+$CFLAGS  = inc_paths 'opencv', %w(/usr/include/opencv)
+$LDFLAGS = lib_flags 'opencv', %w(highgui cxcore)
 
-headers = [ 'stdio.h', 'stdlib.h', 'string.h', 'opencv/cxcore.h', 'opencv/highgui.h' ]
-lib_1   = [ 'cxcore',  'cvInitFont',    headers ]
-lib_2   = [ 'highgui', 'cvEncodeImage', headers ]
+cxcore   = lib_name(%r{-l(\w*core)})    or raise 'unable to find opencv cxcore'
+highgui  = lib_name(%r{-l(\w*highgui)}) or raise 'unable to find opencv highgui'
+
+headers  = %w(stdio.h stdlib.h string.h opencv/cxcore.h opencv/highgui.h)
+lib_1    = [cxcore,  'cvInitFont',    headers]
+lib_2    = [highgui, 'cvEncodeImage', headers]
 
 if have_header('opencv/cxcore.h') && have_library(*lib_1) && have_library(*lib_2)
   create_makefile 'similie'
@@ -31,6 +39,9 @@ else
     On debian based systems you can install it from apt as,
       sudo apt-get install libcv-dev libhighgui-dev
 
+    On macos try,
+      brew install opencv
+
     Refer to http://opencv.willowgarage.com/wiki/InstallGuide for other platforms or operating systems.
   }
 

data/ext/similie.c

@@ -25,15 +25,21 @@
 #define CSTRING(v) RSTRING_PTR(TO_S(v))
 
 #undef SIZET2NUM
+#undef NUM2SIZET
+
 #ifdef HAVE_LONG_LONG
   #define SIZET2NUM(x) ULL2NUM(x)
+  #define NUM2SIZET(x) NUM2ULL(x)
 #else
   #define SIZET2NUM(x) ULONG2NUM(x)
+  #define NUM2SIZET(x) NUM2ULONG(x)
 #endif
 
+
+
 #define DCT_SIZE 32
 
-#if __GNUC__ >= 4 && __GNUC_MINOR__ >= 4
+#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
 #define popcount __builtin_popcountll
 #else
 // http://en.wikipedia.org/wiki/Hamming_weight
@@ -132,7 +138,7 @@ VALUE rb_image_initialize(VALUE self, VALUE file) {
 VALUE rb_image_distance(VALUE self, VALUE other) {
     VALUE hash1 = rb_image_fingerprint(self);
     VALUE hash2 = rb_image_fingerprint(other);
-    int dist    = popcount(NUM2ULONG(hash1) ^ NUM2ULONG(hash2));
+    int dist    = popcount(NUM2SIZET(hash1) ^ NUM2SIZET(hash2));
     return INT2NUM(dist);
 }
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Bharanee Rathna