branch update for HEAD-2003050101

[reactos.git] / drivers / dd / vga / display / objects / lineto.c

diff --git a/drivers/dd/vga/display/objects/lineto.c b/drivers/dd/vga/display/objects/lineto.c
index 6345306..6fceab6 100644 (file)
--- a/drivers/dd/vga/display/objects/lineto.c
+++ b/drivers/dd/vga/display/objects/lineto.c
@@ -17,87 +17,84 @@ DrvLineTo(SURFOBJ *Surface,
 // FIXME: Use Mix to perform ROPs
 
 {
-   ULONG x, y, d, i, length, xchange, ychange, error,
-         iSolidColor, hx, vy;
-   LONG  deltax, deltay;
+  LONG deltax, deltay, x, y, d, i, xchange, ychange, error, iSolidColor, hx, vy;
 
-   iSolidColor = Brush->iSolidColor; // FIXME: Brush Realization...
+  iSolidColor = Brush->iSolidColor; // FIXME: Brush Realization...
 
-   // FIXME: Implement clipping
+  // FIXME: Implement clipping
 
-   x=x1;
-   y=y1;
-   deltax=x2-x1;
-   deltay=y2-y1;
+  x = x1;
+  y = y1;
+  deltax = x2 - x1;
+  deltay = y2 - y1;
 
-   if(deltax<0)
-   {
-      xchange=-1;
-      deltax=-deltax;
-      hx = x2;
-   } else
-   {
-      xchange=1;
-      hx = x1;
-   }
+  if (deltax < 0)
+    {
+    xchange = -1;
+    deltax = - deltax;
+    hx = x2;
+    x--;
+    }
+  else
+    {
+    xchange = 1;
+    hx = x1;
+    }
 
-   if(deltay<0)
-   {
-      ychange=-1;
-      deltay=-deltay;
-      vy = y2;
-   } else
-   {
-      ychange=1;
-      vy = y1;
-   };
+  if (deltay < 0)
+    {
+    ychange = -1;
+    deltay = - deltay;
+    vy = y2;
+    y--;
+    }
+  else
+    {
+    ychange = 1;
+    vy = y1;
+    };
 
-   if(y1==y2)
-   {
-     return vgaHLine(hx, y1, deltax, iSolidColor);
-   }
-   if(x1==x2)
-   {
-     return vgaVLine(x1, vy, deltay, iSolidColor);
-   }
+  if (y1 == y2)
+    {
+    return vgaHLine(hx, y1, deltax, iSolidColor);
+    }
+  if (x1 == x2)
+    {
+    return vgaVLine(x1, vy, deltay, iSolidColor);
+    }
 
   // Using individual pixels to draw a line neither horizontal or vertical
   // Set up the VGA masking for individual pixels
 
+  error = 0;
 
-  error=0;
-  i=0;
-
-  if(deltax<deltay)
-  {
-     length=deltay+1;
-     while(i<length)
-     {
-        vgaPutPixel(x, y, iSolidColor);
-        y=y+ychange;
-        error=error+deltax;
+  if (deltax < deltay)
+    {
+    for (i = 0; i < deltay; i++)
+      {
+      vgaPutPixel(x, y, iSolidColor);
+      y = y + ychange;
+      error = error + deltax;
 
-        if(error>deltay)
+      if (deltay <= error)
         {
-           x=x+xchange;
-           error=error-deltay;
+        x = x + xchange;
+        error = error - deltay;
         }
-        i=i+1;
-     }
-  } else
-  {
-    length=deltax+1;
-    while(i<length)
+      }
+    }
+   else
     {
-         vgaPutPixel(x, y, iSolidColor);
-         x=x+xchange;
-         error=error+deltay;
-         if(error>deltax)
-         {
-            y=y+ychange;
-            error=error-deltax;
-         }
-         i=i+1;
+    for (i = 0; i < deltax; i++)
+      {
+      vgaPutPixel(x, y, iSolidColor);
+      x = x + xchange;
+      error = error + deltay;
+      if (deltax <= error)
+        {
+        y = y + ychange;
+        error = error - deltax;
+        }
       }
    }