Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #78849: GD build broken with -D SIGNED_COMPARE_SLOW
This commit is contained in:
Christoph M. Becker 2019-11-21 10:02:12 +01:00
commit b78ec58f09
2 changed files with 4 additions and 1 deletions

3
NEWS
View File

@ -7,6 +7,9 @@ PHP NEWS
. Fixed bug #78810 (RW fetches do not throw "uninitialized property"
exception). (Nikita)
- GD:
. Fixed bug #78849 (GD build broken with -D SIGNED_COMPARE_SLOW). (cmb)
- FPM:
. Fixed bug #76601 (Partially working php-fpm ater incomplete reload).
(Maksim Nikulin)

View File

@ -548,7 +548,7 @@ compress(int init_bits, gdIOCtxPtr outfile, gdImagePtr im, GifCtx *ctx)
output( (code_int)ctx->ClearCode, ctx );
#ifdef SIGNED_COMPARE_SLOW
while ( (c = GIFNextPixel( im )) != (unsigned) EOF ) {
while ( (c = GIFNextPixel( im, ctx )) != (unsigned) EOF ) {
#else /*SIGNED_COMPARE_SLOW*/
while ( (c = GIFNextPixel( im, ctx )) != EOF ) { /* } */
#endif /*SIGNED_COMPARE_SLOW*/