mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-25 10:54:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert patch to imagefillborder.

Browse Source
This commit is contained in:
Ilia Alshanetsky 2004-03-22 17:26:03 +00:00
parent 34667c4b58
commit fc419f10ef
1 changed files with 55 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
ext/gd/libgd/gd.c
View File

@ -1757,7 +1757,10 @@ void gdImageFilledEllipse (gdImagePtr im, int mx, int my, int w, int h, int c)
void gdImageFillToBorder (gdImagePtr im, int x, int y, int border, int color)
{
int i, j, restoreAlphaBleding = 0;
int lastBorder;
/* Seek left */
int leftLimit = -1, rightLimit;
int i, restoreAlphaBleding=0;
if (border < 0) {
/* Refuse to fill to a non-solid border */
@ -1776,16 +1779,61 @@ void gdImageFillToBorder (gdImagePtr im, int x, int y, int border, int color)
y = im->sy - 1;
}
for (i = x; i < im->sx; i++) {
for (j = y; j < im->sy; j++) {
int c = gdImageGetPixel(im, i, j);
if (c == border || c == color) {
continue;
for (i = x; i >= 0; i--) {
if (gdImageGetPixel(im, i, y) == border) {
break;
}
gdImageSetPixel(im, i, y, color);
leftLimit = i;
}
if (leftLimit == -1) {
if (restoreAlphaBleding) {
im->alphaBlendingFlag = 1;
}
return;
}
/* Seek right */
rightLimit = x;
for (i = (x + 1); i < im->sx; i++) {
if (gdImageGetPixel(im, i, y) == border) {
break;
}
gdImageSetPixel(im, i, y, color);
rightLimit = i;
}
/* Look at lines above and below and start paints */
/* Above */
if (y > 0) {
lastBorder = 1;
for (i = leftLimit; i <= rightLimit; i++) {
int c = gdImageGetPixel(im, i, y - 1);
if (lastBorder) {
if ((c != border) && (c != color)) {
gdImageFillToBorder(im, i, y - 1, border, color);
lastBorder = 0;
}
} else if ((c == border) || (c == color)) {
lastBorder = 1;
}
gdImageSetPixel(im, i, j, color);
}
}
/* Below */
if (y < ((im->sy) - 1)) {
lastBorder = 1;
for (i = leftLimit; i <= rightLimit; i++) {
int c = gdImageGetPixel(im, i, y + 1);
if (lastBorder) {
if ((c != border) && (c != color)) {
gdImageFillToBorder(im, i, y + 1, border, color);
lastBorder = 0;
}
} else if ((c == border) || (c == color)) {
lastBorder = 1;
}
}
}
if (restoreAlphaBleding) {
im->alphaBlendingFlag = 1;
}