summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2019-11-21 09:49:29 +0100
committerChristoph M. Becker <cmbecker69@gmx.de>2019-11-21 09:59:26 +0100
commit9b92c1d15415de0cdb14c8cf7b7575238ce380ca (patch)
treeb4dd147898b08b1872056bb0f6b96e087579215f
parentf6eac76b65e95b8b0f2c50f21cdf742215fe9b23 (diff)
downloadphp-git-9b92c1d15415de0cdb14c8cf7b7575238ce380ca.tar.gz
Fix #78849: GD build broken with -D SIGNED_COMPARE_SLOW
Apparently, this has not been tested for a long time, and might be a refactoring relict. Anyhow, we have to pass the context to `GIFNextPixel` as well.
-rw-r--r--NEWS3
-rw-r--r--ext/gd/libgd/gd_gif_out.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index ecec337379..c3d4783ebe 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,9 @@ PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2019, PHP 7.2.26
+- GD:
+ . Fixed bug #78849 (GD build broken with -D SIGNED_COMPARE_SLOW). (cmb)
+
- Intl:
. Fixed bug #78804 (Segmentation fault in Locale::filterMatches). (Stas)
diff --git a/ext/gd/libgd/gd_gif_out.c b/ext/gd/libgd/gd_gif_out.c
index cd4ea1529b..c0a0433f4d 100644
--- a/ext/gd/libgd/gd_gif_out.c
+++ b/ext/gd/libgd/gd_gif_out.c
@@ -534,7 +534,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*/