similie 0.2.5 → 0.2.6

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.2.6

data/ext/similie.c

@@ -56,17 +56,14 @@ int popcount(uint64_t x) {
 
 uint64_t image_phash(IplImage *img) {
     int x, y;
-    double avg;
-    uint64_t phash = 0;
+    double avg = 0;
+    uint64_t phash = 0, phash_mask = 1;
 
-    IplImage *small = cvCreateImage(cvSize(64, 64), img->depth, img->nChannels);
-    IplImage *mono  = cvCreateImage(cvSize(64, 64), img->depth, 1);
+    IplImage *small = cvCreateImage(cvSize(DCT_SIZE, DCT_SIZE), img->depth, img->nChannels);
+    IplImage *mono  = cvCreateImage(cvSize(DCT_SIZE, DCT_SIZE), img->depth, 1);
 
     cvResize(img, small, CV_INTER_CUBIC);
-    if (img->nChannels == 1)
-        cvCopy(small, mono, 0);
-    else
-        cvCvtColor(small, mono, CV_RGB2GRAY);
+    img->nChannels == 1 ? cvCopy(small, mono, 0) : cvCvtColor(small, mono, CV_RGB2GRAY);
 
     CvMat *dct = cvCreateMat(DCT_SIZE, DCT_SIZE, CV_32FC1);
     for (x = 0; x < DCT_SIZE; x++) {
@@ -78,13 +75,18 @@ uint64_t image_phash(IplImage *img) {
     cvDCT(dct, dct, CV_DXT_ROWS);
     cvSet2D(dct, 0, 0, cvScalarAll(0));
 
-    avg = (double)cvAvg(dct, 0).val[0] * 64.0 / 63.0;
+    for (y = 0; y < 8; y++) {
+        for (x = 0; x < 8; x++) {
+            avg += cvGet2D(dct, x, y).val[0];
+        }
+    }
+
+    avg /= 63.0;
 
-    uint64_t mask = 1;
     for (x = 7; x >= 0; x--) {
         for (y = 7; y >= 0; y--) {
-            if (cvGet2D(dct, x, y).val[0] > avg) phash |= mask;
-            mask = mask << 1;
+            if (cvGet2D(dct, x, y).val[0] > avg) phash |= phash_mask;
+            phash_mask = phash_mask << 1;
         }
     }
 

data/test/test_basic.rb

@@ -12,12 +12,12 @@ describe 'Similie image load' do
   it 'should hash image' do
     img = Similie.new(File.join($testdir, 'lena1.png'))
     assert img
-    assert_equal 36205409308016768, img.hash
+    assert_equal 36170087496991428, img.hash
   end
 
   it 'should hash image using class method' do
     hash = Similie.phash(File.join($testdir, 'lena1.png'))
     assert hash
-    assert_equal 36205409308016768, hash
+    assert_equal 36170087496991428, hash
   end
 end

data/test/test_distance.rb

@@ -3,15 +3,16 @@ require_relative 'helper'
 describe 'Similie image distance' do
   it 'should work for similar images' do
     images = (1..5).map {|n| Similie.new(File.join($testdir, 'lena%d.png' % n ))}
+    images.unshift nil
 
-    assert_equal 2,  images[0].distance(images[1])
-    assert_equal 3,  images[1].distance(images[2])
-    assert_equal 2,  images[2].distance(images[3])
-    assert_equal 3,  images[0].distance(images[3])
-    assert_equal 18, images[3].distance(images[4])
+    assert_equal 2,  images[1].distance(images[2])
+    assert_equal 9,  images[2].distance(images[3])
+    assert_equal 8,  images[3].distance(images[4])
+    assert_equal 1,  images[1].distance(images[4])
+    assert_equal 12, images[1].distance(images[5])
   end
 
   it 'should work using the singleton method' do
-    assert_equal 18, Similie.distance(File.join($testdir, 'lena4.png'), File.join($testdir, 'lena5.png'))
+    assert_equal 12, Similie.distance(File.join($testdir, 'lena1.png'), File.join($testdir, 'lena5.png'))
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 5
-  version: 0.2.5
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - Bharanee Rathna
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-07 00:00:00 +10:00
+date: 2011-06-08 00:00:00 +10:00
 default_executable: 
 dependencies: []