colourdistance 0.9.11 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93f98c9462411cf0f285710f220832a91a7fe543
-  data.tar.gz: 09995502796c051e61f29d328bedfade685d1cb5
+  metadata.gz: a975c48f2d6a1dce74d9f8a0eeeb8643c1a26f31
+  data.tar.gz: fdd1f5d5c9aca769fd809b47d9c28f39f978ab13
 SHA512:
-  metadata.gz: 83a632c000502980fb249747d8f0b035f929936f9190a0c36502d8852b9b7649cebb85e1af2785a8a4df7d31dccee6bfca5d2217cdadb07987fbd0667cf6ef33
-  data.tar.gz: 89ed50be64c3cee7eac78b9b87948ef363e67e665e2d7f282782ab4b98223987ddea8ef22b70afa4e1b5bac8d0d4d43c245d7b0b2ad5816a496b76e009e9aa90
+  metadata.gz: 3595ff36180543a429f72a9386e07ff13c67a0201e751d7eb25911f18282019fa0259bdc30b6988971b3014172313428c36975dc3394eb84339a75176514e80a
+  data.tar.gz: cc04bc88a28ba4dfb792039059ea89ab4092cd2c0a79ccc2c4ed3474b5a17cfc9e9007819dc9a8be4f44595ab52a62b4ff3994e72c4886aa80457c7dd9fd0910

data/colourdistance.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["theseventhorange@gmail.com"]
 
   spec.summary       = "Measures the difference (as a distance between colors in lab space) between colours. Takes rgb input. Will add support for xyz and lab around version 1.0."
-  spec.description   = "Currently only contains two options, ciede94 and ciede2000, both weighted to (roughly) a [0,1] scale (actually possible to get very slightly above 1). Will add more. Both are my own implementations, and ciede94 is probably wrong because of it. Thanks go out to Josh Clayton (https://robots.thoughtbot.com/get-your-c-on), for helping me to understand the structure I was attempting to acheive."
+  spec.description   = "Currently only contains three options (ciede 76, ciede94, and ciede2000), all weighted to (roughly) a [0,1] scale (actually possible to get slightly above 1). Will add more. All are my own implementations (although ciede2000 is based on a several dozen implementations found during research), and they may be wrong because of it. Thanks go out to Josh Clayton (https://robots.thoughtbot.com/get-your-c-on), for helping me to understand the structure I was attempting to acheive."
   spec.license       = "MIT"
 
   # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or

data/ext/colourdistance/colourdistance.c

@@ -7,91 +7,98 @@
  
 void Init_colourdistance() {
   VALUE rb_mColourdistance = rb_define_module("Colourdistance");
+  rb_define_singleton_method(rb_mColourdistance, "cie76", ciede2000, 2);
+  rb_define_singleton_method(rb_mColourdistance, "cie94", ciede2000, 2);
   rb_define_singleton_method(rb_mColourdistance, "ciede2000", ciede2000, 2);
 }
 
-static VALUE ciede2000(const VALUE self, VALUE color1, VALUE color2) {
+static VALUE cie76(const VALUE self, VALUE color1, VALUE color2) {
   double pi = 3.1415927;
   double e = 2.7182818;
   double conversion = pi/180.0;
-  double l1;
-  double l2;
-  double a1;
-  double a2;
+  static double lab1[3];
+  static double lab2[3];
 
-  double r1 = NUM2DBL(rb_hash_aref(color1, rb_str_intern(rb_str_new2("r"))))/255.0;
-  double g1 = NUM2DBL(rb_hash_aref(color1, rb_str_intern(rb_str_new2("g"))))/255.0;
-  double b1 = NUM2DBL(rb_hash_aref(color1, rb_str_intern(rb_str_new2("b"))))/255.0;
+  rgb_to_lab(color1, lab1);
 
-  double r2 = NUM2DBL(rb_hash_aref(color2, rb_str_intern(rb_str_new2("r"))))/255.0;
-  double g2 = NUM2DBL(rb_hash_aref(color2, rb_str_intern(rb_str_new2("g"))))/255.0;
-  double b2 = NUM2DBL(rb_hash_aref(color2, rb_str_intern(rb_str_new2("b"))))/255.0;
+  double l1 = lab1[0];
+  double a1 = lab1[1];
+  double b1 = lab1[2];
 
-  r1 = ((r1 <= 0.04045) ? r1 / 12.92 : pow(((r1 + 0.055) / 1.055),2.4));
-  g1 = ((g1 <= 0.04045) ? g1 / 12.92 : pow(((g1 + 0.055) / 1.055),2.4));
-  b1 = ((b1 <= 0.04045) ? b1 / 12.92 : pow(((b1 + 0.055) / 1.055),2.4));
+  rgb_to_lab(color2, lab2);
+  double l2 = lab2[0];
+  double a2 = lab2[1];
+  double b2 = lab2[2];
 
-  r2 = ((r2 <= 0.04045) ? r2 / 12.92 : pow(((r2 + 0.055) / 1.055),2.4));
-  g2 = ((g2 <= 0.04045) ? g2 / 12.92 : pow(((g2 + 0.055) / 1.055),2.4));
-  b2 = ((b2 <= 0.04045) ? b2 / 12.92 : pow(((b2 + 0.055) / 1.055),2.4));
+  double ldiff = l2 - l1;
+  double adiff = a2 - a1;
+  double bdiff = b2 - b1;
 
-  double x1 = 0.412453 * r1 + 0.357580 * g1 + 0.180423 * b1;
-  double y1 = 0.212671 * r1 + 0.715160 * g1 + 0.072169 * b1;
-  double z1 = 0.019334 * r1 + 0.119193 * g1 + 0.950227 * b1;
+  double val = sqrt(ldiff*ldiff+adiff*adiff+bdiff*bdiff)/100.0;
 
-  double x2 = 0.412453 * r2 + 0.357580 * g2 + 0.180423 * b2;
-  double y2 = 0.212671 * r2 + 0.715160 * g2 + 0.072169 * b2;
-  double z2 = 0.019334 * r2 + 0.119193 * g2 + 0.950227 * b2;
+  return DBL2NUM(val);
+}
 
-  double fx;
-  double fy;
-  double fz;
+static VALUE cie94(const VALUE self, VALUE color1, VALUE color2) {
+  double pi = 3.1415927;
+  double e = 2.7182818;
+  double conversion = pi/180.0;
+  double kl = 2.0;
+  double k1 = 0.048;
+  double k2 = 0.014;
 
-  if(x1 <= 0.008856){
-    fx = 7.787 * x1/0.95047 + 16.0/116.0;
-  }else{
-    fx = cbrt(x1/0.95047);
-  }
+  static double lab1[3];
+  static double lab2[3];
 
-  if(y1 <= 0.008856){
-    l1 = 903.3 * y1;
-    fy = (7.787 * y1 + 16.0/116.0);
-  }else{
-    l1 = 116.0 * cbrt(y1) - 16.0;
-    fy = cbrt(y1);
-  }
+  rgb_to_lab(color1, lab1);
 
-  if(z1 <= 0.008856){
-    fz = 7.787 * z1/1.08883 + 16.0/116.0;
-  }else{
-    fz = cbrt(z1/1.08883);
-  }
+  double l1 = lab1[0];
+  double a1 = lab1[1];
+  double b1 = lab1[2];
 
-  a1 = 500.0 * (fx-fy);
-  b1 = 200.0 * (fy-fz);
+  rgb_to_lab(color2, lab2);
+  double l2 = lab2[0];
+  double a2 = lab2[1];
+  double b2 = lab2[2];
 
-  if(x2 <= 0.008856){
-    fx = (7.787 * x2/0.95047 + 16.0/116.0);
-  }else{
-    fx = cbrt(x2/0.95047);
-  }
+  double ldiff = l1 - l2;
+  double adiff = a1 - a2;
+  double bdiff = b1 - b2;
 
-  if(y2 <= 0.008856){
-    l2 = 903.3 * y2;
-    fy = (7.787 * y2 + 16.0/116.0);
-  }else{
-    l2 = 116.0 * cbrt(y2) - 16.0;
-    fy = cbrt(y2);
-  }
+  double c1 = sqrt(a1*a1+b1*b1);
+  double c2 = sqrt(a2*a2+b2*b2);
+  double deltac = c1 - c2;
 
-  if(z2 <= 0.008856){
-    fz = (7.787 * z2/1.08883 + 16.0/116.0);
-  }else{
-    fz = cbrt(z2/1.08883);
-  }
+  double deltah = sqrt(adiff*adiff+bdiff*bdiff-deltac*deltac);
 
-  a2 = 500.0 * (fx-fy);
-  b2 = 200.0 * (fy-fz);
+  double sc = 1 + k1*c1;
+  double sh = 1 + k2*c1;
+
+  double e1 = ldiff/kl;
+  double e2 = deltac / (k1*sc);
+  double e3 = deltah / (k2*sh);
+  double val = sqrt(e1*e1+e2*e2+e3*e3)/100.0;
+
+  return DBL2NUM(val);
+}
+
+static VALUE ciede2000(const VALUE self, VALUE color1, VALUE color2) {
+  double pi = 3.1415927;
+  double e = 2.7182818;
+  double conversion = pi/180.0;
+  static double lab1[3];
+  static double lab2[3];
+
+  rgb_to_lab(color1, lab1);
+
+  double l1 = lab1[0];
+  double a1 = lab1[1];
+  double b1 = lab1[2];
+
+  rgb_to_lab(color2, lab2);
+  double l2 = lab2[0];
+  double a2 = lab2[1];
+  double b2 = lab2[2];
 
   double c1 = sqrt(a1*a1+b1*b1);
   double c2 = sqrt(a2*a2+b2*b2);
@@ -165,4 +172,47 @@ static VALUE ciede2000(const VALUE self, VALUE color1, VALUE color2) {
   double val = sqrt(ldiff*ldiff+adiff*adiff+bdiff*bdiff+rdiff)/100.0;
 
   return DBL2NUM(val);
+}
+
+
+void rgb_to_lab(VALUE color, double *lab) {
+
+  double r = NUM2DBL(rb_hash_aref(color, rb_str_intern(rb_str_new2("r"))))/255.0;
+  double g = NUM2DBL(rb_hash_aref(color, rb_str_intern(rb_str_new2("g"))))/255.0;
+  double b = NUM2DBL(rb_hash_aref(color, rb_str_intern(rb_str_new2("b"))))/255.0;
+
+  r = ((r <= 0.04045) ? r / 12.92 : pow(((r + 0.055) / 1.055),2.4));
+  g = ((g <= 0.04045) ? g / 12.92 : pow(((g + 0.055) / 1.055),2.4));
+  b = ((b <= 0.04045) ? b / 12.92 : pow(((b + 0.055) / 1.055),2.4));
+
+  double x = 0.412453 * r + 0.357580 * g + 0.180423 * b;
+  double y = 0.212671 * r + 0.715160 * g + 0.072169 * b;
+  double z = 0.019334 * r + 0.119193 * g + 0.950227 * b;
+
+  double fx;
+  double fy;
+  double fz;
+
+  if(x <= 0.008856){
+    fx = 7.787 * x/0.95047 + 16.0/116.0;
+  }else{
+    fx = cbrt(x/0.95047);
+  }
+
+  if(y <= 0.008856){
+    lab[0] = 903.3 * y;
+    fy = (7.787 * y + 16.0/116.0);
+  }else{
+    lab[0] = 116.0 * cbrt(y) - 16.0;
+    fy = cbrt(y);
+  }
+
+  if(z <= 0.008856){
+    fz = 7.787 * z/1.08883 + 16.0/116.0;
+  }else{
+    fz = cbrt(z/1.08883);
+  }
+
+  lab[1] = 500.0 * (fx-fy);
+  lab[2] = 200.0 * (fy-fz);
 }

data/ext/colourdistance/colourdistance.h

@@ -1,6 +1,9 @@
 #ifndef __colourdistance_h__
 #define __colourdistance_h__
 
+static VALUE ciee76(VALUE,VALUE,VALUE);
+static VALUE cie94(VALUE,VALUE,VALUE);
 static VALUE ciede2000(VALUE,VALUE,VALUE);
+void rgb_to_lab(VALUE, double *);
 
 #endif

data/lib/colourdistance/version.rb

@@ -1,3 +1,3 @@
 module Colourdistance
-  VERSION = "0.9.11"
+  VERSION = "1.0.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: colourdistance
 version: !ruby/object:Gem::Version
-  version: 0.9.11
+  version: 1.0.7
 platform: ruby
 authors:
 - Orange Seven
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-26 00:00:00.000000000 Z
+date: 2015-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,9 +66,10 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Currently only contains two options, ciede94 and ciede2000, both weighted
-  to (roughly) a [0,1] scale (actually possible to get very slightly above 1). Will
-  add more. Both are my own implementations, and ciede94 is probably wrong because
+description: Currently only contains three options (ciede 76, ciede94, and ciede2000),
+  all weighted to (roughly) a [0,1] scale (actually possible to get slightly above
+  1). Will add more. All are my own implementations (although ciede2000 is based on
+  a several dozen implementations found during research), and they may be wrong because
   of it. Thanks go out to Josh Clayton (https://robots.thoughtbot.com/get-your-c-on),
   for helping me to understand the structure I was attempting to acheive.
 email: