grayphash 0.0.9 → 0.0.10

data/ext/grayphash/grayphash.cpp

@@ -106,6 +106,68 @@
         x = (x + (x >> 4)) & m4;
         return INT2NUM((x * h01)>>56);
     }
+    
+    extern "C" VALUE t_histogram(VALUE self, VALUE lfile, VALUE channel) {
+		Check_Type(lfile, T_STRING);
+        char* file = RSTRING_PTR(lfile);
+        
+        const unsigned int ch = NUM2UINT(channel);
+        CImg<uint8_t> src;
+        src.load(file);
+        
+        CImg<float> meanfilter(7,7,1,1,1);
+        CImg<float> img;
+        if (src.spectrum() == 3){
+            img = src.channel(ch).get_convolve(meanfilter);
+        } else if (src.spectrum() == 4){
+        int width = img.width();
+            int height = img.height();
+            int depth = img.depth();
+        img = src.crop(0,0,0,0,width-1,height-1,depth-1,2).channel(ch).get_convolve(meanfilter);
+        } else {
+        img = src.channel(0).get_convolve(meanfilter);
+        }
+		
+		float total = img.width() * img.height();
+		VALUE result_hist = rb_ary_new2(256);
+        const CImg<float> hist = img.histogram(256);
+        cimg_forX(hist,pos) { 
+			rb_ary_push(result_hist, rb_float_new(hist[pos] / total));
+		}
+		
+		return result_hist;
+	}
+
+
+    extern "C" VALUE t_histogram4lumin(VALUE self, VALUE lfile) {
+		Check_Type(lfile, T_STRING);
+        char* file = RSTRING_PTR(lfile);
+        
+        CImg<uint8_t> src;
+        src.load(file);
+        
+        CImg<float> meanfilter(7,7,1,1,1);
+        CImg<float> img;
+        if (src.spectrum() == 3){
+            img = src.RGBtoYCbCr().channel(0).get_convolve(meanfilter);
+        } else if (src.spectrum() == 4){
+        int width = img.width();
+            int height = img.height();
+            int depth = img.depth();
+        img = src.crop(0,0,0,0,width-1,height-1,depth-1,2).RGBtoYCbCr().channel(0).get_convolve(meanfilter);
+        } else {
+        img = src.channel(0).get_convolve(meanfilter);
+        }
+		
+		float total = img.width() * img.height();
+		VALUE result_hist = rb_ary_new2(256);
+        const CImg<float> hist = img.histogram(256);
+        cimg_forX(hist,pos) { 
+			rb_ary_push(result_hist, rb_float_new(hist[pos] / total));
+		}
+		
+		return result_hist;
+	}
 
 
     VALUE Grayphash;
@@ -116,5 +178,8 @@
         rb_define_method(Grayphash, "about", (ruby_method*) &t_about, 0);
         rb_define_method(Grayphash, "phash", (ruby_method*) &t_phash, 1);
         rb_define_method(Grayphash, "hamming", (ruby_method*) &t_hamming, 2);
+        rb_define_method(Grayphash, "histogram", (ruby_method*) &t_histogram, 2);
+        rb_define_method(Grayphash, "histogram", (ruby_method*) &t_histogram, 2);
+        rb_define_method(Grayphash, "histogram4lumin", (ruby_method*) &t_histogram4lumin, 1);
     }
 

data/ext/grayphash/histo.rb

@@ -0,0 +1,56 @@
+require './grayphash'
+require 'pp'
+
+include Grayphash
+
+$start  = 0
+$degree = 10
+
+def max_metric hist1, hist2
+  h1 = hist1.each_with_index.sort.reverse[$start,$degree]
+  h2 = hist2.each_with_index.sort.reverse[$start,$degree]
+  #pp h2
+  result = 0
+  [0, $degree-1].each do |i|
+  #[0, 255].each do |i|
+    #result += (hist1[i] - hist2[i]).abs.to_f # / (hist1[i] + hist2[i] + 1)
+    result += (h1[i][1] - h2[i][1]).abs.to_f / (h1[i][1] + h2[i][1] + 1)  # это даёт хороший результат. Если расстояние меньше 0,02, то скорее всего мы попали в нужную картинку.
+  end
+  return result
+end
+
+def progress_max_metric hist1, hist2
+  h1 = hist1.each_with_index.sort.reverse[$start,$degree]
+  h2 = hist2.each_with_index.sort.reverse[$start,$degree]
+  #pp h2
+  result = 0
+  k = 1.0
+  [0, $degree-1].each do |i|
+    result += k.to_f * (h1[i][1] - h2[i][1]).abs.to_f / (h1[i][1] + h2[i][1] + 1)
+    k /= 2
+  end
+  return result
+end
+
+
+
+histos = {  }
+path = '../../../pics/rotate/'
+Dir.foreach(path) do |entry|
+  next unless File.file? path+entry
+  #puts entry
+  histos[entry] = histogram4lumin path+entry
+end
+
+
+pic = ARGV[0]
+h = histogram4lumin path+pic
+
+dists = {}
+histos.each do |k,v|
+  dists[k] = progress_max_metric h, v
+end
+
+dists = dists.to_a.sort_by {|a,b| b}
+
+pp dists

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grayphash
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-30 00:00:00.000000000 Z
+date: 2012-08-08 00:00:00.000000000 Z
 dependencies: []
 description: pHash image wrapper
 email: tauraloke@gmail.com
@@ -20,6 +20,7 @@ extra_rdoc_files: []
 files:
 - lib/grayphash.rb
 - ext/grayphash/grayphash.cpp
+- ext/grayphash/histo.rb
 - ext/grayphash/extconf.rb
 homepage: http://github.com/tauraloke/grayphash
 licenses: