archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 13:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.4'

Browse source 
* PHP-8.4:
  Fix GH-17373: imagefttext() ignores clipping rect for palette images
This commit is contained in:
Christoph M. Becker 2025-01-06 14:59:38 +01:00
commit cc84d271ea
No known key found for this signature in database
GPG key ID: D66C9593118BCCB6
2 changed files with 28 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ext/gd/libgd/gdft.c
View file

@ -720,7 +720,7 @@ static char * gdft_draw_bitmap (gdCache_head_t *tc_cache, gdImage * im, int fg,
y = pen_y + row;
/* clip if out of bounds */
if (y >= im->sy || y < 0) {
if (y > im->cy2 || y < im->cy1) {
continue;
}
@ -743,7 +743,7 @@ static char * gdft_draw_bitmap (gdCache_head_t *tc_cache, gdImage * im, int fg,
x = pen_x + col;
/* clip if out of bounds */
if (x >= im->sx || x < 0) {
if (x > im->cx2 || x < im->cx1) {
continue;
}
/* get pixel location in gd buffer */

26
ext/gd/tests/gh17373.phpt Normal file
View file

@ -0,0 +1,26 @@
--TEST--
Bug GH-17373 (imagefttext() ignores clipping rect for palette images)
--EXTENSIONS--
gd
--FILE--
<?php
$im = imagecreate(64, 32);
$bg = imagecolorallocate($im, 0, 0, 0);
$fg = imagecolorallocate($im, 255, 255, 255);
imagefilledrectangle($im, 0, 0, 63, 31, $bg);
imagesetclip($im, 32, 0, 63, 31);
imagefttext($im, 16, 0, 10, 23, $fg, __DIR__ . "/Tuffy.ttf", "hello");
imagesetclip($im, 0, 0, 63, 31);
$count = 0;
for ($j = 0; $j < 31; $j++) {
for ($i = 0; $i < 31; $i++) {
if (imagecolorat($im, $i, $j) !== $bg) {
$count++;
}
}
}
var_dump($count);
?>
--EXPECT--
int(0)