diff options
| author | Remi Collet <remi@php.net> | 2013-04-25 06:41:01 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2013-04-25 06:41:01 +0200 |
| commit | b0cf340eefbd8a59993792e8721281fa2a113cdd (patch) | |
| tree | b62af796ade654acdb7a59ae4e7f264773525a39 /ext/gd/libgd/gd.h | |
| parent | dec5324d5e63a7537f091e73eabb88517da1468e (diff) | |
| parent | 182fef46a989fa1f8d4ea1a7e3e22040f04e7c51 (diff) | |
| download | php-git-b0cf340eefbd8a59993792e8721281fa2a113cdd.tar.gz | |
Merge branch 'PHP-5.5'
* PHP-5.5:
Fixed bug #64707 missing declaration after dd0399f
Diffstat (limited to 'ext/gd/libgd/gd.h')
| -rw-r--r-- | ext/gd/libgd/gd.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/gd/libgd/gd.h b/ext/gd/libgd/gd.h index 886160fc31..20156b97b5 100644 --- a/ext/gd/libgd/gd.h +++ b/ext/gd/libgd/gd.h @@ -366,6 +366,8 @@ gdImagePtr gdImageCreateFromJpeg(FILE *infile); gdImagePtr gdImageCreateFromJpegEx(FILE *infile, int ignore_warning); gdImagePtr gdImageCreateFromJpegCtx(gdIOCtx *infile); gdImagePtr gdImageCreateFromJpegCtxEx(gdIOCtx *infile, int ignore_warning); +gdImagePtr gdImageCreateFromJpegPtr (int size, void *data); +gdImagePtr gdImageCreateFromJpegPtrEx (int size, void *data, int ignore_warning); gdImagePtr gdImageCreateFromWebp(FILE *fd); gdImagePtr gdImageCreateFromWebpCtx(gdIOCtxPtr in); gdImagePtr gdImageCreateFromWebpPtr (int size, void *data); |