cvs: gd /libgd/src gd.c /libgd/tests/gdimagefilledellipse CMakeLists.txt Makefile.am bug00191.c bug00191.png

tabe Sun Jan 18 12:46:38 2009 UTC Added files: /gd/libgd/tests/gdimagefilledellipse bug00191.c bug00191.png Modified files: /gd/libgd/src gd.c /gd/libgd/tests/gdimagefilledellipse CMakeLists.txt Makefile.am Log: fixed FS#191; draw the center line regardless of thickness. http://cvs.php.net/viewvc.cgi/gd/libgd/src/gd.c?r1=1.79&r2=1.80&diff_format=u Index: gd/libgd/src/gd.c diff -u gd/libgd/src/gd.c:1.79 gd/libgd/src/gd.c:1.80 --- gd/libgd/src/gd.c:1.79 Sun Nov 30 08:34:37 2008 +++ gd/libgd/src/gd.c Sun Jan 18 12:46:38 2009 @@ -1,4 +1,4 @@ -/* $Id: gd.c,v 1.79 2008/11/30 08:34:37 tabe Exp $ */ +/* $Id: gd.c,v 1.80 2009/01/18 12:46:38 tabe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -1920,7 +1920,9 @@ a=w>>1; b=h>>1; - gdImageLine(im, mx-a, my, mx+a, my, c); + for (x = mx-a; x <= mx+a; x++) { + gdImageSetPixel(im, x, my, c); + } mx1 = mx-a;my1 = my; mx2 = mx+a;my2 = my; http://cvs.php.net/viewvc.cgi/gd/libgd/tests/gdimagefilledellipse/CMakeLists.txt?r1=1.5&r2=1.6&diff_format=u Index: gd/libgd/tests/gdimagefilledellipse/CMakeLists.txt diff -u gd/libgd/tests/gdimagefilledellipse/CMakeLists.txt:1.5 gd/libgd/tests/gdimagefilledellipse/CMakeLists.txt:1.6 --- gd/libgd/tests/gdimagefilledellipse/CMakeLists.txt:1.5 Wed Jan 7 15:12:31 2009 +++ gd/libgd/tests/gdimagefilledellipse/CMakeLists.txt Sun Jan 18 12:46:38 2009 @@ -1,6 +1,7 @@ SET(TESTS_FILES bug00010 + bug00191 ) FOREACH(test_name ${TESTS_FILES}) http://cvs.php.net/viewvc.cgi/gd/libgd/tests/gdimagefilledellipse/Makefile.am?r1=1.1&r2=1.2&diff_format=u Index: gd/libgd/tests/gdimagefilledellipse/Makefile.am diff -u gd/libgd/tests/gdimagefilledellipse/Makefile.am:1.1 gd/libgd/tests/gdimagefilledellipse/Makefile.am:1.2 --- gd/libgd/tests/gdimagefilledellipse/Makefile.am:1.1 Sat May 10 20:19:28 2008 +++ gd/libgd/tests/gdimagefilledellipse/Makefile.am Sun Jan 18 12:46:38 2009 @@ -1,3 +1,3 @@ ## Process this file with automake to produce Makefile.in -*-Makefile-*- -EXTRA_DIST = CMakeLists.txt bug00010.c bug00010_exp.png +EXTRA_DIST = CMakeLists.txt bug00010.c bug00010_exp.png bug00191.c bug00191.png http://cvs.php.net/viewvc.cgi/gd/libgd/tests/gdimagefilledellipse/bug00191.c?view=markup&rev=1.1 Index: gd/libgd/tests/gdimagefilledellipse/bug00191.c +++ gd/libgd/tests/gdimagefilledellipse/bug00191.c /* $Id: bug00191.c,v 1.1 2009/01/18 12:46:38 tabe Exp $ */ #include "gd.h" #include "gdtest.h" int main() { gdImagePtr im; int error = 0; char path[1024]; im = gdImageCreate(100, 100); (void)gdImageColorAllocate(im, 255, 255, 255); gdImageSetThickness(im, 20); gdImageFilledEllipse(im, 30, 50, 20, 20, gdImageColorAllocate(im, 0, 0, 0)); sprintf(path, "%s/gdimagefilledellipse/bug00191.png", GDTEST_TOP_DIR); if (!gdAssertImageEqualsToFile(path, im)) { error = 1; } gdImageDestroy(im); return error; }