diff options
| author | Remi Collet <remi@php.net> | 2013-12-28 14:29:27 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2013-12-28 14:29:27 +0100 |
| commit | 809eb77689fc3c4f960dad3ec85a7d7bfde87ea0 (patch) | |
| tree | 802b7f84c6ba1107196ca30461dfdc6e9c6370fb | |
| parent | 46809869a398ecdacc0b24ef10a34d91b2a2e9d9 (diff) | |
| parent | 464c219ed4ebce6b9196cae308967ac7f7f58bde (diff) | |
| download | php-git-809eb77689fc3c4f960dad3ec85a7d7bfde87ea0.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
minor fix on previous
| -rw-r--r-- | ext/gd/libgd/gd_crop.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/gd/libgd/gd_crop.c b/ext/gd/libgd/gd_crop.c index 90a99a650a..bba425d0e3 100644 --- a/ext/gd/libgd/gd_crop.c +++ b/ext/gd/libgd/gd_crop.c @@ -43,6 +43,7 @@ static int gdColorMatch(gdImagePtr im, int col1, int col2, float threshold); gdImagePtr gdImageCrop(gdImagePtr src, const gdRectPtr crop) { gdImagePtr dst; + int y; /* check size */ if (crop->width<=0 || crop->height<=0) { @@ -78,7 +79,7 @@ gdImagePtr gdImageCrop(gdImagePtr src, const gdRectPtr crop) #if 0 printf("rect->x: %i\nrect->y: %i\nrect->width: %i\nrect->height: %i\n", crop->x, crop->y, crop->width, crop->height); #endif - int y = crop->y; + y = crop->y; if (src->trueColor) { unsigned int dst_y = 0; while (y < (crop->y + (crop->height - 1))) { |