Commit graph

37 commits

Author SHA1 Message Date
Javier Eguiluz
7c9ac479eb Fix some mismatches in preprocessor directive comments 2021-08-02 11:18:36 +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
Nikita Popov
2290102172 Remove safeboolean use in gd_jpeg.c
This is a backport of
e5502c7a3f/src/gd_jpeg.c.
2019-06-11 16:54:45 +02:00
Christoph M. Becker
089f7c0bc2 Sync with upstream
Even though libgd/libgd#492 is not a relevant bug fix for PHP, since
the binding doesn't use the `gdImage*Ptr()` functions at all, we're
porting the fix to stay in sync here.
2019-01-19 11:30:12 +01:00
Christoph M. Becker
caabf3a1bb Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  Fix #77195: Incorrect error handling of imagecreatefromjpeg()
2018-11-24 12:57:44 +01:00
Christoph M. Becker
60a9f7a3a3 Fix #77195: Incorrect error handling of imagecreatefromjpeg()
The broken JPEG image triggers a notice, two warnings and outputs a
message to stderr directly.  The additional notice is pretty useless,
and the direct output to stderr is bad.  Therefore, we port the
relevant differences from upstream to our bundled libgd.  This leaves
us with two warnings; the first one is triggered by libjpeg and shows
the actual problem, the second one is triggered by our libgd wrapper
whenever an image can't be read, what may not have necessarily
triggered a warning before.
2018-11-24 12:52:08 +01:00
Christoph M. Becker
c8ba185cf9 Remove unused function 2018-02-09 17:39:24 +01:00
Christoph M. Becker
432e16cb58 Unify error handling of bundled and external libgd
There's no need anymore to call an own error handler directly. Instead we
register our error handler and call libgd's error functions (which will
forward). We do this regardless of compiling with the bundled or an external
libgd.
2016-10-07 01:13:49 +02:00
Christoph M. Becker
932c20fb8d Port variable image resolution support from libgd 2.1.0
The PHP binding for this feature will be submitted as a separate PR.
2016-09-19 19:00:58 +02:00
Stanislav Malyshev
b7a7b1a624 trailing whitespace removal 2015-01-10 15:07:38 -08:00
Anatol Belski
3f049bcff2 made libgd recognize the 9 version series 2014-03-12 19:30:27 +01:00
Remi Collet
dd0399f5c6 We need both gdImageCreateFromJpeg* and gdImageCreateFromJpeg*Ex
The new (Ex) functions are used with the new ignore_warning parameter

The standard functions are used in _php_image_create_from_string,
sent as a function pointer, and call without this optional parameter.
2013-04-24 16:07:50 +02:00
Pierre Joye
425c528783 - WS 2010-06-30 22:06:49 +00:00
Pierre Joye
c145a3754b - #52043,GD doesn't recognize latest libJPEG version 2010-06-14 08:12:10 +00:00
Pierre Joye
855da166ef - missing implementation gdJpegGetVersionString (thanks Rob) 2009-04-07 13:07:04 +00:00
Pierre Joye
a5368aeb73 - MFH:
- Fix linux build (static)
 - add gd[Format]Version[Int|String] first methods to work around the png
   header issues
2008-11-06 10:23:52 +00:00
Pierre Joye
ccaa5eaab2 - remove libjpeg direct output and wrap them in php warnings 2006-02-04 14:56:58 +00:00
Pierre Joye
bc436e2fd3 - add a weak/tolerant mode to the jpeg loader
* new INI option to enable it (off by default)
   gd.jpeg_ignore_warning (0|1)
 * The default mode is the current behavior
 * if the warning mode is enabled, the image may be loaded succesfully
   but the jpeg warnings will be raise as notices
2006-02-02 20:30:54 +00:00
foobar
b385e0ad39 Nuke EOLs from error messages 2005-08-18 12:54:32 +00:00
Ilia Alshanetsky
8b079070a3 Synchronized bundled GD library with GD 2.0.22. 2004-03-29 18:20:33 +00:00
Ilia Alshanetsky
36db28c8db CS fixes. 2003-12-28 20:11:08 +00:00
Ilia Alshanetsky
8d6cfb797b Synchronized bundled GD library with GD 2.0.17
. GD is now thread-safe thanks to wrappers around freetype library
 . Significant optimization to png writing code.
 . Miscellaneous fixes.
Fixed memory leak inside php_imagettftext_common()
Make ext/gd compile with GD 2.0.17+ (gdFreeFontCache() is not avaliable)
2003-12-25 22:12:12 +00:00
Edin Kadribasic
45f12cc61f Windows compile fix (patch by sfox@php.net). 2003-11-13 10:32:05 +00:00
Sebastian Bergmann
b2f860ce6d Patch by Steph to sanitize ssize_t typedef on Windows. 2003-10-26 00:42:42 +00:00
Ilia Alshanetsky
7a35766dec Integer overflow checks. 2003-06-03 23:23:21 +00:00
Sebastian Bergmann
11f53cd111 Fix Win32 build. 2003-04-08 07:36:58 +00:00
Ilia Alshanetsky
61026e391c Syncronized bunbled GD library with gd 2.0.12
# One very useful feature that I still need to add support for in our
# interface to the lib is the support for png compression for imagepng().
2003-04-05 17:23:55 +00:00
Ilia Alshanetsky
169eb85e0a Syncronize bundled GD library with latest GD (2.0.11). 2003-01-17 18:34:07 +00:00
Marcus Boerger
fa38a6af6f No more (f)printf for errors and warnings instead use php_error_docref. 2002-12-01 11:43:54 +00:00
Marcus Boerger
65eb0d8125 Conversion fixes 2002-11-29 01:44:19 +00:00
Marcus Boerger
0a7487e32d Conversion fixes 2002-11-28 22:48:20 +00:00
Ilia Alshanetsky
9251486567 Synchronized bundled gd library with the latest stable GD, 2.0.6
Fixed a configuration problem with xpm.
Fixed 2 possible memory leaks in fontFetch().
2002-11-25 01:51:53 +00:00
Ilia Alshanetsky
d9ecd30cc4 Changed memory allocation wrappers to macros, so that it is possible to see
where the memory leak is happening.
2002-11-18 12:31:39 +00:00
Rasmus Lerdorf
a24534a1ed Update bundled gd library with relevant changes from gd-2.0.4
I still need to add a configure check for the gdIOCtx struct
changes so building against older external gd libs will work again.
2002-10-29 23:08:01 +00:00
Marcus Boerger
b9c0c918cc try even more to fix those warnings.....
#repeat: this code must come from hell
2002-08-11 19:13:07 +00:00
Marcus Boerger
1723861618 try to fix those warnings.....
#this code must come from hell: will we change code to our coding-scheme?
2002-08-11 13:50:27 +00:00
Rasmus Lerdorf
7a8cade379 Initial commit of the built-in libgd based on GD-2.0.1
This initial checkin has no changes to any of the libgd code so it can
be used as a basis for diffs.  It also will not build currently because
of this.  The PHP gd checks need to be incorporated along with a bit of
other config magic.  It also shouldn't break the build and will only
take effect if you use --with-gd=php right now.
2002-04-13 02:03:09 +00:00