colourdistance 0.7.7 → 0.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: adb182233c91e02f52ae16806c72b17e91111114
-  data.tar.gz: 0bdbd87332e28be2b3d358b85db2f71543034570
+  metadata.gz: 96e6ec04ed8d0202b38f1afe2e813cef7980718e
+  data.tar.gz: 1c7b81e7a7f6e27d1b3a4e60bcfd1c4cdd699d2e
 SHA512:
-  metadata.gz: 0fe2ed620095cef88f5b3f9e4119634746587cb429e4e307b13b0ed0ec22a903c54e483a76f91eaef81ad240e712aefc627bdc94da055f33c1b213f24673eaa8
-  data.tar.gz: 80993f64f5824a579e00847890b59096deb1b852543bea57106ef469dfda110f8d33a9cbe6db16ee55fe6db9c455c52de9360f132010fb8f42e741a1613d97fa
+  metadata.gz: c3499d760a1d4316af2ec12238f3ad6ac5c5ab59569a50b5d087efd04c74c46c7f88882f5fb0499609516d6b60a2882b04f8ccd3f3a91dd3f16a9fbb0704184a
+  data.tar.gz: e12a71333ea3452531c09dddab88a684a22211b501328ead2d2c404f42874ff9b7ec569401452fcd117dbd534c0ca64a22281a589f0acfdbef908629c8bd2d84

data/lib/colourdistance.rb

@@ -113,6 +113,7 @@ module Colourdistance
     builder.c_singleton 'VALUE ciede2000(VALUE color1, VALUE color2) {
       double pi = 3.1415927;
       double e = 2.7182818;
+      double conversion = pi/180;
       double l1;
       double l2;
       double a1;
@@ -169,7 +170,6 @@ module Colourdistance
       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{
@@ -193,7 +193,6 @@ module Colourdistance
       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;
@@ -235,7 +234,7 @@ module Colourdistance
         h = h2 - h1 - 360.0;
       }
 
-      double hdelta = 2.0 * sqrt(c1prime * c2prime) * sin(h/2.0);
+      double hdelta = 2.0 * sqrt(c1prime * c2prime) * sin(conversion*h/2.0);
       double hprime = (h1 + h2)/2.0;
       if (fabs(h1 - h2) > 180.0){
         hprime += 180.0;
@@ -244,18 +243,22 @@ module Colourdistance
         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(conversion*(hprime-30.0)) +
+                  0.24*cos(conversion*(2.0*hprime)) +
+                  0.32*cos(conversion*(3.0*hprime + 6.0)) -
+                  0.20*cos(conversion*(4.0*hprime-63.0));
 
       double sl = 1.0 + 0.015 * lbaradj/sqrt(20+lbaradj);
       double sc = 1.0 + 0.045*cprime;
       double sh = 1.0 + 0.015*cprime*t;
 
-      double rt = -2.0*cprimeadj*sin(60.0*pow(e,(hdelta-275.0)*(hdelta-275.0)/(-625.0)));
+      if (hprime < 0.0){
+        hprime += 360.0;
+      }
+
+      double rt = -2.0*cprimeadj*sin(conversion*60.0*pow(e,-(hprime-275.0)*(hprime-275.0)/(-625.0)));
 
-      double ldiff = (l1 - l2)/(sl);
+      double ldiff = (l1 - l2)/sl;
       double adiff = cprimedelta/sc;
       double bdiff = hdelta/sh;
       double rdiff = rt*adiff*bdiff;

data/lib/colourdistance/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: colourdistance
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.7.8
 platform: ruby
 authors:
 - Orange Seven