Changeset 2206Tweet

Timestamp:

Jan 6, 2013, 10:36:32 PM (7 years ago)

Author:

sam

Message:

color: fix a mistake in the CIEDE2000 color-difference formula.

Location:

trunk

Files:

• src/image/color/cie1931.cpp (modified) (3 diffs)
• test/unit/color.cpp (modified) (1 diff)

trunk/src/image/color/cie1931.cpp

@@ -28 +28 @@
 {
     float const pi = 3.141592653589793f;
-
-    float const deg2rad = 6.28318530718f / 360.f;
-    float const rad2deg = 360.f / 6.28318530718f;
 
     float C1 = length(lab1.yz);
@@ -65 +62 @@
     else if (abs(hp1 - hp2) > pi && hp1 + hp2 < 2.f * pi)
         Hp_ = 0.5f * (hp1 + hp2) + pi;
-    else if (abs(hp1 - hp2) > 180.f)
+    else if (abs(hp1 - hp2) > pi)
         Hp_ = 0.5f * (hp1 + hp2) - pi;
     else
@@ -79 +76 @@
     float SH = 1.f + 0.015f * Cp_ * T;
     float RT = -2.f * sqrt(pow(Cp_, 7.f) / (pow(Cp_, 7.f) + pow(25.f, 7.f)))
-                    * sin(60.f * deg2rad * exp(-pow((Hp_ * rad2deg - 275.f) / 25.f, 2.f)));
+                    * sin(pi / 3.f * exp(-pow((Hp_ * 180.f / pi - 275.f) / 25.f, 2.f)));
 
     dLp /= SL;

trunk/test/unit/color.cpp

@@ -38 +38 @@
     //50.0000f,   2.4900f,  -0.0010f, 50.0000f,  -2.4900f,   0.0012f,  7.2195f,
     50.0000f,  -0.0010f,   2.4900f, 50.0000f,   0.0009f,  -2.4900f,  4.8045f,
-    50.0000f,  -0.0010f,   2.4900f, 50.0000f,   0.0010f,  -2.4900f,  4.8045f,
-    //50.0000f,  -0.0010f,   2.4900f, 50.0000f,   0.0011f,  -2.4900f,  4.7461f,
+    //50.0000f,  -0.0010f,   2.4900f, 50.0000f,   0.0010f,  -2.4900f,  4.8045f,
+    50.0000f,  -0.0010f,   2.4900f, 50.0000f,   0.0011f,  -2.4900f,  4.7461f,
     50.0000f,   2.5000f,   0.0000f, 50.0000f,   0.0000f,  -2.5000f,  4.3065f,
     50.0000f,   2.5000f,   0.0000f, 73.0000f,  25.0000f, -18.0000f, 27.1492f,