Skip to content

Commit d795a6b

Browse files
cmb69cmb69
committed
Implement #52857: Access to gdImageSetClip() and gdImageGetClip()
We add the necessary PHP bindings for both functions which are available as of GD_2_0_12 (released 2006-04-05). The API of imagegetclip() is modelled according to imageftbbox().
1 parent 3bfea88 commit d795a6b

File tree

4 files changed

+127
-0
lines changed

4 files changed

+127
-0
lines changed

‎ext/gd/gd.c‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -685,6 +685,18 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagesy, 0)
685685
ZEND_ARG_INFO(0, im)
686686
ZEND_END_ARG_INFO()
687687

688+
ZEND_BEGIN_ARG_INFO(arginfo_imagesetclip, 0)
689+
ZEND_ARG_INFO(0, im)
690+
ZEND_ARG_INFO(0, x1)
691+
ZEND_ARG_INFO(0, y1)
692+
ZEND_ARG_INFO(0, x2)
693+
ZEND_ARG_INFO(0, y2)
694+
ZEND_END_ARG_INFO()
695+
696+
ZEND_BEGIN_ARG_INFO(arginfo_imagegetclip, 0)
697+
ZEND_ARG_INFO(0, im)
698+
ZEND_END_ARG_INFO()
699+
688700
#ifdef ENABLE_GD_TTF
689701
#if HAVE_LIBFREETYPE
690702
ZEND_BEGIN_ARG_INFO_EX(arginfo_imageftbbox, 0, 0, 4)
@@ -936,6 +948,8 @@ const zend_function_entry gd_functions[] = {
936948
PHP_FE(imagestringup, arginfo_imagestringup)
937949
PHP_FE(imagesx, arginfo_imagesx)
938950
PHP_FE(imagesy, arginfo_imagesy)
951+
PHP_FE(imagesetclip, arginfo_imagesetclip)
952+
PHP_FE(imagegetclip, arginfo_imagegetclip)
939953
PHP_FE(imagedashedline, arginfo_imagedashedline)
940954

941955
#ifdef ENABLE_GD_TTF
@@ -3797,6 +3811,53 @@ PHP_FUNCTION(imagesy)
37973811
}
37983812
/* }}} */
37993813

3814+
/* {{{ proto bool imagesetclip(resource im, int x1, int y1, int x2, int y2)
3815+
Set the clipping rectangle. */
3816+
PHP_FUNCTION(imagesetclip)
3817+
{
3818+
zval *im_zval;
3819+
gdImagePtr im;
3820+
zend_long x1, y1, x2, y2;
3821+
3822+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rllll", &im_zval, &x1, &y1, &x2, &y2) == FAILURE) {
3823+
return;
3824+
}
3825+
3826+
if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(im_zval), "Image", le_gd)) == NULL) {
3827+
RETURN_FALSE;
3828+
}
3829+
3830+
gdImageSetClip(im, x1, y1, x2, y2);
3831+
RETURN_TRUE;
3832+
}
3833+
/* }}} */
3834+
3835+
/* {{{ proto array imagegetclip(resource im)
3836+
Get the clipping rectangle. */
3837+
PHP_FUNCTION(imagegetclip)
3838+
{
3839+
zval *im_zval;
3840+
gdImagePtr im;
3841+
int x1, y1, x2, y2;
3842+
3843+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &im_zval) == FAILURE) {
3844+
return;
3845+
}
3846+
3847+
if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(im_zval), "Image", le_gd)) == NULL) {
3848+
RETURN_FALSE;
3849+
}
3850+
3851+
gdImageGetClip(im, &x1, &y1, &x2, &y2);
3852+
3853+
array_init(return_value);
3854+
add_next_index_long(return_value, x1);
3855+
add_next_index_long(return_value, y1);
3856+
add_next_index_long(return_value, x2);
3857+
add_next_index_long(return_value, y2);
3858+
}
3859+
/* }}} */
3860+
38003861
#ifdef ENABLE_GD_TTF
38013862
#define TTFTEXT_DRAW 0
38023863
#define TTFTEXT_BBOX 1

‎ext/gd/php_gd.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,8 @@ PHP_FUNCTION(imagestring);
182182
PHP_FUNCTION(imagestringup);
183183
PHP_FUNCTION(imagesx);
184184
PHP_FUNCTION(imagesy);
185+
PHP_FUNCTION(imagesetclip);
186+
PHP_FUNCTION(imagegetclip);
185187
PHP_FUNCTION(imagedashedline);
186188
PHP_FUNCTION(imagettfbbox);
187189
PHP_FUNCTION(imagettftext);

‎ext/gd/tests/imagegetclip_basic.phpt‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
--TEST--
2+
imagegetclip() - basic functionality
3+
--SKIP--
4+
<?php
5+
if (!extension_loaded('gd')) die('skip ext/gd required');
6+
?>
7+
--FILE--
8+
<?php
9+
$im = imagecreate(10, 10);
10+
echo '=== original ===', PHP_EOL;
11+
var_dump(imagegetclip($im));
12+
imagesetclip($im, 1,2, 3,4);
13+
echo '=== after imagesetclip() ===', PHP_EOL;
14+
var_dump(imagegetclip($im));
15+
?>
16+
--EXPECT--
17+
=== original ===
18+
array(4) {
19+
[0]=>
20+
int(0)
21+
[1]=>
22+
int(0)
23+
[2]=>
24+
int(9)
25+
[3]=>
26+
int(9)
27+
}
28+
=== after imagesetclip() ===
29+
array(4) {
30+
[0]=>
31+
int(1)
32+
[1]=>
33+
int(2)
34+
[2]=>
35+
int(3)
36+
[3]=>
37+
int(4)
38+
}

‎ext/gd/tests/imagesetclip_basic.phpt‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
--TEST--
2+
imagesetclip() - basic functionality
3+
--SKIP--
4+
<?php
5+
if (!extension_loaded('gd')) die('skip ext/gd required');
6+
?>
7+
--FILE--
8+
<?php
9+
// draw a clipped diagonal line
10+
$im = imagecreate(100, 100);
11+
imagecolorallocate($im, 0, 0, 0);
12+
$white = imagecolorallocate($im, 255, 255, 255);
13+
imagesetclip($im, 10,10, 89,89);
14+
imageline($im, 0,0, 99,99, $white);
15+
16+
// save image for manual inspection
17+
// imagepng($im, __FILE__ . '.png');
18+
19+
// verify that the clipping has been respected
20+
imagesetclip($im, 0,0, 99,99);
21+
var_dump(imagecolorat($im, 9,9) !== $white);
22+
var_dump(imagecolorat($im, 90,90) !== $white);
23+
?>
24+
--EXPECT--
25+
bool(true)
26+
bool(true)

0 commit comments

Comments
 (0)