grayphash 0.0.10 → 0.0.11.4

data/ext/grayphash/grayphash.cpp

@@ -11,7 +11,7 @@
 
     extern "C" VALUE t_about(VALUE self)
     {
-        return rb_str_new_cstr("pHash 0.9.4. Copyright 2008-2010 Aetilius, Inc. Included only some image functions (grayphash v-0.0.8).");
+        return rb_str_new_cstr("pHash 0.9.4. Copyright 2008-2010 Aetilius, Inc. Included only some image functions (grayphash v-0.0.11.4).");
     }
 
 
@@ -79,8 +79,8 @@
         ulong64 phash = 0;
         ph_dct_imagehash(file, phash);
 
-        if(phash==0)
-            rb_raise(rb_eFatal, "PHash cannot be 0 but it calcutaled as it. Probably you load PNG file with transparency or this file is not exists.");
+        //if(phash==0)
+        //    rb_raise(rb_eFatal, "PHash cannot be 0 but it calcutaled as it. Probably you load PNG file with transparency or this file is not exists.");
         
         rb_iv_set(self, "@phash", ULL2NUM(phash));
 
@@ -170,6 +170,46 @@
 	}
 
 
+    extern "C" VALUE t_main_hue(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.RGBtoHSV().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).RGBtoHSV().channel(0).get_convolve(meanfilter);
+        } else {
+        img = src.channel(0).get_convolve(meanfilter);
+        }
+		
+		//float total = img.width() * img.height();
+        const CImg<int> hist = img.histogram(256);
+        int max_pos = 0;
+        int max_hist = 0;
+        int space = 4;
+        for(int pos=0;pos<256;pos+=space) {
+			int accum = 0;
+			for(int i=0;i<space;i++) {
+				accum += hist[pos+i];
+			}
+			if(accum > max_hist){
+				max_hist = accum;
+				max_pos = pos;
+			}
+		}
+		
+		return INT2NUM(max_pos);
+	}
+
+
     VALUE Grayphash;
 
     extern "C" void Init_grayphash() 
@@ -181,5 +221,6 @@
         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);
+        rb_define_method(Grayphash, "main_hue", (ruby_method*) &t_main_hue, 1);
     }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grayphash
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-08 00:00:00.000000000 Z
+date: 2012-08-18 00:00:00.000000000 Z
 dependencies: []
 description: pHash image wrapper
 email: tauraloke@gmail.com
@@ -43,8 +43,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: grayphash
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: Simple wrapper for some pHash image functions
+summary: Simple wrapper for some pHash and CImg image functions
 test_files: []