dhash-vips 0.0.2.0 → 0.0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf9095db2c280a43b60bd9368892760b04c76d34
-  data.tar.gz: 247f6ea261c5d9fdf65c462127546259f8e36453
+  metadata.gz: e1493f450019e00cceb6c31ce3d36addc04dc4e3
+  data.tar.gz: 5a0ae28a8c5d48ce59e46b0306e8b3d786ae64c2
 SHA512:
-  metadata.gz: 0e9935a7db96888ca51750fa02ffea220fe20a9e5eb499fdc88b9b421d68d8f2699345702b2281de4d400c691feafeb69014b7c21a7fd37ac0ae853716231d1a
-  data.tar.gz: c2df29036d4b80174df137c976fb6396704bbde4cc05299d6751b519a928e11f6061eff6fc7b4c225e48d8a38c26b1a6cfefd763f0a3a4c1df738051997af84f
+  metadata.gz: 54e3a2b45b2040ffd30a0618850c173996c27e0d26fbe1495633b96ebb70586c426a3e0a9bc1e8f1403bd8c06d620eb9cb234cf84b5922a968eb2c69b0fec3a8
+  data.tar.gz: 9a26b10786c5db24093b1b9934d2a48bbc77bc7e31c780e70898f8be6816803b4a9ab817139abc243c8c7782e0a8973474e27f35fe64c4283742af8db34bcd6b

data/lib/dhash-vips.rb

@@ -1,5 +1,6 @@
 require_relative "dhash-vips/version"
 require "vips"
+require "mll"
 
 module DHashVips
   module DHash
@@ -22,7 +23,7 @@ module DHashVips
     def calculate file, hash_size = 8, kernel = nil
       image = pixelate file, hash_size, kernel
 
-      image.cast("int").conv([1, -1]).crop(1, 0, 8, 8).>(0)./(255).cast("uchar").to_a.join.to_i(2)
+      image.cast("int").conv([1, -1]).crop(1, 0, hash_size, hash_size).>(0)./(255).cast("uchar").to_a.join.to_i(2)
     end
 
   end
@@ -31,10 +32,10 @@ module DHashVips
     extend self
 
     def hamming a, b
-      ad = a >> 64
-      ai = a - (ad << 64)
-      bd = b >> 64
-      bi = b - (bd << 64)
+      ad = a >> 128
+      ai = a - (ad << 128)
+      bd = b >> 128
+      bi = b - (bd << 128)
       ((ai | bi) & (ad ^ bd)).to_s(2).count "1"
     end
 
@@ -60,12 +61,18 @@ module DHashVips
 
     def calculate file, hash_size = 8
       image = Vips::Image.new_from_file file
-      image = image.resize((hash_size + 1).fdiv(image.width), vscale: hash_size.fdiv(image.height)).colourspace("b-w")
+      image = image.resize(hash_size.fdiv(image.width), vscale: hash_size.fdiv(image.height)).colourspace("b-w")
 
-      conv = image.cast("int").conv([1, -1]).crop(1, 0, 8, 8)
-      d = conv.>(0)./(255).cast("uchar").to_a.join.to_i(2)
-      i = conv.abs.>=(median conv.abs.to_a.flatten.sort)./(255).cast("uchar").to_a.join.to_i(2)
-      (d << 64) + i
+      array = image.to_a.map &:flatten
+      d1, i1, d2, i2 = [array, array.transpose].flat_map do |a|
+        d = MLL::subtract[a, a.rotate(1)].to_a.map &:to_a
+        m = median d.flatten.map(&:abs).sort
+        [
+          d.flatten.map{ |c| c     <  0 ? 1 : 0 }.join.to_i(2),
+          d.flatten.map{ |c| c.abs >= m ? 1 : 0 }.join.to_i(2),
+        ]
+      end
+      (((((d1 << 64) + d2) << 64) + i1) << 64) + i2
     end
 
   end

data/lib/dhash-vips/version.rb

@@ -1,3 +1,3 @@
 module DHashVips
-  VERSION = "0.0.2.0"
+  VERSION = "0.0.3.0"
 end

data/spec/_spec.rb

@@ -1,21 +1,28 @@
 require "dhash-vips"
 
+require "pp"
+
 [
-  [DHashVips::DHash, 17, 18, 22],
-    # [[0, 17, 29, 27, 22, 29],
-    #  [17, 0, 30, 26, 33, 36],
-    #  [29, 30, 0, 18, 39, 30],
-    #  [27, 26, 18, 0, 35, 30],
-    #  [22, 33, 39, 35, 0, 17],
-    #  [29, 36, 30, 30, 17, 0]]
-  [DHashVips::IDHash, 5, 10, 15],
-    # [[0,  5, 21, 23, 18, 23],
-    #  [5,  0, 15, 16, 17, 28],
-    #  [21, 15, 0, 10, 31, 25],
-    #  [23, 16, 10, 0, 26, 28],
-    #  [18, 17, 31, 26, 0,  8],
-    #  [23, 28, 25, 28, 8,  0]]
-].each do |lib, min_similar, max_similar, min_not_similar|
+  [DHashVips::DHash, 17, 18, 22, 39],
+    # [[0, 17, 29, 27, 22, 29, 30, 29],
+    #  [17, 0, 30, 26, 33, 36, 37, 36],
+    #  [29, 30, 0, 18, 39, 30, 39, 36],
+    #  [27, 26, 18, 0, 35, 30, 35, 34],
+    #  [22, 33, 39, 35, 0, 17, 28, 23],
+    #  [29, 36, 30, 30, 17, 0, 33, 30],
+    #  [30, 37, 39, 35, 28, 33, 0, 5],
+    #  [29, 36, 36, 34, 23, 30, 5, 0]]
+  [DHashVips::IDHash, 15, 23, 28, 64],
+    # [[0, 16, 30, 32, 46, 58, 43, 43],
+    #  [16, 0, 28, 28, 47, 59, 46, 47],
+    #  [30, 28, 0, 15, 53, 49, 53, 52],
+    #  [32, 28, 15, 0, 56, 53, 61, 64],
+    #  [46, 47, 53, 56, 0, 23, 43, 45],
+    #  [58, 59, 49, 53, 23, 0, 44, 44],
+    #  [43, 46, 53, 61, 43, 44, 0, 0],
+    #  [43, 47, 52, 64, 45, 44, 0, 0]]
+  # [DHashVips::IDHash, 14, 14, 21],
+].each do |lib, min_similar, max_similar, min_not_similar, max_not_similar|
 
 describe lib do
 
@@ -69,7 +76,7 @@ describe lib do
         when (j - i).abs == 1 && (i + j - 1) % 4 == 0
           if [i, j] == [hashes.size - 2, hashes.size - 1]
             if described_class == DHashVips::DHash
-              expect(table[i][j]).to be > 0
+              expect(table[i][j]).to be == 5
             else
               expect(table[i][j]).to eq 0
             end
@@ -77,7 +84,7 @@ describe lib do
             expect(table[i][j]).to be_between(min_similar, max_similar).inclusive
           end
         else
-          expect(table[i][j]).to be >= min_not_similar
+          expect(table[i][j]).to be_between(min_not_similar, max_not_similar).inclusive
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dhash-vips
 version: !ruby/object:Gem::Version
-  version: 0.0.2.0
+  version: 0.0.3.0
 platform: ruby
 authors:
 - Victor Maslov