diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2019-11-21 10:02:12 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-11-21 10:02:33 +0100 |
| commit | b78ec58f0919aca0c136ad6200ab2a8742c3dadf (patch) | |
| tree | 6ed7835f460ed7061d5ae87623724d7ebe96e3a1 | |
| parent | 00df73c30db7b3ee77462a0628e633f3d6bdb0c6 (diff) | |
| parent | b4f501d5a421a0861a9464b9352b40927bbabd78 (diff) | |
| download | php-git-b78ec58f0919aca0c136ad6200ab2a8742c3dadf.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #78849: GD build broken with -D SIGNED_COMPARE_SLOW
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | ext/gd/libgd/gd_gif_out.c | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -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) diff --git a/ext/gd/libgd/gd_gif_out.c b/ext/gd/libgd/gd_gif_out.c index 60f34ddc27..912769128b 100644 --- a/ext/gd/libgd/gd_gif_out.c +++ b/ext/gd/libgd/gd_gif_out.c @@ -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*/ |