Changeset 680Tweet

Timestamp:

May 19, 2011, 1:45:47 AM (11 years ago)

Author:

Sam Hocevar

Message:

imlib: fix a regression in the line drawing clipping code.

File:

• abuse/trunk/src/imlib/image.cpp (modified) (2 diffs)

abuse/trunk/src/imlib/image.cpp

@@ -176 +176 @@
 }
 
+//
+// Draw a line of the given colour on the image. Both endpoints are set.
+//
 void image::Line(vec2i p1, vec2i p2, uint8_t color)
 {
@@ -184 +187 @@
     vec2i caa, cbb;
     GetClip(caa, cbb);
-    if (!(p1 >= caa && p2 >= caa && p1 < cbb && p2 < cbb))
+
+    if ((p1.x < caa.x && p2.x < caa.x) || (p1.x >= cbb.x && p2.x >= cbb.x) ||
+        (p1.y < caa.y && p2.y < caa.y) || (p1.y >= cbb.y && p2.y >= cbb.y))
         return;