- MFB, imagerectangle draws 2x each corners (alpha channel uglyness)

diff --git a/ext/gd/libgd/gd.c b/ext/gd/libgd/gd.c
index 96a72cb61bc0bfc68654f7221627823d0b793b07..3cf38ecf03c74e60b5c3105f8d5a274f5e176254 100644 (file)
--- a/ext/gd/libgd/gd.c
+++ b/ext/gd/libgd/gd.c
@@ -2029,24 +2029,71 @@ void gdImageRectangle (gdImagePtr im, int x1, int y1, int x2, int y2, int color)
 {
        int x1h = x1, x1v = x1, y1h = y1, y1v = y1, x2h = x2, x2v = x2, y2h = y2, y2v = y2;
        int thick = im->thick;
+       int half1 = 1;
+       int t;
 
+       if (y2 < y1) {
+               t=y1;
+               y1 = y2;
+               y2 = t;
+
+               t = x1;
+               x1 = x2;
+               x2 = t;
+       }
+
+       x1h = x1; x1v = x1; y1h = y1; y1v = y1; x2h = x2; x2v = x2; y2h = y2; y2v = y2;
        if (thick > 1) {
-               int half = thick / 2;
-               int half1 = thick - half;
+               int cx, cy, x1ul, y1ul, x2lr, y2lr;
+               int half = thick >> 1;
+               half1 = thick - half;
+               x1ul = x1 - half;
+               y1ul = y1 - half;
+               
+               x2lr = x2 + half;
+               y2lr = y2 + half;
 
-               if (y1 < y2) {
-                       y1v = y1h - half;
-                       y2v = y2h + half1 - 1;
-               } else {
-                       y1v = y1h + half1 - 1;
-                       y2v = y2h - half;
+               cy = y1ul + thick;
+               while (cy-- > y1ul) {
+                       cx = x1ul - 1;
+                       while (cx++ < x2lr) {
+                               gdImageSetPixel(im, cx, cy, color);
+                       }
+               }
+
+               cy = y2lr - thick;
+               while (cy++ < y2lr) {
+                       cx = x1ul - 1;
+                       while (cx++ < x2lr) {
+                               gdImageSetPixel(im, cx, cy, color);
+                       }
+               }
+
+               cy = y1ul + thick - 1;
+               while (cy++ < y2lr -thick) {
+                       cx = x1ul - 1;
+                       while (cx++ < x1ul + thick) {
+                               gdImageSetPixel(im, cx, cy, color);
+                       }
+               }
+
+               cy = y1ul + thick - 1;
+               while (cy++ < y2lr -thick) {
+                       cx = x2lr - thick - 1;
+                       while (cx++ < x2lr) {
+                               gdImageSetPixel(im, cx, cy, color);
+                       }
                }
-       }
 
-       gdImageLine(im, x1h, y1h, x2h, y1h, color);
-       gdImageLine(im, x1h, y2h, x2h, y2h, color);
-       gdImageLine(im, x1v, y1v, x1v, y2v, color);
-       gdImageLine(im, x2v, y1v, x2v, y2v, color);
+               return;
+       } else {
+               y1v = y1h + 1;
+               y2v = y2h - 1;
+               gdImageLine(im, x1h, y1h, x2h, y1h, color);
+               gdImageLine(im, x1h, y2h, x2h, y2h, color);
+               gdImageLine(im, x1v, y1v, x1v, y2v, color);
+               gdImageLine(im, x2v, y1v, x2v, y2v, color);
+       }
 }
 
 void gdImageFilledRectangle (gdImagePtr im, int x1, int y1, int x2, int y2, int color)