colourdistance 0.0.7 → 0.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f540b8bfb96e37fbfe0d67c9e3947c7e963aa97
-  data.tar.gz: 53afb6ae398ec5f078f4cd1daaac2ae002f41a3a
+  metadata.gz: adb182233c91e02f52ae16806c72b17e91111114
+  data.tar.gz: 0bdbd87332e28be2b3d358b85db2f71543034570
 SHA512:
-  metadata.gz: 07a6447f56413d8c43a154bee396ed247257e987e0852ee9e3df8958b2776d021b0022c26bc8419831e2aadf587db3ba0730f8caa7fee297ebefc77bb3e7fd0e
-  data.tar.gz: 83cfb21d9961be9a6debc42a7f1f756a4074c229d854a481e3cb3bf1b2d194786057bd3c1de6f8ff5c3ee036d8cf169535936ff4d5fcf7472981cf1832307c9d
+  metadata.gz: 0fe2ed620095cef88f5b3f9e4119634746587cb429e4e307b13b0ed0ec22a903c54e483a76f91eaef81ad240e712aefc627bdc94da055f33c1b213f24673eaa8
+  data.tar.gz: 80993f64f5824a579e00847890b59096deb1b852543bea57106ef469dfda110f8d33a9cbe6db16ee55fe6db9c455c52de9360f132010fb8f42e741a1613d97fa

data/lib/colourdistance.rb

@@ -9,14 +9,12 @@ module Colourdistance
     builder.c_singleton 'VALUE ciede94(VALUE color1, VALUE color2) {
       double pi = 3.1415927;
       double e = 2.7182818;
-      double _kL = 1.0;
-      double _kC = 1.0;
-      double _kH = 1.0;
       double l1;
       double l2;
       double a1;
       double a2;
 
+      
       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;
@@ -25,6 +23,14 @@ module Colourdistance
       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;
 
+      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));
+
+      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 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;
@@ -33,58 +39,57 @@ module Colourdistance
       double y2 = 0.212671 * r2 + 0.715160 * g2 + 0.072169 * b2;
       double z2 = 0.019334 * r2 + 0.119193 * g2 + 0.950227 * b2;
 
+      double fx;
+      double fy;
+      double fz;
+
+      if(x1 <= 0.008856){
+        fx = 7.787 * x1/0.95047 + 16.0/116.0;
+      }else{
+        fx = cbrt(x1/0.95047);
+      }
+
       if(y1 <= 0.008856){
         l1 = 903.3 * y1;
-        if(x1 <= 0.008856){
-          a1 = 500.0 * ((7.787 * x1 + 16.0/116.0) - (7.787 * y1 + 16.0/116.0));
-        }else{
-          a1 = 500.0 * (cbrt(x1) - (7.787 * y1 + 16.0/116.0));
-        }
-        if(z1 <= 0.008856){
-          b1 = 200 * ((7.787 * y1 + 16.0/116.0) - (7.787 * z1 + 16.0/116.0));
-        }else{
-          b1 = 200 * ((7.787 * y1 + 16.0/116.0) - cbrt(z1));
-        }
+        fy = (7.787 * y1 + 16.0/116.0);
       }else{
         l1 = 116.0 * cbrt(y1) - 16.0;
-        if(x1 <= 0.008856){
-          a1 = 500 * ((7.787 * x1 + 16.0/116.0) - cbrt(y1));
-        }else{
-          a1 = 500.0 * (cbrt(x1) - cbrt(y1));
-        }
-        if(z1 <= 0.008856){
-          b1 = 200 * (cbrt(y1) - (7.787 * z1 + 16.0/116.0));
-        }else{
-          b1 = 200 * (cbrt(y1) - cbrt(z1));
-        }
+        fy = cbrt(y1);
+      }
+
+      if(z1 <= 0.008856){
+        fz = 7.787 * z1/1.08883 + 16.0/116.0;
+      }else{
+        fz = cbrt(z1/1.08883);
+      }
+
+      a1 = 500.0 * (fx-fy);
+      b1 = 200.0 * (fy-fz);
+
+
+      if(x2 <= 0.008856){
+        fx = (7.787 * x2/0.95047 + 16.0/116.0);
+      }else{
+        fx = cbrt(x2/0.95047);
       }
 
       if(y2 <= 0.008856){
         l2 = 903.3 * y2;
-        if(x2 <= 0.008856){
-          a2 = 500 * ((7.787 * x2 + 16.0/116.0) - (7.787 * y2 + 16.0/116.0));
-        }else{
-          a2 = 500.0 * (cbrt(x2) - (7.787 * y2 + 16.0/116.0));
-        }
-        if(z2 <= 0.008856){
-          b2 = 200 * ((7.787 * y2 + 16.0/116.0) - (7.787 * z2 + 16.0/116.0));
-        }else{
-          b2 = 200 * ((7.787 * y2 + 16.0/116.0) - cbrt(z2));
-        }
+        fy = (7.787 * y2 + 16.0/116.0);
       }else{
         l2 = 116.0 * cbrt(y2) - 16.0;
-        if(x2 <= 0.008856){
-          a2 = 500 * ((7.787 * x2 + 16.0/116.0) - cbrt(y2));
-        }else{
-          a2 = 500.0 * (cbrt(x2) - cbrt(y2));
-        }
-        if(z2 <= 0.008856){
-          b2 = 200 * (cbrt(y2) - (7.787 * z2 + 16.0/116.0));
-        }else{
-          b2 = 200 * (cbrt(y2) - cbrt(z2));
-        }
+        fy = cbrt(y2);
+      }
+
+      if(z2 <= 0.008856){
+        fz = (7.787 * z2/1.08883 + 16.0/116.0);
+      }else{
+        fz = cbrt(z2/1.08883);
       }
 
+      a2 = 500.0 * (fx-fy);
+      b2 = 200.0 * (fy-fz);
+
       double kl = 2.0;
       double k1 = 0.048;
       double k2 = 0.014;
@@ -108,9 +113,6 @@ module Colourdistance
     builder.c_singleton 'VALUE ciede2000(VALUE color1, VALUE color2) {
       double pi = 3.1415927;
       double e = 2.7182818;
-      double _kL = 1.0;
-      double _kC = 1.0;
-      double _kH = 1.0;
       double l1;
       double l2;
       double a1;
@@ -124,6 +126,14 @@ module Colourdistance
       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;
 
+      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));
+
+      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 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;
@@ -132,58 +142,58 @@ module Colourdistance
       double y2 = 0.212671 * r2 + 0.715160 * g2 + 0.072169 * b2;
       double z2 = 0.019334 * r2 + 0.119193 * g2 + 0.950227 * b2;
 
+      double fx;
+      double fy;
+      double fz;
+
+      if(x1 <= 0.008856){
+        fx = 7.787 * x1/0.95047 + 16.0/116.0;
+      }else{
+        fx = cbrt(x1/0.95047);
+      }
+
       if(y1 <= 0.008856){
         l1 = 903.3 * y1;
-        if(x1 <= 0.008856){
-          a1 = 500.0 * ((7.787 * x1 + 16.0/116.0) - (7.787 * y1 + 16.0/116.0));
-        }else{
-          a1 = 500.0 * (cbrt(x1) - (7.787 * y1 + 16.0/116.0));
-        }
-        if(z1 <= 0.008856){
-          b1 = 200 * ((7.787 * y1 + 16.0/116.0) - (7.787 * z1 + 16.0/116.0));
-        }else{
-          b1 = 200 * ((7.787 * y1 + 16.0/116.0) - cbrt(z1));
-        }
+        fy = (7.787 * y1 + 16.0/116.0);
       }else{
         l1 = 116.0 * cbrt(y1) - 16.0;
-        if(x1 <= 0.008856){
-          a1 = 500 * ((7.787 * x1 + 16.0/116.0) - cbrt(y1));
-        }else{
-          a1 = 500.0 * (cbrt(x1) - cbrt(y1));
-        }
-        if(z1 <= 0.008856){
-          b1 = 200 * (cbrt(y1) - (7.787 * z1 + 16.0/116.0));
-        }else{
-          b1 = 200 * (cbrt(y1) - cbrt(z1));
-        }
+        fy = cbrt(y1);
+      }
+
+      if(z1 <= 0.008856){
+        fz = 7.787 * z1/1.08883 + 16.0/116.0;
+      }else{
+        fz = cbrt(z1/1.08883);
+      }
+
+      a1 = 500.0 * (fx-fy);
+      b1 = 200.0 * (fy-fz);
+
+
+      if(x2 <= 0.008856){
+        fx = (7.787 * x2/0.95047 + 16.0/116.0);
+      }else{
+        fx = cbrt(x2/0.95047);
       }
 
       if(y2 <= 0.008856){
         l2 = 903.3 * y2;
-        if(x2 <= 0.008856){
-          a2 = 500 * ((7.787 * x2 + 16.0/116.0) - (7.787 * y2 + 16.0/116.0));
-        }else{
-          a2 = 500.0 * (cbrt(x2) - (7.787 * y2 + 16.0/116.0));
-        }
-        if(z2 <= 0.008856){
-          b2 = 200 * ((7.787 * y2 + 16.0/116.0) - (7.787 * z2 + 16.0/116.0));
-        }else{
-          b2 = 200 * ((7.787 * y2 + 16.0/116.0) - cbrt(z2));
-        }
+        fy = (7.787 * y2 + 16.0/116.0);
       }else{
         l2 = 116.0 * cbrt(y2) - 16.0;
-        if(x2 <= 0.008856){
-          a2 = 500 * ((7.787 * x2 + 16.0/116.0) - cbrt(y2));
-        }else{
-          a2 = 500.0 * (cbrt(x2) - cbrt(y2));
-        }
-        if(z2 <= 0.008856){
-          b2 = 200 * (cbrt(y2) - (7.787 * z2 + 16.0/116.0));
-        }else{
-          b2 = 200 * (cbrt(y2) - cbrt(z2));
-        }
+        fy = cbrt(y2);
       }
 
+      if(z2 <= 0.008856){
+        fz = (7.787 * z2/1.08883 + 16.0/116.0);
+      }else{
+        fz = cbrt(z2/1.08883);
+      }
+
+      a2 = 500.0 * (fx-fy);
+      b2 = 200.0 * (fy-fz);
+
+
       double c1 = sqrt(a1*a1+b1*b1);
       double c2 = sqrt(a2*a2+b2*b2);
       double cdelta = c2 - c1;
@@ -199,7 +209,7 @@ module Colourdistance
 
       double c1prime = sqrt(a1prime*a1prime+b1*b1);
       double c2prime = sqrt(a2prime*a2prime+b2*b2);
-      double cprime = (c1prime + c1prime)/2.0;
+      double cprime = (c1prime + c2prime)/2.0;
       double cprimeadj = sqrt(pow(cprime,7)/(pow(cprime,7)+6103515625.0));
       double cprimedelta = c2prime - c1prime;
 
@@ -208,13 +218,14 @@ module Colourdistance
       if(c1 == 0.0){
         h1 = 0.0;
       }else{
-        h1 = fmod(atan2(b1,a1prime),360.0);
+        h1 = fmod(atan2(b1,a1prime)*180.0/pi,360.0);
       }
-      if(c1 == 0.0){
+      if(c2 == 0.0){
         h2 = 0.0;
       }else{
-        h2 = fmod(atan2(b2,a2prime),360.0);
+        h2 = fmod(atan2(b2,a2prime)*180.0/pi,360.0);
       }
+
       double h;
       if (fabs(h2 - h1) <= 180.0){
         h = h2 - h1;
@@ -229,8 +240,14 @@ module Colourdistance
       if (fabs(h1 - h2) > 180.0){
         hprime += 180.0;
       }
+      if(c1prime == 0.0 || c2prime == 0.0){
+        hprime *= 2.0;
+      }
 
-      double t = 1.0 - 0.17*cos(hprime-30.0) + 0.24*cos(2.0*hprime) + 0.32*cos(3.0*hprime + 6.0) - 0.20*cos(4.0*hprime-63.0);
+      double t = 1.0 - 0.17*cos(hprime-30.0) +
+                  0.24*cos(2.0*hprime) +
+                  0.32*cos(3.0*hprime + 6.0) -
+                  0.20*cos(4.0*hprime-63.0);
 
       double sl = 1.0 + 0.015 * lbaradj/sqrt(20+lbaradj);
       double sc = 1.0 + 0.045*cprime;
@@ -239,11 +256,12 @@ module Colourdistance
       double rt = -2.0*cprimeadj*sin(60.0*pow(e,(hdelta-275.0)*(hdelta-275.0)/(-625.0)));
 
       double ldiff = (l1 - l2)/(sl);
-      double adiff = cdelta/sc;
+      double adiff = cprimedelta/sc;
       double bdiff = hdelta/sh;
-      double rdiff = rt*(cdelta*hdelta)/(sh*sh);
+      double rdiff = rt*adiff*bdiff;
+      double val = sqrt(ldiff*ldiff+adiff*adiff+bdiff*bdiff+rdiff)/100.0;
 
-      return DBL2NUM(sqrt(ldiff*ldiff+adiff*adiff+bdiff*bdiff+rdiff)/100.0);
+      return DBL2NUM(val);
     }'
   end
 end

data/lib/colourdistance/version.rb

@@ -1,3 +1,3 @@
 module Colourdistance
-  VERSION = "0.0.7"
+  VERSION = "0.7.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: colourdistance
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.7.7
 platform: ruby
 authors:
 - Orange Seven
@@ -76,7 +76,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .DS_Store
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -86,7 +85,6 @@ files:
 - bin/console
 - bin/setup
 - colourdistance.gemspec
-- lib/.DS_Store
 - lib/colourdistance.rb
 - lib/colourdistance/version.rb
 homepage: