archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-20 09:24:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'PHP-5.6'

Browse source 
* PHP-5.6:
  updated NEWS
  Fix #68714: copy 'n paste error
This commit is contained in:
Christoph M. Becker 2015-07-12 16:39:50 +02:00
commit ce7b5af03f
2 changed files with 26 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ext/gd/libgd/gd_arc.c
View file

@ -58,7 +58,7 @@ void gdImageFilledEllipse (gdImagePtr im, int mx, int my, int w, int h, int c)
int x=0,mx1=0,mx2=0,my1=0,my2=0; int x=0,mx1=0,mx2=0,my1=0,my2=0;
long aq,bq,dx,dy,r,rx,ry,a,b; long aq,bq,dx,dy,r,rx,ry,a,b;
int i; int i;
int old_y1,old_y2; int old_y2;
a=w>>1; a=w>>1;
b=h>>1; b=h>>1;
@ -79,7 +79,6 @@ void gdImageFilledEllipse (gdImagePtr im, int mx, int my, int w, int h, int c)
ry = 0; ry = 0;
x = a; x = a;
old_y2=-2; old_y2=-2;
old_y1=-2;
while (x > 0){ while (x > 0){
if (r > 0) { if (r > 0) {
my1++;my2--; my1++;my2--;
@ -95,15 +94,10 @@ void gdImageFilledEllipse (gdImagePtr im, int mx, int my, int w, int h, int c)
if(old_y2!=my2){ if(old_y2!=my2){
for(i=mx1;i<=mx2;i++){ for(i=mx1;i<=mx2;i++){
gdImageSetPixel(im,i,my1,c); gdImageSetPixel(im,i,my1,c);
}
}
if(old_y2!=my2){
for(i=mx1;i<=mx2;i++){
gdImageSetPixel(im,i,my2,c); gdImageSetPixel(im,i,my2,c);
} }
} }
old_y2 = my2; old_y2 = my2;
old_y1 = my1;
} }
} }

25
ext/gd/tests/imagefilledellipse_basic.phpt Normal file
View file

@ -0,0 +1,25 @@
--TEST--
Testing imagefilledellipse() of GD library
--SKIPIF--
<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
<?php
$image = imagecreatetruecolor(100, 100);
$white = imagecolorallocate($image, 0xFF, 0xFF, 0xFF);
//create an ellipse and fill it with white color
imagefilledellipse($image, 50, 50, 40, 30, $white);
ob_start();
imagepng($image);
$img = ob_get_contents();
ob_end_clean();
echo md5(base64_encode($img));
?>
--EXPECT--
9ba540bba1b78c9f08efaa6fa0afd93b