diff options
| author | Remi Collet <remi@php.net> | 2013-12-28 14:29:38 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2013-12-28 14:29:38 +0100 |
| commit | bd3e5aab1d675df9bf066d4900e99e78c8eb5564 (patch) | |
| tree | 621b58e9f3875239b4addc59d6d263613cfd9bd3 /ext | |
| parent | 8785e22bca722c37ef692b13b34609a4ea0e08d2 (diff) | |
| parent | 809eb77689fc3c4f960dad3ec85a7d7bfde87ea0 (diff) | |
| download | php-git-bd3e5aab1d675df9bf066d4900e99e78c8eb5564.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
minor fix on previous
Diffstat (limited to 'ext')
| -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))) { |