colourdistance 1.0.7 → 1.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a975c48f2d6a1dce74d9f8a0eeeb8643c1a26f31
-  data.tar.gz: fdd1f5d5c9aca769fd809b47d9c28f39f978ab13
+  metadata.gz: 56d234d51aed6a067f2a4768fcf7d7d75a923a6b
+  data.tar.gz: ebf2c394fe639da436a5d7c48b24a6a624836a9c
 SHA512:
-  metadata.gz: 3595ff36180543a429f72a9386e07ff13c67a0201e751d7eb25911f18282019fa0259bdc30b6988971b3014172313428c36975dc3394eb84339a75176514e80a
-  data.tar.gz: cc04bc88a28ba4dfb792039059ea89ab4092cd2c0a79ccc2c4ed3474b5a17cfc9e9007819dc9a8be4f44595ab52a62b4ff3994e72c4886aa80457c7dd9fd0910
+  metadata.gz: c1a3f002932ab50ed0366e5212efe2239d2e162233d461585ba5f35841ff8ede3fbaf6d385c5aeb55525dd2755bd093834e769607a1fd50fc193b64309c9b753
+  data.tar.gz: 9845d5dfc51b00f5d9505fc41fb6dc1d372e03ff5bf1759a63143be597eddace43c38abba54f7d4911f51c144187ac7567ad46414b28b7fce3069e6b4fbc712d

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 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.description   = "Currently contains four options (ciede 76, cmclc, ciede94, and ciede2000) (all here: https://en.wikipedia.org/wiki/Color_difference), all weighted so that the distance between rgb 0,0,0 and rgb 255,255,255 will be 1.000 (accurate to 4 decimal places). Will add more. All are my own implementations (although ciede2000 is based on several dozen implementations found during research), and they may be wrong because of it. If you see any problems, let me know. 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,15 +7,13 @@
  
 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, "cie76", cie76, 2);
+  rb_define_singleton_method(rb_mColourdistance, "cmclc", cmclc, 2);
+  rb_define_singleton_method(rb_mColourdistance, "cie94", cie94, 2);
   rb_define_singleton_method(rb_mColourdistance, "ciede2000", ciede2000, 2);
 }
 
 static VALUE cie76(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];
 
@@ -39,10 +37,80 @@ static VALUE cie76(const VALUE self, VALUE color1, VALUE color2) {
   return DBL2NUM(val);
 }
 
-static VALUE cie94(const VALUE self, VALUE color1, VALUE color2) {
+static VALUE cmclc(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;
+
+  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 ldiff = l1 - l2;
+  double adiff = a1 - a2;
+  double bdiff = b1 - b2;
+
+  double c1 = sqrt(a1*a1+b1*b1);
+  double c2 = sqrt(a2*a2+b2*b2);
+  double deltac = c1 - c2;
+
+  double cbar = (c1 + c2)/2.0;
+  double cbaradj = sqrt(pow(cbar,7)/(pow(cbar,7)+6103515625.0));
+
+  double a1prime = a1 + (a1/2.0) * (1.0-cbaradj);
+  double a2prime = a2 + (a2/2.0) * (1.0-cbaradj);
+
+  double h1;
+  double h2;
+  if(c1 == 0.0){
+    h1 = 0.0;
+  }else{
+    h1 = fmod(atan2(b1,a1prime)*180.0/pi,360.0);
+  }
+  if(c2 == 0.0){
+    h2 = 0.0;
+  }else{
+    h2 = fmod(atan2(b2,a2prime)*180.0/pi,360.0);
+  }
+
+  double deltah = sqrt(adiff*adiff+bdiff*bdiff-deltac*deltac);
+
+
+  double f = sqrt(pow(c1,4)/(pow(c1,4) + 1900.0));
+  double t;
+  if(164.0 <= h1 && h1 <= 345.0){
+    t = 0.56 + fabs(0.2*cos(h1+168.0));
+  }else{
+    t = 0.36 + fabs(0.4*cos(h1+35.0));
+  }
+
+  double sl = 0.511;
+  if(l1 >= 16.0){
+    sl = 0.040975 * l1 / (1.0 + 0.01765 * l1);
+  }
+  double sc = 0.0638 * c1 / (1.0 + 0.0131 * c1) + 0.638;
+  double sh = 1 + k2*c1;
+
+  double e1 = ldiff/sl;
+  double e2 = deltac / sc;
+  double e3 = deltah / sh;
+  double val = sqrt(e1*e1+e2*e2+e3*e3)/195.7;
+
+  return DBL2NUM(val);
+}
+
+static VALUE cie94(const VALUE self, VALUE color1, VALUE color2) {
   double kl = 2.0;
   double k1 = 0.048;
   double k2 = 0.014;
@@ -77,7 +145,7 @@ static VALUE cie94(const VALUE self, VALUE color1, VALUE color2) {
   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;
+  double val = sqrt(e1*e1+e2*e2+e3*e3)/50.0;
 
   return DBL2NUM(val);
 }
@@ -174,7 +242,6 @@ static VALUE ciede2000(const VALUE self, VALUE color1, VALUE color2) {
   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;

data/ext/colourdistance/colourdistance.h

@@ -1,7 +1,8 @@
 #ifndef __colourdistance_h__
 #define __colourdistance_h__
 
-static VALUE ciee76(VALUE,VALUE,VALUE);
+static VALUE cie76(VALUE,VALUE,VALUE);
+static VALUE cmclc(VALUE,VALUE,VALUE);
 static VALUE cie94(VALUE,VALUE,VALUE);
 static VALUE ciede2000(VALUE,VALUE,VALUE);
 void rgb_to_lab(VALUE, double *);

data/lib/colourdistance/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: colourdistance
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.2.7
 platform: ruby
 authors:
 - Orange Seven
@@ -66,12 +66,14 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-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.
+description: 'Currently contains four options (ciede 76, cmclc, ciede94, and ciede2000)
+  (all here: https://en.wikipedia.org/wiki/Color_difference), all weighted so that
+  the distance between rgb 0,0,0 and rgb 255,255,255 will be 1.000 (accurate to 4
+  decimal places). Will add more. All are my own implementations (although ciede2000
+  is based on several dozen implementations found during research), and they may be
+  wrong because of it. If you see any problems, let me know. 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:
 - theseventhorange@gmail.com
 executables: []