dhash-vips 0.0.0.2 → 0.0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91c7be59e88216898e8a6dfa9cb3eeccf88cd9d6
-  data.tar.gz: 76e55f4d301b274ee37a95c236ebe7d884164490
+  metadata.gz: 07665dfb99e7720dd2406286235a1a6623576830
+  data.tar.gz: 6ecf29f185c958959d556b3ceb12b1da15db69e4
 SHA512:
-  metadata.gz: 9d6d563744fe3b72502b5827ef072af1b816866e30374b1ff18e312157cc646776c352560e4c3c7ec52b436d5833f3731455d5429b9d0051d0491943b718f860
-  data.tar.gz: 92054de250d05c1a93ffb178c85ccc8ac2132e110869789d2097fe8c8f03c1f4f0c280a1b3b941fa72e10f333d7adac389d10b96deb967387cd0501e01d69fff
+  metadata.gz: b48e8ad679501b2ea2b6c7d7e579f9ff7a1c1bd04c7a2f2d12e6b2f249d0ce96cabe959767b28146a96c9cb1cb3e71f187199a9250485dd1ec645495860a0206
+  data.tar.gz: 6e3b6b9cca29187047f34a12543862494cfb557a009efa83fd8fac0592a76c446e425d03163a2ab1e9eb6f9a00bd500961181964b541b77f197b3d1c20c59eb2

data/Rakefile

@@ -1,8 +1,47 @@
+STDOUT.sync = true
+
 require "bundler/gem_tasks"
 
 task :default => %w{ spec }
 
 require "rspec/core/rake_task"
-RSpec::Core::RakeTask.new(:spec) do |t|
+RSpec::Core::RakeTask.new :spec do |t|
   t.verbose = false
 end
+
+visualize_hash = lambda do |hash|
+  puts hash.to_s(2).rjust(64, ?0).gsub(/(?<=.)/, '\0 ').scan(/.{16}/)
+end
+
+task :compare_pixelation do |_, args|
+  require_relative "lib/dhash-vips"
+  require "dhash"
+
+  ARGV.drop(1).each do |arg|
+    FileUtils.mkdir_p "compare_pixelation/#{File.dirname arg}"
+
+    puts filename = "compare_pixelation/#{arg}.dhash-vips.png"
+    DHashVips::DHash.pixelate(arg, 8).
+      colourspace(:srgb).       # otherwise we may get `Vips::Error` `RGB color space not permitted on grayscale PNG` when the image was already bw
+      write_to_file filename
+    visualize_hash.call DHashVips::DHash.calculate arg
+
+    puts filename = "compare_pixelation/#{arg}.dhash.png"
+    Magick::Image.read(arg).first.quantize(256, Magick::Rec601LumaColorspace, Magick::NoDitherMethod, 8).resize!(9, 8).
+      write filename
+    visualize_hash.call Dhash.calculate arg
+  end
+end
+
+task :compare_kernels do |_, args|
+  require_relative "lib/dhash-vips"
+  require "dhash"
+
+  %i{ nearest linear cubic lanczos2 lanczos3 }.each do |kernel|
+    hashes = ARGV.drop(1).map do |arg|
+      puts arg
+      DHashVips::DHash.calculate(arg, 8, kernel).tap &visualize_hash
+    end
+    puts "kernel: #{kernel}, distance: #{DHashVips::DHash.hamming *hashes}"
+  end
+end

data/{dhash.gemspec → dhash-vips.gemspec}

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "dhash-vips"
-  spec.version       = (require_relative "lib/dhash-vips/version"; DhashVips::VERSION)
+  spec.version       = (require_relative "lib/dhash-vips/version"; DHashVips::VERSION)
   spec.author        = "Victor Maslov"
   spec.email         = "nakilon@gmail.com"
   spec.summary       = "dHash powered by Vips"

data/lib/dhash-vips.rb

@@ -1,29 +1,73 @@
 require_relative "dhash-vips/version"
 require "vips"
 
-module DhashVips
-  extend self
+module DHashVips
+  module DHash
+
+    extend self
+
+    def hamming a, b
+      (a ^ b).to_s(2).count "1"
+    end
+
+    def pixelate file, hash_size, kernel = nil
+      image = Vips::Image.new_from_file file
+      if kernel
+        image.resize((hash_size + 1).fdiv(image.width), vscale: hash_size.fdiv(image.height), kernel: kernel).colourspace("b-w")
+      else
+        image.resize((hash_size + 1).fdiv(image.width), vscale: hash_size.fdiv(image.height)                ).colourspace("b-w")
+      end
+    end
+
+    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)
+    end
 
-  def hamming a, b
-    (a ^ b).to_s(2).count "1"
   end
 
-  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"
+  module IDHash
+    extend self
 
-    difference = 0
+    def hamming a, b
+      ad = a >> 64
+      ai = a - (ad << 64)
+      bd = b >> 64
+      bi = b - (bd << 64)
+      ((ai | bi) & (ad ^ bd)).to_s(2).count "1"
+    end
 
-    hash_size.times do |row|
-      hash_size.times do |col|
-        pixel_left  = image.getpoint(col, row).first
-        pixel_right = image.getpoint(col + 1, row).first
-        difference <<= 1
-        difference += 1 if pixel_left > pixel_right
-      end
+    def median array
+      h = array.size / 2
+      return array[h] if array[h] != array[h - 1]
+      right = array.dup
+      left = right.shift h
+      right.shift if right.size > left.size
+      return right.first if left.last != right.first
+      return right.uniq[1] if left.count(left.last) > right.count(right.first)
+      left.last
+    end
+    fail unless 2 == median([1, 2, 2, 2, 2, 2, 3])
+    fail unless 3 == median([1, 2, 2, 2, 2, 3, 3])
+    fail unless 3 == median([1, 1, 2, 2, 3, 3, 3])
+    fail unless 2 == median([1, 1, 1, 2, 3, 3, 3])
+    fail unless 2 == median([1, 1, 2, 2, 2, 2, 3])
+    fail unless 2 == median([1, 2, 2, 2, 2, 3])
+    fail unless 3 == median([1, 2, 2, 3, 3, 3])
+    fail unless 1 == median([1, 1, 1])
+    fail unless 1 == median([1, 1])
+
+    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")
+
+      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
     end
 
-    difference
   end
 
 end

data/lib/dhash-vips/version.rb

@@ -1,3 +1,3 @@
-module DhashVips
-  VERSION = "0.0.0.2"
+module DHashVips
+  VERSION = "0.0.1.0"
 end

data/spec/_spec.rb

@@ -1,8 +1,25 @@
 require "dhash-vips"
 
-describe DhashVips do
+[
+  [DHashVips::DHash, 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, 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, max_similar, min_not_similar|
+
+describe lib do
 
-  require "tmpdir"
+  # require "tmpdir"
   require "fileutils"
   require "open-uri"
   require "digest"
@@ -17,10 +34,14 @@ describe DhashVips do
       df0a3b93e9412536ee8a11255f974141.jpg
       679634ff89a31279a39f03e278bc9a01.jpg
     }   # these images a consecutive pairs of slightly (but enough for nice asserts) silimar images
+    bw1, bw2 = %w{
+      71662d4d4029a3b41d47d5baf681ab9a.jpg
+      ad8a37f872956666c3077a3e9e737984.jpg
+    }   # these is the same photo but of different size and bw
 
     example.metadata[:extra_failure_lines] = []
-    FileUtils.mkdir_p dir = Dir.tmpdir + "/dhash-vips-spec"
-    images.each do |image|
+    FileUtils.mkdir_p dir = "images"
+    *images, bw1, bw2 = [*images, bw1, bw2].map do |image|
       "#{dir}/#{image}".tap do |filename|
         unless File.exist?(filename) && Digest::MD5.file(filename) == File.basename(filename, ".jpg")
           example.metadata[:extra_failure_lines] << "copying image from web to #{filename}"
@@ -33,28 +54,32 @@ describe DhashVips do
       end
     end
 
-    hashes = images.map &DhashVips.method(:calculate)
-    table = MLL::table[DhashVips.method(:hamming), [hashes], [hashes]]
+    hashes = images.map &described_class.method(:calculate)
+    table = MLL::table[described_class.method(:hamming), [hashes], [hashes]]
+
     # require "pp"
     # pp table
-    # [[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]]
+    # abort
 
-    hashes.size.times.to_a.combination(2) do |i, j|
-      case
-      when i == j
-        expect(table[i][j]).to eq 0
-      when (j - i).abs == 1 && (i + j - 1) % 4 == 0
-        expect(table[i][j]).to be > 0
-        expect(table[i][j]).to be < 19
-      else
-        expect(table[i][j]).to be > 21
+    aggregate_failures do
+      hashes.size.times.to_a.repeated_combination(2) do |i, j|
+        case
+        when i == j
+          expect(table[i][j]).to eq 0
+        when (j - i).abs == 1 && (i + j - 1) % 4 == 0
+          expect(table[i][j]).to be > 0
+          expect(table[i][j]).to be <= max_similar
+        else
+          expect(table[i][j]).to be >= min_not_similar
+        end
       end
+
+      hashes = [bw1, bw2].map &described_class.method(:calculate)
+      expect(described_class.hamming(*hashes)).to eq 0
     end
+
   end
 
 end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dhash-vips
 version: !ruby/object:Gem::Version
-  version: 0.0.0.2
+  version: 0.0.1.0
 platform: ruby
 authors:
 - Victor Maslov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-21 00:00:00.000000000 Z
+date: 2017-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vips
@@ -91,13 +91,10 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- dhash.gemspec
+- dhash-vips.gemspec
 - lib/dhash-vips.rb
 - lib/dhash-vips/version.rb
 - spec/_spec.rb
-- spec/images/face-high.jpg
-- spec/images/face-low.jpg
-- spec/images/face-with-nose.jpg
 homepage: https://github.com/nakilon/dhash-vips
 licenses:
 - MIT