commit 3cd51c0acf4ddf77d1a6979ee24386b4d24eb3c3
author Vincent Povirk <vincent@codeweavers.com> Wed Feb 29 15:40:15 2012 -0600
committer Alexandre Julliard <julliard@winehq.org> Thu Mar 15 19:56:20 2012 +0100
tree 4c22b99d45ac0bcbee59ddd0f7b956243263d780
parent 7e90dc3dc70b4c19b9f98c44e1279c9659287435

gdiplus: Use the surround colors in path gradient rendering.

dlls/gdiplus/graphics.c

diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c
index 67361a2..cbaf3ed 100644
--- a/dlls/gdiplus/graphics.c
+++ b/dlls/gdiplus/graphics.c
@@ -1191,7 +1191,7 @@
         REAL min_yf, max_yf, line1_xf, line2_xf;
         INT min_y, max_y, min_x, max_x;
         INT x, y;
-        ARGB outer_color=0xffffffff;
+        ARGB outer_color;
 
         if (fill->focus.X != 0.0 || fill->focus.Y != 0.0)
         {
@@ -1241,6 +1241,8 @@
             int start_center_line=0, end_center_line=0;
             int seen_start=0, seen_end=0, seen_center=0;
             REAL center_distance;
+            ARGB start_color, end_color;
+            REAL dy, dx;
 
             type = flat_path->pathdata.Types[i];
 
@@ -1249,13 +1251,23 @@
 
             start_point = flat_path->pathdata.Points[i];
 
+            start_color = fill->surroundcolors[min(i, fill->surroundcolorcount-1)];
+
             if ((type&PathPointTypeCloseSubpath) == PathPointTypeCloseSubpath || i+1 >= flat_path->pathdata.Count)
+            {
                 end_point = flat_path->pathdata.Points[figure_start];
+                end_color = fill->surroundcolors[min(figure_start, fill->surroundcolorcount-1)];
+            }
             else if ((flat_path->pathdata.Types[i+1] & PathPointTypePathTypeMask) == PathPointTypeLine)
+            {
                 end_point = flat_path->pathdata.Points[i+1];
+                end_color = fill->surroundcolors[min(i+1, fill->surroundcolorcount-1)];
+            }
             else
                 continue;
 
+            outer_color = start_color;
+
             min_yf = center_point.Y;
             if (min_yf > start_point.Y) min_yf = start_point.Y;
             if (min_yf > end_point.Y) min_yf = end_point.Y;
@@ -1274,9 +1286,12 @@
             else
                 max_y = (INT)ceil(max_yf);
 
+            dy = end_point.Y - start_point.Y;
+            dx = end_point.X - start_point.X;
+
             /* This is proportional to the distance from start-end line to center point. */
-            center_distance = (end_point.Y - start_point.Y) * (start_point.X - center_point.X) +
-                (end_point.X - start_point.X) * (center_point.Y - start_point.Y);
+            center_distance = dy * (start_point.X - center_point.X) +
+                dx * (center_point.Y - start_point.Y);
 
             for (y=min_y; y<max_y; y++)
             {
@@ -1327,9 +1342,19 @@
 
                 for (x=min_x; x<max_x; x++)
                 {
+                    REAL xf = (REAL)x;
                     REAL distance;
 
-                    distance = (end_point.Y - start_point.Y) * (start_point.X - (REAL)x) +
+                    if (start_color != end_color)
+                    {
+                        REAL blend_amount, pdy, pdx;
+                        pdy = yf - center_point.Y;
+                        pdx = xf - center_point.X;
+                        blend_amount = ( (center_point.Y - start_point.Y) * pdx + (start_point.X - center_point.X) * pdy ) / ( dy * pdx - dx * pdy );
+                        outer_color = blend_colors(start_color, end_color, blend_amount);
+                    }
+
+                    distance = (end_point.Y - start_point.Y) * (start_point.X - xf) +
                         (end_point.X - start_point.X) * (yf - start_point.Y);
 
                     distance = distance / center_distance;