archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-17 22:48:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
135288 commits 526 branches 1434 tags 873 MiB
Commit graph

789 commits

Author SHA1 Message Date
Peter Kokot
ba8633a9ce
Use fabsf() and floorf() unconditionally in bundled libgd (#13624) 
These are available since C99 with math.h also on Windows, without
requiring checking. Upstream libgd uses floorf() unconditionally and
doesn't use fabsf().
 2024-03-08 19:28:52 +01:00
Peter Kokot
b41a5023f9
Remove malloc.h (#13436) 
This removes the deprecated malloc.h header Autoconf check on *nix
systems and its HAVE_MALLOC_H symbol. It can be replaced mostly with the
stdlib.h. The libgd usptream also doesn't include it anymore.

On Windows, it is still used for some memory allocation functions, but
can be replaced with stdlib.h in the future.
 2024-02-20 18:02:54 +01:00
Niels Dossche
b06fedb41d Merge branch 'PHP-8.3' 
* PHP-8.3:
  Fix GH-10614: imagerotate will turn the picture all black, when rotated 90
 2024-01-26 18:16:29 +01:00
Niels Dossche
b76ef301a0 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix GH-10614: imagerotate will turn the picture all black, when rotated 90
 2024-01-26 18:16:21 +01:00
Niels Dossche
f26dd1354b Fix GH-10614: imagerotate will turn the picture all black, when rotated 90 
This is a backport of the upstream libgd PR that was recently committed
[1].

[1] https://github.com/libgd/libgd/pull/862

Closes GH-13246.
 2024-01-26 18:15:52 +01:00
Niels Dossche
b8ff8c04f8 Merge branch 'PHP-8.3' 
* PHP-8.3:
  Fix GH-10344: imagettfbbox(): Could not find/open font UNC path
  Fix GH-13037: PharData incorrectly extracts zip file
 2024-01-25 20:07:52 +01:00
Niels Dossche
78986a6734 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix GH-10344: imagettfbbox(): Could not find/open font UNC path
  Fix GH-13037: PharData incorrectly extracts zip file
 2024-01-25 20:07:33 +01:00
Niels Dossche
4a48729438 Fix GH-10344: imagettfbbox(): Could not find/open font UNC path 
libgd uses an incorrect absolute path check in gdft.c.
It checks if either the path starts with a '/' (only valid on Posix
btw), or whether it contains something of the form C:\ or C:/.
However, this overlooks the possibility of using UNC paths on Windows.
As we already do PHP-specific stuff with VCWD_ macros, use
IS_ABSOLUTE_PATH to check for an absolute path which will take into
account UNC paths as well.

Closes GH-13241.
 2024-01-25 20:06:28 +01:00
Ilija Tovilo
692cea5cbc
Use zend_error_noreturn for E_ERROR consistently 
To be clear, these already don't return. zend_error_noreturn just hints at this
fact through the ZEND_NORETURN attribute.

Closes GH-12204
 2023-09-14 11:44:55 +02:00
Javier Eguiluz
732d92c0e5
[skip ci] Fix various typos and grammar issues (#11143) 2023-04-28 11:05:32 +02:00
Christoph M. Becker
b78c087b32
Fix typo (Paletter → Palette) 
This also aligns the error message with upstream[1].

[1] <https://github.com/libgd/libgd/blob/gd-2.3.3/src/gd_webp.c#L182>

Closes GH-9414.
 2022-08-24 13:40:16 +02:00
Christoph M. Becker
98a4ab2266
Merge branch 'PHP-8.1' 
* PHP-8.1:
  Fix imagecreatefromavif() memory leak
 2022-06-17 17:31:48 +02:00
Christoph M. Becker
036bed01ce
Fix imagecreatefromavif() memory leak 
This has been reported as https://github.com/libgd/libgd/issues/831.
We port the respective fix to our bundled libgd.

Closes GH-8812.
 2022-06-17 17:30:57 +02:00
Christoph M. Becker
0052af2a67
Merge branch 'PHP-8.1' 
* PHP-8.1:
  Fixed libpng warning when loading interlaced images
 2022-02-08 10:48:58 +01:00
Christoph M. Becker
4a630e67e9
Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fixed libpng warning when loading interlaced images
 2022-02-08 10:48:21 +01:00
Brett
1d48da6da5
Fixed libpng warning when loading interlaced images 
We enable interlace transform when reading png.

Closes GH-8002.
 2022-02-08 10:46:50 +01:00
Christoph M. Becker
243966177e
Use the standard _WIN32 instead of the custom MSWIN32 in libgd 
We're already checking `_WIN32` elsewhere in our bundled libgd, so it
makes no sense to also have a custom `MSWIN32`.

Closes GH-7682.
 2021-11-24 15:38:28 +01:00
Christoph M. Becker
7f2533d065
Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix #71316: libpng warning from imagecreatefromstring
 2021-11-04 11:21:10 +01:00
Christoph M. Becker
f22f4afd84
Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Fix #71316: libpng warning from imagecreatefromstring
 2021-11-04 11:19:24 +01:00
Christoph M. Becker
1919c4b44d
Fix #71316: libpng warning from imagecreatefromstring 
We backport the respective upstream fix[1] to our bundled libgd.

[1] <636100b928>

Closes GH-7615.
 2021-11-04 11:16:45 +01:00
Christoph M. Becker
67131e453b
Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix gdAlphaMax limit typo
 2021-09-23 23:20:00 +02:00
Christoph M. Becker
c0dcd141a8
Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Fix gdAlphaMax limit typo
 2021-09-23 23:18:52 +02:00
Michael Voříšek
2c3dfe5160
Fix gdAlphaMax limit typo 
Closes GH-7410.
 2021-09-23 23:16:40 +02:00
Christoph M. Becker
c95e036813
Merge branch 'PHP-8.0' 
* PHP-8.0:
  Fix #53580: During resize gdImageCopyResampled cause colors change
 2021-08-26 18:44:04 +02:00
Christoph M. Becker
35e1f134f5
Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Fix #53580: During resize gdImageCopyResampled cause colors change
 2021-08-26 18:41:08 +02:00
Christoph M. Becker
526407ca35
Fix #53580: During resize gdImageCopyResampled cause colors change 
We port the upstream fix[1], and also revert commit a3383ac3d7[2] which
is now obsolete, and also not part of libgd.  Especially the change to
gd.png.c was at best a half-baked optimization.

[1] <a24e96f019>
[2] <a3383ac3d7>

Closes GH-7402.
 2021-08-26 18:38:17 +02:00
Ben Morss
eb6c9eb936
Lossless conversion for webp 
Propagating lossless conversion from libgd to our bundled gd.
Changing "quantization" to "quality" as in libgd.
Adding test.

IMG_WEBP_LOSSLESS is only defined, if lossless WebP encoding is
supported by the libgd used.

Closes GH-7348.
 2021-08-12 23:19:13 +02:00
Ben Morss
e0e2e9a547
Disable strict pixi requirement for libavif >= 0.9.1 
Some AVIF image generators didn't include the PixelInformationProperty
(pixi), even though strictly speaking they should. In v0.9.2, libavif
began requiring this. Let's disable it so we can read those images too.

We also remove xfail from test on FreeBSD.

Closes GH-7253.
 2021-08-06 20:24:59 +02:00
Christoph M. Becker
c2b017a96d
Merge branch 'PHP-8.0' 
* PHP-8.0:
  Fix #51498: imagefilledellipse does not work for large circles
 2021-08-03 16:22:22 +02:00
Christoph M. Becker
213ad544e4
Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Fix #51498: imagefilledellipse does not work for large circles
 2021-08-03 16:20:16 +02:00
Christoph M. Becker
c565555f03
Fix #51498: imagefilledellipse does not work for large circles 
We backport the respective upstream fix[1].

[1] <ace7fd88dc>

Closes GH-7329.
 2021-08-03 16:17:47 +02:00
Javier Eguiluz
70872dde94 Remove a redundant expression 2021-08-02 21:51:26 +02:00
Javier Eguiluz
7c9ac479eb Fix some mismatches in preprocessor directive comments 2021-08-02 11:18:36 +02:00
Andy Postnikov
bb9ef2bedb Backport libgd commit 
Source - f6a111c632
Related to https://github.com/php/php-src/pull/5127#issuecomment-884032991
 2021-07-22 09:57:41 +02:00
Ben Morss
cee33bab16
AVIF support for getimagesize() and imagecreatefromstring() 
Thanks to Joe Drago for help with the AVIF detection code.

Co-authored-by: Nikita Popov <nikita.ppv@googlemail.com>
Co-authored-by: Christoph M. Becker <cmbecker69@gmx.de>

Closes GH-7091.
 2021-07-07 00:02:57 +02:00
Ben Morss
81f6d36c90 Add avif support to ext/gd 
This backports avif support from upstream libgd into bundled libgd
and exposes the functionality through new imagecreatefromavif()
and imageavif() functions.

Closes GH-7026.

Co-authored-by: Christoph M. Becker <cmbecker69@gmx.de>
 2021-06-10 12:32:30 +02:00
Christoph M. Becker
3f890635ae
Merge branch 'PHP-8.0' 
* PHP-8.0:
  Fix #81032: GD install is affected by external libgd installation
 2021-05-14 12:28:36 +02:00
Christoph M. Becker
c455f49a6a
Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Fix #81032: GD install is affected by external libgd installation
 2021-05-14 12:26:40 +02:00
Flavio Heleno
28e7addb9d
Fix #81032: GD install is affected by external libgd installation 
This PR replaces the bundled libgd includes from #include <foo.h> with
#include "foo.h" for gd-related headers to avoid including headers that
may be available in system directories instead of the expected local
headers.

Closes GH-6975.
 2021-05-14 12:24:45 +02:00
George Peter Banyard
c40231afbf
Mark various functions with void arguments. 
This fixes a bunch of [-Wstrict-prototypes] warning,
because in C func() and func(void) have different semantics.
 2021-05-12 14:55:53 +01:00
KsaR
01b3fc03c3
Update http->https in license (#6945) 
1. Update: http://www.php.net/license/3_01.txt to https, as there is anyway server header "Location:" to https.
2. Update few license 3.0 to 3.01 as 3.0 states "php 5.1.1, 4.1.1, and earlier".
3. In some license comments is "at through the world-wide-web" while most is without "at", so deleted.
4. fixed indentation in some files before |
 2021-05-06 12:16:35 +02:00
George Peter Banyard
5caaf40b43
Introduce pseudo-keyword ZEND_FALLTHROUGH 
And use it instead of comments
 2021-04-07 00:46:29 +01:00
Christoph M. Becker
ecf4e7063d Merge branch 'PHP-7.4' into master 
* PHP-7.4:
  Fix potential integer overflow detected by oss-fuzz
 2020-08-24 17:38:50 +02:00
Christoph M. Becker
5dd1877ca1 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix potential integer overflow detected by oss-fuzz
 2020-08-24 17:36:50 +02:00
Christoph M. Becker
74de17f2ea Fix potential integer overflow detected by oss-fuzz 
We port the respective fix from upstream[1].

[1] <9ed642764c>
 2020-08-24 17:35:04 +02:00
Nikita Popov
ca48129cae Return void from php_jpeg_emit_message() 
Instead of returning long and then casting to void.

This fixes a build warning on Ubuntu 20.04.

Closes GH-5742.
 2020-06-19 16:59:29 +02:00
Christoph M. Becker
b7a55aaff2 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix #79676: imagescale adds black border with IMG_BICUBIC
 2020-06-12 14:09:16 +02:00
Christoph M. Becker
ff7fd3dc85 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #79676: imagescale adds black border with IMG_BICUBIC
 2020-06-12 14:07:43 +02:00
Christoph M. Becker
86e1f0ea11 Fix #79676: imagescale adds black border with IMG_BICUBIC 
We have to loop over all image pixels to avoid the black border.  This
is also done in external libgd in `_gdScaleOneAxis` and `_gdScalePass`.
 2020-06-12 14:05:54 +02:00
Christoph M. Becker
7f51f43509 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix #79615: Wrong GIF header written in GD GIFEncode
 2020-05-22 09:22:38 +02:00