Skip to content

Commit 2a305b3

Browse files
cmb69cmb69
committed
Implement request #33066: Add GD Image Function gdImageOpenPolygon()
gdImageOpenPolygon() has been introduced with líbgd 2.0.29, so we finally add a PHP binding for it, and port the respective libgd functionality to PHP's bundled libgd.
1 parent 82a8e57 commit 2a305b3

6 files changed

Lines changed: 69 additions & 5 deletions

File tree

‎ext/gd/gd.c‎

Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -578,6 +578,13 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagepolygon, 0)
578578
ZEND_ARG_INFO(0, col)
579579
ZEND_END_ARG_INFO()
580580

581+
ZEND_BEGIN_ARG_INFO(arginfo_imageopenpolygon, 0)
582+
ZEND_ARG_INFO(0, im)
583+
ZEND_ARG_INFO(0, points) /* ARRAY_INFO(0, points, 0) */
584+
ZEND_ARG_INFO(0, num_pos)
585+
ZEND_ARG_INFO(0, col)
586+
ZEND_END_ARG_INFO()
587+
581588
ZEND_BEGIN_ARG_INFO(arginfo_imagefilledpolygon, 0)
582589
ZEND_ARG_INFO(0, im)
583590
ZEND_ARG_INFO(0, points) /* ARRAY_INFO(0, points, 0) */
@@ -938,6 +945,7 @@ const zend_function_entry gd_functions[] = {
938945
PHP_FE(imageline, arginfo_imageline)
939946
PHP_FE(imageloadfont, arginfo_imageloadfont)
940947
PHP_FE(imagepolygon, arginfo_imagepolygon)
948+
PHP_FE(imageopenpolygon, arginfo_imageopenpolygon)
941949
PHP_FE(imagerectangle, arginfo_imagerectangle)
942950
PHP_FE(imagesetpixel, arginfo_imagesetpixel)
943951
PHP_FE(imagestring, arginfo_imagestring)
@@ -3346,6 +3354,7 @@ PHP_FUNCTION(imageinterlace)
33463354
/* }}} */
33473355

33483356
/* {{{ php_imagepolygon
3357+
arg = -1 open polygon
33493358
arg = 0 normal polygon
33503359
arg = 1 filled polygon */
33513360
/* im, points, num_points, col */
@@ -3398,10 +3407,16 @@ static void php_imagepolygon(INTERNAL_FUNCTION_PARAMETERS, int filled)
33983407
gdImageSetAntiAliased(im, col);
33993408
col = gdAntiAliased;
34003409
}
3401-
if (filled) {
3402-
gdImageFilledPolygon(im, points, npoints, col);
3403-
} else {
3404-
gdImagePolygon(im, points, npoints, col);
3410+
switch (filled) {
3411+
case -1:
3412+
gdImageOpenPolygon(im, points, npoints, col);
3413+
break;
3414+
case 0:
3415+
gdImagePolygon(im, points, npoints, col);
3416+
break;
3417+
case 1:
3418+
gdImageFilledPolygon(im, points, npoints, col);
3419+
break;
34053420
}
34063421

34073422
efree(points);
@@ -3417,6 +3432,14 @@ PHP_FUNCTION(imagepolygon)
34173432
}
34183433
/* }}} */
34193434

3435+
/* {{{ proto bool imageopenpolygon(resource im, array point, int num_points, int col)
3436+
Draw a polygon */
3437+
PHP_FUNCTION(imageopenpolygon)
3438+
{
3439+
php_imagepolygon(INTERNAL_FUNCTION_PARAM_PASSTHRU, -1);
3440+
}
3441+
/* }}} */
3442+
34203443
/* {{{ proto bool imagefilledpolygon(resource im, array point, int num_points, int col)
34213444
Draw a filled polygon */
34223445
PHP_FUNCTION(imagefilledpolygon)

‎ext/gd/libgd/gd.c‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2605,6 +2605,17 @@ void gdImageCopyResampled (gdImagePtr dst, gdImagePtr src, int dstX, int dstY, i
26052605
}
26062606

26072607
void gdImagePolygon (gdImagePtr im, gdPointPtr p, int n, int c)
2608+
{
2609+
if (n <= 0) {
2610+
return;
2611+
}
2612+
2613+
2614+
gdImageLine (im, p->x, p->y, p[n - 1].x, p[n - 1].y, c);
2615+
gdImageOpenPolygon (im, p, n, c);
2616+
}
2617+
2618+
void gdImageOpenPolygon (gdImagePtr im, gdPointPtr p, int n, int c)
26082619
{
26092620
int i;
26102621
int lx, ly;
@@ -2615,7 +2626,6 @@ void gdImagePolygon (gdImagePtr im, gdPointPtr p, int n, int c)
26152626

26162627
lx = p->x;
26172628
ly = p->y;
2618-
gdImageLine(im, lx, ly, p[n - 1].x, p[n - 1].y, c);
26192629
for (i = 1; i < n; i++) {
26202630
p++;
26212631
gdImageLine(im, lx, ly, p->x, p->y, c);

‎ext/gd/libgd/gd.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -493,6 +493,7 @@ typedef struct {
493493
} gdPoint, *gdPointPtr;
494494

495495
void gdImagePolygon(gdImagePtr im, gdPointPtr p, int n, int c);
496+
void gdImageOpenPolygon(gdImagePtr im, gdPointPtr p, int n, int c);
496497
void gdImageFilledPolygon(gdImagePtr im, gdPointPtr p, int n, int c);
497498

498499
/* These functions still work with truecolor images,

‎ext/gd/php_gd.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@ PHP_FUNCTION(imageinterlace);
174174
PHP_FUNCTION(imageline);
175175
PHP_FUNCTION(imageloadfont);
176176
PHP_FUNCTION(imagepolygon);
177+
PHP_FUNCTION(imageopenpolygon);
177178
PHP_FUNCTION(imagerectangle);
178179
PHP_FUNCTION(imagesetpixel);
179180
PHP_FUNCTION(imagestring);

‎ext/gd/tests/imageopenpolygon.png‎

1.29 KB
Loading

‎ext/gd/tests/imageopenpolygon_basic.phpt‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
--TEST--
2+
imageopenpolygon(): basic test
3+
--SKIPIF--
4+
<?php
5+
if (!extension_loaded('gd')) die('skip gd extension not available');
6+
?>
7+
--FILE--
8+
<?php
9+
require_once __DIR__ . DIRECTORY_SEPARATOR . 'func.inc';
10+
11+
$im = imagecreatetruecolor(100, 100);
12+
$white = imagecolorallocate($im, 255, 255, 255);
13+
$black = imagecolorallocate($im, 0, 0, 0);
14+
$red = imagecolorallocate($im, 255, 0, 0);
15+
$green = imagecolorallocate($im, 0, 128, 0);
16+
$blue = imagecolorallocate($im, 0, 0, 255);
17+
imagefilledrectangle($im, 0,0, 99,99, $white);
18+
19+
imageopenpolygon($im, [10,10, 49,89, 89,10], 3, $black);
20+
imageopenpolygon($im, [10,89, 35,10, 60,89, 85,10], 4, $red);
21+
imageopenpolygon($im, [10,49, 30,89, 50,10, 70,89, 90,10], 5, $green);
22+
imageopenpolygon($im, [10,50, 25,10, 40,89, 55,10, 80,89, 90,50], 6, $blue);
23+
24+
test_image_equals_file(__DIR__ . DIRECTORY_SEPARATOR . 'imageopenpolygon.png', $im);
25+
?>
26+
===DONE===
27+
--EXPECT--
28+
The images are equal.
29+
===DONE===

0 commit comments

Comments
 (0)