Diff: C12832.cpp

Revision:

20:dbee79303f9a

Parent:

19:de1f73b31288

--- a/C12832.cpp	Sun Nov 01 23:09:05 2015 +0000
+++ b/C12832.cpp	Mon Nov 02 00:58:51 2015 +0000
@@ -288,7 +288,7 @@
         diag = strt - (2 * a_dx);   /* diagonal */
         d = strt - a_dx;
 
-        while ((a_dx >= 0) && (x >= 0) && (x < 128) && (y >= 0) && (y < 32)) {
+        while ((a_dx >= 0) && (x >= 0) && (x < 128)) {
             pixel_nochk (x, y, colour);
             x += s_x;
             a_dx--;
@@ -298,6 +298,9 @@
             } else {
                 d += diag;
                 y += s_y;
+                if ((y < 0) || (y >= 32)) {
+                    break;          /* while() */
+                }
             }
         }
     } else {
@@ -305,7 +308,7 @@
         diag = strt - (2 * a_dy);   /* diagonal */
         d = strt - a_dy;
 
-        while ((a_dy >= 0) && (x >= 0) && (x < 128) && (y >= 0) && (y < 32)) {
+        while ((a_dy >= 0) && (y >= 0) && (y < 32)) {
             pixel_nochk (x, y, colour);
             y += s_y;
             a_dy--;
@@ -315,6 +318,9 @@
             } else {
                 d += diag;
                 x += s_x;
+                if ((x < 0) || (x >= 128)) {
+                    break;          /* while() */
+                }
             }
         }
     }