Changeset 19155 for S60/trunk/WebCore

Timestamp:

01/26/07 08:55:39 (2 years ago)

Author:

brmorris

Message:

yongjzha

Reviewed by <zbujtas@gmail.com>
DESC: PNUN-6XJJLF When use css border property outset, and set border color to blue, the browser
shows black at the bottom edge and right edge.
fix: correct RGB to HSV and HSV to RGB conversion algorithms in KWQColor.cpp

http://bugs.webkit.org/show_bug.cgi?id=12393

Location:

S60/trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• kwq/KWQColor.cpp (modified) (5 diffs)
• kwq/KWQColor.h (modified) (2 diffs)

S60/trunk/WebCore/ChangeLog

@@ +1 @@
+2007-01-24  yongjzha 
+
+        Reviewed by <zbujtas@gmail.com>
+        DESC: PNUN-6XJJLF When use css border property outset, and set border color to blue, the browser
+        shows black at the bottom edge and right edge.
+        fix: correct RGB to HSV and HSV to RGB conversion algorithms in KWQColor.cpp
+
+        http://bugs.webkit.org/show_bug.cgi?id=12393
+
+        WARNING: NO TEST CASES ADDED OR CHANGED
+
+        * kwq/KWQColor.cpp:
+        (QColor::hsv):
+        (QColor::setHsv):
+        (QColor::light):
+        (QColor::dark):
+        * kwq/KWQColor.h:
+
 bujtas  <zbujtas@gmail.com>
 

S60/trunk/WebCore/kwq/KWQColor.cpp

@@ -88 +88 @@
 }
 
-void QColor::hsv(int *h, int *s, int *v) const
-{
-    int r = red();
-    int g = green();
-    int b = blue();
-    int i, w, x, f;
-
+// r,g,b values are from 0 to 1
+// h = [0,360], s = [0,1], v = [0,1]
+//      if s == 0, then h = -1 (undefined)
+void QColor::hsv(float *h, float *s, float *v) const
+{
+    float r = red()/255.0f;
+    float g = green()/255.0f;
+    float b = blue()/255.0f;
+    float i, w, x, f;
+
+    // x = min(r, g, b)
+    // w = max(r, g, b)
     x = w = r;
 
     if (g > x) {
+        w = g;
+    }
+    if (g < w) {
         x = g;
     }
-    if (g < w) {
-        w = g;
-    }
 
     if (b > x) {
+        w = b;
+    }
+    if (b < w) {
         x = b;
-    }
-    if (b < w) {
-        w = b;
     }
 
@@ -120 +125 @@
         i = (r == x) ? 3 : ((g == x) ? 5 : 1);
         *h = i - f /(w - x);
+        *h *= 60;
+        if( *h<0 )
+            *h += 360;
+
         if (w != 0)
             *s = (w - x)/w;
@@ -128 +137 @@
 }
 
-void QColor::setHsv(int h, int s, int v)
-{
-    int i, f, p, q, t;
+void QColor::setHsv(float h, float s, float v)
+{
+    float i, f, p, q, t;
 
     if( s == 0 ) {
         // achromatic (gray)
-        setRgb(v, v, v);
+        int c = v*255;
+        setRgb(c, c, c);
         return;
     }
 
     h /= 60;      // sector 0 to 5
-    i = (int)floor(h);
+    i = floor(h);
     f = h - i;      // factorial part of h
     p = v * (1 - s);
     q = v * (1 - s * f);
     t = v * (1 - s * (1 - f));
-
-    switch( i ) {
+    
+    switch( (int)i ) {
         case 0:
-            setRgb(v, t, p);
+            setRgb(v*255, t*255, p*255);
             break;
         case 1:
-            setRgb(q, v, p);
+            setRgb(q*255, v*255, p*255);
             break;
         case 2:
-            setRgb(p, v, t);
+            setRgb(p*255, v*255, t*255);
             break;
         case 3:
-            setRgb(p, q, v);
+            setRgb(p*255, q*255, v*255);
             break;
         case 4:
-            setRgb(t, p, v);
+            setRgb(t*255, p*255, v*255);
             break;
         default:    // case 5:
-            setRgb(v, p, q);
+            setRgb(v*255, p*255, q*255);
             break;
     }
@@ -178 +188 @@
     }
 
-    int h, s, v;
+    float h, s, v;
 
     hsv(&h, &s, &v);
@@ -208 +218 @@
     }
 
-    int h, s, v;
+    float h, s, v;
 
     hsv(&h, &s, &v);

S60/trunk/WebCore/kwq/KWQColor.h

@@ -32 +32 @@
 class TRgb;
 
-typedef unsigned int QRgb;                      // RGBA quadruplet
+typedef unsigned int QRgb;          // RGBA quadruplet
 
 QRgb qRgb(int r, int g, int b);
@@ -60 +60 @@
     void setRgb(int rgb) { color = rgb; valid = true; /* Alpha may be set. Preserve it. */ }
 
-    void hsv(int *, int *, int *) const;
-    void setHsv(int h, int s, int v);
+    void hsv(float *, float *, float *) const;
+    void setHsv(float h, float s, float v);
 
     QColor light(int f = 150) const;