[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit 967cad1d4e2d4a0358cd5f0b852e5bc44e96d727
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Mar 7 00:25:09 2003 +0000

            Reviewed by John.
    
            - fixed 3191027 -- REGRESSION: KWQColor assert at aol.com front page
    
            * kwq/KWQColor.mm: (qRgb): Clamp to [0,0xFF] instead of asserting.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3770 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 65731b1..5d3164d 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,11 @@
+2003-03-06  Darin Adler  <darin at apple.com>
+
+        Reviewed by John.
+
+        - fixed 3191027 -- REGRESSION: KWQColor assert at aol.com front page
+
+        * kwq/KWQColor.mm: (qRgb): Clamp to [0,0xFF] instead of asserting.
+
 2003-03-06  Trey Matteson  <trey at apple.com>
 
 	Refinement of routine that scans the DOM for field labels.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 65731b1..5d3164d 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,11 @@
+2003-03-06  Darin Adler  <darin at apple.com>
+
+        Reviewed by John.
+
+        - fixed 3191027 -- REGRESSION: KWQColor assert at aol.com front page
+
+        * kwq/KWQColor.mm: (qRgb): Clamp to [0,0xFF] instead of asserting.
+
 2003-03-06  Trey Matteson  <trey at apple.com>
 
 	Refinement of routine that scans the DOM for field labels.
diff --git a/WebCore/kwq/KWQColor.mm b/WebCore/kwq/KWQColor.mm
index b2f256f..8ae2edb 100644
--- a/WebCore/kwq/KWQColor.mm
+++ b/WebCore/kwq/KWQColor.mm
@@ -49,9 +49,9 @@ const QColor Qt::yellow   (0xFF, 0xFF, 0x00);
 
 QRgb qRgb(int r, int g, int b)
 {
-    ASSERT(r >= 0 && r <= 0xFF);
-    ASSERT(g >= 0 && g <= 0xFF);
-    ASSERT(b >= 0 && b <= 0xFF);
+    if (r < 0) r = 0; else if (r > 255) r = 255;
+    if (g < 0) g = 0; else if (g > 255) g = 255;
+    if (b < 0) b = 0; else if (b > 255) b = 255;
     return r << 16 | g << 8 | b;
 }
 

-- 
WebKit Debian packaging