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

Merge branch 'PHP-7.3'

Browse source 
* PHP-7.3:
  Fix #77198: auto cropping has insufficient precision
This commit is contained in:
Christoph M. Becker 2018-11-25 15:57:25 +01:00
commit 65b34bfa1e
3 changed files with 113 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

40
ext/gd/libgd/gd_crop.c
View file

@ -127,30 +127,24 @@ gdImagePtr gdImageCropAuto(gdImagePtr im, const unsigned int mode)
} }
} }
/* Nothing to do > bye /* Whole image would be cropped > bye */
* Duplicate the image? if (match) {
*/
if (y == height - 1) {
return NULL; return NULL;
} }
crop.y = y -1; crop.y = y - 1;
match = 1; match = 1;
for (y = height - 1; match && y >= 0; y--) { for (y = height - 1; match && y >= 0; y--) {
for (x = 0; match && x < width; x++) { for (x = 0; match && x < width; x++) {
match = (color == gdImageGetPixel(im, x,y)); match = (color == gdImageGetPixel(im, x,y));
} }
} }
if (y == 0) {
crop.height = height - crop.y + 1;
} else {
crop.height = y - crop.y + 2; crop.height = y - crop.y + 2;
}
match = 1; match = 1;
for (x = 0; match && x < width; x++) { for (x = 0; match && x < width; x++) {
for (y = 0; match && y < crop.y + crop.height - 1; y++) { for (y = 0; match && y < crop.y + crop.height; y++) {
match = (color == gdImageGetPixel(im, x,y)); match = (color == gdImageGetPixel(im, x,y));
} }
} }
@ -158,12 +152,13 @@ gdImagePtr gdImageCropAuto(gdImagePtr im, const unsigned int mode)
match = 1; match = 1;
for (x = width - 1; match && x >= 0; x--) { for (x = width - 1; match && x >= 0; x--) {
for (y = 0; match && y < crop.y + crop.height - 1; y++) { for (y = 0; match && y < crop.y + crop.height; y++) {
match = (color == gdImageGetPixel(im, x,y)); match = (color == gdImageGetPixel(im, x,y));
} }
} }
crop.width = x - crop.x + 2; crop.width = x - crop.x + 2;
if (crop.x <= 0 || crop.y <= 0 || crop.width <= 0 || crop.height <= 0) {
if (crop.x < 0 || crop.y < 0 || crop.width <= 0 || crop.height <= 0) {
return NULL; return NULL;
} }
return gdImageCrop(im, &crop); return gdImageCrop(im, &crop);
@ -222,31 +217,24 @@ gdImagePtr gdImageCropThreshold(gdImagePtr im, const unsigned int color, const f
} }
} }
/* Pierre /* Whole image would be cropped > bye */
* Nothing to do > bye if (match) {
* Duplicate the image?
*/
if (y == height - 1) {
return NULL; return NULL;
} }
crop.y = y -1; crop.y = y - 1;
match = 1; match = 1;
for (y = height - 1; match && y >= 0; y--) { for (y = height - 1; match && y >= 0; y--) {
for (x = 0; match && x < width; x++) { for (x = 0; match && x < width; x++) {
match = (gdColorMatch(im, color, gdImageGetPixel(im, x, y), threshold)) > 0; match = (gdColorMatch(im, color, gdImageGetPixel(im, x, y), threshold)) > 0;
} }
} }
if (y == 0) {
crop.height = height - crop.y + 1;
} else {
crop.height = y - crop.y + 2; crop.height = y - crop.y + 2;
}
match = 1; match = 1;
for (x = 0; match && x < width; x++) { for (x = 0; match && x < width; x++) {
for (y = 0; match && y < crop.y + crop.height - 1; y++) { for (y = 0; match && y < crop.y + crop.height; y++) {
match = (gdColorMatch(im, color, gdImageGetPixel(im, x,y), threshold)) > 0; match = (gdColorMatch(im, color, gdImageGetPixel(im, x,y), threshold)) > 0;
} }
} }
@ -254,7 +242,7 @@ gdImagePtr gdImageCropThreshold(gdImagePtr im, const unsigned int color, const f
match = 1; match = 1;
for (x = width - 1; match && x >= 0; x--) { for (x = width - 1; match && x >= 0; x--) {
for (y = 0; match && y < crop.y + crop.height - 1; y++) { for (y = 0; match && y < crop.y + crop.height; y++) {
match = (gdColorMatch(im, color, gdImageGetPixel(im, x,y), threshold)) > 0; match = (gdColorMatch(im, color, gdImageGetPixel(im, x,y), threshold)) > 0;
} }
} }

50
ext/gd/tests/bug77198_auto.phpt Normal file
View file

@ -0,0 +1,50 @@
--TEST--
Bug #77198 (auto cropping has insufficient precision)
--SKIPIF--
<?php
if (!extension_loaded('gd')) die('skip gd extension not available');
if (!GD_BUNDLED) die('upstream bugfix has not been released');
?>
--FILE--
<?php
function createWhiteImageWithBlackPixelAt($x, $y)
{
$im = imagecreatetruecolor(8, 8);
imagefilledrectangle($im, 0, 0, 7, 7, 0xffffff);
imagesetpixel($im, $x, $y, 0x000000);
return $im;
}
for ($y = 0; $y < 8; $y++) {
for ($x = 0; $x < 8; $x++) {
if (($x == 0 && ($y == 0 || $y == 7)) || ($x == 7 && ($y == 0 || $y == 7))) {
continue; // skip the corners
}
$orig = createWhiteImageWithBlackPixelAt($x, $y);
$cropped = imagecropauto($orig, IMG_CROP_SIDES);
if (!$cropped) {
printf("Pixel at %d, %d: unexpected NULL crop\n", $x, $y);
} else {
$width = imagesx($cropped);
if ($width !== 1) {
printf("Pixel at %d, %d: unexpected width (%d)\n", $x, $y, $width);
}
$height = imagesy($cropped);
if ($height !== 1) {
printf("Pixel at %d, %d: unexpected height (%d)\n", $x, $y, $height);
}
$color = imagecolorat($cropped, 0, 0);
if ($color !== 0x000000) {
printf("Pixel at %d, %d: unexpected color (%d)\n", $x, $y, $color);
}
imagedestroy($cropped);
}
imagedestroy($orig);
}
}
?>
===DONE===
--EXPECT--
===DONE===

47
ext/gd/tests/bug77198_threshold.phpt Normal file
View file

@ -0,0 +1,47 @@
--TEST--
Bug #77198 (threshold cropping has insufficient precision)
--SKIPIF--
<?php
if (!extension_loaded('gd')) die('skip gd extension not available');
if (!GD_BUNDLED) die('upstream bugfix has not been released');
?>
--FILE--
<?php
function createWhiteImageWithBlackPixelAt($x, $y)
{
$im = imagecreatetruecolor(8, 8);
imagefilledrectangle($im, 0, 0, 7, 7, 0xffffff);
imagesetpixel($im, $x, $y, 0x000000);
return $im;
}
for ($y = 0; $y < 8; $y++) {
for ($x = 0; $x < 8; $x++) {
$orig = createWhiteImageWithBlackPixelAt($x, $y);
$cropped = imagecropauto($orig, IMG_CROP_THRESHOLD, 1, 0xffffff);
if (!$cropped) {
printf("Pixel at %d, %d: unexpected NULL crop\n", $x, $y);
} else {
$width = imagesx($cropped);
if ($width !== 1) {
printf("Pixel at %d, %d: unexpected width (%d)\n", $x, $y, $width);
}
$height = imagesy($cropped);
if ($height !== 1) {
printf("Pixel at %d, %d: unexpected height (%d)\n", $x, $y, $height);
}
$color = imagecolorat($cropped, 0, 0);
if ($color !== 0x000000) {
printf("Pixel at %d, %d: unexpected color (%d)\n", $x, $y, $color);
}
imagedestroy($cropped);
}
imagedestroy($orig);
}
}
?>
===DONE===
--EXPECT--
===DONE===