Commit Graph

263 Commits

Author SHA1 Message Date
foobar
251c5173fd bump year and license version 2006-01-01 13:10:10 +00:00
Pierre Joye
e45ec1e460 - ensure that x1<x2 or y1<y2 2005-12-30 09:53:05 +00:00
Pierre Joye
3afdc2e490 - add some basic optimisations, usefull when you draw many horizontal or
vertical lines like in charts
2005-12-30 01:19:32 +00:00
Pierre Joye
65df8e80ea - fix leak/segfaults in imagecolormatch
- add tests for imagecolorexact and imagecolormatch
  The later is only about the segv
2005-12-25 19:21:58 +00:00
Pierre Joye
9c6a41fbdb - drop freetype1 support 2005-10-02 18:01:51 +00:00
Pierre Joye
00953d1a15 - MFB: #33125, alpha emulation broken 2005-09-30 20:58:41 +00:00
Pierre Joye
97bad74c0f - #33220, fix infinite loop while loading invalid gif, this patch fixes
at least many cases (nlopess)
2005-09-24 14:37:49 +00:00
foobar
b385e0ad39 Nuke EOLs from error messages 2005-08-18 12:54:32 +00:00
foobar
23e671a51e - Bumber up year 2005-08-03 14:08:58 +00:00
Pierre Joye
9859780570 - fix #33794 imagerotate rotates only CCW
introduced by transparent color patch
2005-07-23 16:41:38 +00:00
Ilia Alshanetsky
353e07f57b Fixed memory corruption. 2005-06-16 22:50:32 +00:00
Pierre Joye
90ee88e090 - MFB: #32891, init old y positions to non possible values. -1 being used
if the center start a (x,0)
2005-05-01 06:01:56 +00:00
Rasmus Lerdorf
4162bd8b21 I think this is a cleaner emboss filter. Less fringing. 2005-04-16 09:20:59 +00:00
Rasmus Lerdorf
d0f4028194 The emboss and edge detection matrices are swapped 2005-04-16 00:04:52 +00:00
Pierre Joye
d8824f2d5c - remove "debug" code 2005-03-28 08:17:17 +00:00
Pierre Joye
6d46acfc70 - MFB, imagerectangle draws 2x each corners (alpha channel uglyness) 2005-03-28 08:14:30 +00:00
Pierre Joye
c8ce18c155 - allow to keep or ignore the transparent color in imagerotate (thx
Ken Coar to report this "bug")
- be sure to restore alphablending in imagefill
- use zend_parse_parameter in imagerotate
2005-03-27 23:43:52 +00:00
Pierre Joye
f3b74fe9ac - Attempt to fix #28598, bug introduced in GD (around php 4.3.4)
The way they fix MS Symbol are wrong, multiple faces support hould added
  later, safer.

  Please test it with your weird fonts, if it works, MFH will be done.
2004-11-20 13:09:45 +00:00
Pierre Joye
32ff83e4da - Really fix imagefill, part of my previous (old) fix was not applied
(blame me), bak the alphablending and restore it on exit
2004-11-17 20:19:35 +00:00
Pierre Joye
d9f08cb7ce - MFB: fix #30739, imagefill did not set back alphablending mode 2004-11-17 17:21:22 +00:00
Joe Orton
0d3884fed1 Move global symbols defined by bundled copy of libgd into private
php_gd_* namespace, to avoid symbol conflicts with, for instance,
another Apache module which loads a different copy of libgd.
2004-08-31 16:41:29 +00:00
Ilia Alshanetsky
61d60153b2 Fixed memory leak. 2004-08-11 23:25:50 +00:00
Stefan Esser
e58e6efd4d Merge changes from GD 2.0.28 2004-07-22 22:38:59 +00:00
Ilia Alshanetsky
f0ffe7c85b Fixed bug #28175 (Allow bundled GD to compile against freetype 2.1.2). 2004-06-09 14:50:05 +00:00
Pierre Joye
5b71225f1b - Fix #28506, negative angle returns "random arcs"
while (angle < 0) angle += 2*M_PI is used now
2004-05-24 19:52:28 +00:00
Ilia Alshanetsky
9a50bd2de1 Missing part of the upgrade patch. 2004-05-10 02:18:49 +00:00
Ilia Alshanetsky
f11d064b6a Fixed bug #28304 (Missing bounds check inside imagefilter()). 2004-05-09 18:25:33 +00:00
Ilia Alshanetsky
9557b4013a Fixed bug #28311 (Transparency detection code is off by 1). 2004-05-09 17:47:31 +00:00
Ilia Alshanetsky
6e9c4b3125 Upgrade bundled GD library to 2.0.23.
Fixed bug #28175 (build problem for people using FreeType 2.1.0-2.1.2).
2004-05-09 17:33:50 +00:00
Ilia Alshanetsky
c527cc8708 Fixed bug #28184 (C++ comments in GD library sources). 2004-04-27 14:59:07 +00:00
Derick Rethans
c452e275e7 - MFB: Fixed bug #28147 (Crash with drawing anti-alised lines) 2004-04-25 19:45:02 +00:00
Derick Rethans
2c259a7979 - Add fontpath for win98/XP (Patch by Friedhelm Betz) 2004-04-12 21:42:42 +00:00
Ilia Alshanetsky
8b079070a3 Synchronized bundled GD library with GD 2.0.22. 2004-03-29 18:20:33 +00:00
Ilia Alshanetsky
fc419f10ef Revert patch to imagefillborder. 2004-03-22 17:26:03 +00:00
Ilia Alshanetsky
ac7283a602 Fixed a possible crash inside libgd's gdImageFillToBorder() due to a stack
overflow.
2004-03-21 18:02:19 +00:00
Pierre Joye
f223262bcd - Fix crash when an invalid color index is used with imagecolortransparent 2004-03-17 17:07:31 +00:00
Pierre Joye
197b48322e - restore too the alphablending if we do not reach the end of the function
Notice: This function still crashes (stack overflow), to reproduce it
  see bug27582_2.phpt
2004-03-13 23:21:25 +00:00
Pierre Joye
9fc9639c83 - fix #27582 (http://bugs.php.net/bug.php?id=27582)
The problem was that the colors were changed endlessly, blending over
  and over. An endless loop and recursive calls filled the stack=>segfault
2004-03-13 18:28:19 +00:00
Ilia Alshanetsky
53e56151fe Fixed bug #27437 (wrong freetype include inside GD library). 2004-03-06 18:24:41 +00:00
Derick Rethans
596efe5197 - Fixed bug in gdImageFilledRectangle in the bundled GD library, that required
x1 < x2 and y1 < y2 for coordinates.
2004-03-02 21:56:30 +00:00
Tim Toohey
b851f37123 (gdImageSetPixel) Tidied 'normal' blending effect
# libgd-2.0.12 fixed the problem with alpha-blending on semi-transparent backgrounds so
# gdFullAlphaBlend() and friends are no longer needed
2004-01-17 09:19:14 +00:00
Andi Gutmans
dbeb4158d2 - A belated happy holidays and PHP 5 2004-01-08 08:18:22 +00:00
Ilia Alshanetsky
f4a07dd9a5 Replace regular malloc with safe_emalloc in several places. 2003-12-31 01:01:44 +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
Wez Furlong
085ceca8e1 be slightly nicer when defining R_OK 2003-12-19 12:41:24 +00:00
Rasmus Lerdorf
0f6cafa7e6 MFB compile fix 2003-12-17 22:47:02 +00:00
Ilia Alshanetsky
45cd627569 ZTS fix. 2003-12-16 17:23:15 +00:00
Sebastian Bergmann
aaeb8f4394 Fix ZTS build. 2003-12-16 06:29:01 +00:00
Ilia Alshanetsky
e440d4fbea Fixed bug #26635 (fixed look up for fonts in the current directory w/ZTS) 2003-12-15 20:34:48 +00:00
Edin Kadribasic
45f12cc61f Windows compile fix (patch by sfox@php.net). 2003-11-13 10:32:05 +00:00
Ilia Alshanetsky
b520c9d42c Fixed bug #26097 (gdImageColorClosestAlpha() returns incorrect results). 2003-11-04 01:55:50 +00:00
Sebastian Bergmann
b2f860ce6d Patch by Steph to sanitize ssize_t typedef on Windows. 2003-10-26 00:42:42 +00:00
Moriyoshi Koizumi
303fc609a6 Fix build in VC++7.
# The line didn't reflect the above comment, helly :)
2003-09-08 20:59:36 +00:00
Ilia Alshanetsky
93bcd55eaf emalloc -> safe_emalloc 2003-08-12 00:58:52 +00:00
Marcus Boerger
a28b0fdbb4 Nuke unused vars 2003-08-10 20:13:38 +00:00
Ilia Alshanetsky
c7a45fc9da Fixed bug #23792 (8 bit graphics don't rotate properly)
Patch by: pajoye@php.net
2003-07-30 17:34:11 +00:00
Pierre Joye
dc0606f041 - Fix leak when no fill is done (ilia) 2003-07-23 00:23:21 +00:00
Pierre Joye
74c2027573 - Fix #bug24594
Rewrite the imagefill function (non recursive, uses of connected points
  algorithm)
2003-07-23 00:08:57 +00:00
Pierre Joye
bf7f45601d - wrong patch applied for #23792, fixed 2003-07-10 00:09:23 +00:00
Pierre Joye
6da86c7e93 - Fix a possible crash when invalid color index are given as background
in imagerotate, only when palette based image is used as src
2003-07-09 10:36:07 +00:00
Pierre Joye
e1f163b053 - "Fix" #23792, imagerotate returns always truecolor images now
(the destination image is a truecolor, no more limited palette problems)
- Clean the cast in gdImageCopyMerge
2003-07-09 10:15:13 +00:00
Pierre Joye
119175c943 - tabs 2003-07-02 11:36:17 +00:00
Pierre Joye
19f3c5b5fa - Fix #23808 2003-07-02 11:23:56 +00:00
Ilia Alshanetsky
cadc8a15f9 Fixed bug #24223 (missing variable initialization in bundled gd) 2003-06-17 13:37:43 +00:00
Marcus Boerger
8fd5e11ff4 Add ImageXBM 2003-06-15 20:00:08 +00:00
Ilia Alshanetsky
490da4fbb7 Fixed bug #24155 (gdImageRotate270 incorrectly use x parameter for y axis) 2003-06-12 19:31:44 +00:00
James Cox
f68c7ff249 updating license information in the headers. 2003-06-10 20:04:29 +00:00
Ilia Alshanetsky
a8c7c3bc5e No need to dupe macro 2003-06-04 14:58:20 +00:00
foobar
b2ee53106f MFB: fix build 2003-06-04 05:32:03 +00:00
Ilia Alshanetsky
f2a9f31160 GD 2.0.15 sync 2003-06-04 00:20:19 +00:00
Ilia Alshanetsky
e1b8cad26f Syncronize bunbled GD with gd 2.0.14 2003-06-03 23:54:56 +00:00
Ilia Alshanetsky
c13be6e6d5 Last set of integer overflow checks. 2003-06-03 23:42:31 +00:00
Ilia Alshanetsky
7a35766dec Integer overflow checks. 2003-06-03 23:23:21 +00:00
Rasmus Lerdorf
63c966a33d MFB 2003-04-30 16:26:22 +00:00
Ilia Alshanetsky
35f8be6bcc Fixed compiler warning (found by Larry Rosenman <ler@lerctr.org>) 2003-04-30 00:37:31 +00:00
Ilia Alshanetsky
7029ef01b3 Added missing bit from gd2.0.12 sync. 2003-04-09 01:55:48 +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
feba44546c Fixed bug #22965 (Crash in gd lib's ImageFillToBorder()). 2003-03-30 20:48:05 +00:00
Ilia Alshanetsky
d29d55e772 Cleanup. 2003-03-18 18:29:10 +00:00
Ilia Alshanetsky
199ae10f01 Whitespace fixes. 2003-03-14 16:56:38 +00:00
Ilia Alshanetsky
d6a02110b0 Cleanup. 2003-03-13 02:22:31 +00:00
Ilia Alshanetsky
88281627bc Style fixes. 2003-03-12 00:51:03 +00:00
Ilia Alshanetsky
822b53b95a Fixed bug #22613 (imagettfbox() does not add the kerning distance to the
running position).
Fixed few possible memory leaks.
2003-03-10 19:07:22 +00:00
Stefan Esser
af4aa97d1e Fixing functionicalls with variable number of parameters... 2003-03-06 20:31:20 +00:00
Ilia Alshanetsky
fd088722a7 Fixed bug #22544 (missing fix from official gd). 2003-03-05 15:57:28 +00:00
Ilia Alshanetsky
348200b54d Fixed a crash in gdImageCopyMergeGray(). 2003-02-25 03:49:26 +00:00
Marcus Boerger
8d183b7ccc Kill some warnings
# the remainig is not easy to solve: float_var = float_cast(extpression)
# This cannot be fixed by simply casting again to float because some
# compilers may ignore the double casting.
2003-02-09 14:17:05 +00:00
Pierre Joye
a5f35ef94a Add gdImageEllipse
Replace gdImageFilledEllipse by a new function (backported from
the new phpgd)
the new gdImageFilledEllipse fix bug bug #22103 (ellipse part)
2003-02-08 08:41:43 +00:00
Marcus Boerger
1d9477f386 - new xbm support
@Added XBM support for bundled gd library. (marcus)

# It was enabled by the last commit and fixed by this one.
2003-02-02 01:34:54 +00:00
Pierre Joye
9ad850637e Remove the (c), in the future, can we add PHP Licence terms for the new
functions ?
2003-01-21 02:10:19 +00:00
Pierre Joye
81c68ab8d5 Add credits to my functions (thx for the advice Wez&Ilia :) 2003-01-21 01:49:34 +00:00
Ilia Alshanetsky
169eb85e0a Syncronize bundled GD library with latest GD (2.0.11). 2003-01-17 18:34:07 +00:00
Ilia Alshanetsky
dee2d7fed7 Fixed ImageRotate when rotation angle is 90 degrees, patch by
leon@leonatkinson.com.
2003-01-10 02:00:39 +00:00
Ilia Alshanetsky
17e51c5946 Fixed bug #21518.
Fixed memory in leak ImageCreateFromString().
Fixed a bug that prevented proper identification of WBMP images and thus
prevented ImageCreateFromString() from working on those images.
2003-01-08 18:11:40 +00:00
Frank M. Kromann
6b0b7e3f42 Nuke warning, on Win32 build 2003-01-06 04:29:33 +00:00
Ilia Alshanetsky
b52eb8f14a Fixed bug #21445. 2003-01-06 00:47:40 +00:00
Pierre Joye
baea3414a3 Fix a crash while using an invalid color with imagesetstyle, see the sample
script in the manual to reproduce it :)
2002-12-18 21:13:21 +00:00
Marcus Boerger
05436b1378 MFB: gd uses float instead of double 2002-12-15 18:16:11 +00:00
Pierre Joye
137beb12ca Do not allow AA if not trueColor (imageantialias does nothing) 2002-12-14 19:23:29 +00:00
Pierre Joye
5acfdf3ca1 Fix brightness filter (argument ingnored) 2002-12-11 22:23:51 +00:00
Ilia Alshanetsky
a88a99fb9d White space fixes. 2002-12-11 21:55:45 +00:00
Ilia Alshanetsky
f4b5f0904b Syncronize bundled gd sources with that of gd 2.0.9, affected functions
are: gdImageBrushApply() & gdImageCopyResized().
2002-12-11 21:52:29 +00:00
Pierre Joye
983d8e5efd Add antialias flag to image structure
Add AA support
2002-12-11 20:47:26 +00:00
Pierre Joye
7ec74f64f9 Add gdImageAAline (antialiased line)
Add AA support for gdImagePolygon
2002-12-11 20:46:52 +00:00
Ilia Alshanetsky
8f6d5dc775 Fixed a color mixup in gdImageCopyResampled() when dealing with true-color
images & brought the code up to PHP coding standards.
2002-12-08 21:07:13 +00:00
Ilia Alshanetsky
5779f9bb0f Made imagecreatefromxpm() work once again. 2002-12-04 20:58:04 +00:00
Ilia Alshanetsky
1e8ec47a99 Fixed a memory leak inside gdImageTrueColorToPalette(). 2002-12-04 17:16:19 +00:00
Ilia Alshanetsky
b08f247f32 Fixed a crash that occurs during the last step of png/jpeg -> gd2 -> png/jpeg
conversion. The same crash still occures with png/jpeg -> gd -> png/jpeg, because
apparently gd format cannot handle truecolor images.
Turned off debug messages inside gd_gd2.c.
2002-12-03 15:43:17 +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
c330fdc1a1 Removed un-needed zlib check. 2002-11-25 14:25:52 +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
ef1d4e1dcf Fix compile warning, MIN/MAX macros may already be defined by param.h 2002-11-24 01:30:51 +00:00
Ilia Alshanetsky
67e25fcbd8 Added gdPEstrdup macro. 2002-11-24 01:20:13 +00:00
Ilia Alshanetsky
ef26e2d1f8 Fixed 3 memory leaks.
Formatted the code to meet PHP's coding standards, which makes it MUCH easier
to understand.
2002-11-24 01:15:34 +00:00
Moriyoshi Koizumi
57e4b81d13 Fixed segfaults 2002-11-23 21:33:31 +00:00
Ilia Alshanetsky
11e7f6278d Addressed the issue of persistant allocation.
Fixed bug #20470.
Fixed a memory leak in gdttf.c that would happen when an error during
processing occures.
2002-11-19 19:55:54 +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
Derick Rethans
8c86784cae - MFB 2002-11-17 19:45:10 +00:00
Derick Rethans
1a5037de1a - Fix compile problems for mips pro 2002-11-17 14:25:50 +00:00
Derick Rethans
c3fe54dfab - MFB: Fix memory allocation problem in bundled GD (reported by Brian Havard) 2002-11-17 13:11:46 +00:00
Marcus Boerger
a391c4b12b Fix warnings (Marcus & Pierre-Alain Joye) 2002-11-14 15:08:39 +00:00
Ilia Alshanetsky
901980b3ab Added imagefilter() function by Pierre-Alain Joye (paj@pearfr.org). This
function allows negate, grayscale, brightness, contrast, colorize, selective blur,
Gaussian blur, edge detect, smooth, sharpen and emboss filters to be applied
on an image.
2002-11-13 20:02:58 +00:00
Marcus Boerger
f6885ab970 use *e*malloc functions 2002-11-12 16:02:03 +00:00
Marcus Boerger
b06085dd46 fix warnings 2002-11-12 13:12:58 +00:00
Ilia Alshanetsky
02fcdec6b7 Fix win32 build. 2002-11-03 21:21:13 +00:00
Marcus Boerger
536c34ebc9 fix warnings 2002-10-30 17:54:36 +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
Ilia Alshanetsky
8c6316ef7b Corrected un-initialized variable usage. 2002-10-29 20:19:38 +00:00
Ilia Alshanetsky
e34ea3adb4 Added a patch by Pierre-Alain Joye <paj@pearfr.org>, which implements the
imagerotate() that allows rotation of images in gd.
2002-10-29 01:15:44 +00:00
Rasmus Lerdorf
ebfd9aaa47 Fix for bug #19941 2002-10-16 22:34:44 +00:00
Rasmus Lerdorf
76ee49e5b4 Fix for bug 19781 2002-10-06 17:47:50 +00:00
Rasmus Lerdorf
b832af75f0 WS fix - although the entire libgd directory is horrendously formatted.
However, since we are forking existing code, fixing it would make it much
harder to merge any Boutell patches (if they ever come out with any).
2002-10-06 08:39:05 +00:00
Rasmus Lerdorf
731943287f Oops 2002-10-06 08:35:22 +00:00
Rasmus Lerdorf
409620351f Ok, perhaps it's too late at night, but I see absolutely no reason for
this chunk of code here.  Why is it writing a palette.map file to disk
in the middle of this function?  Looks like leftover debug code, and this
particular code seems to be crashing on OSX as per bug #19704.
2002-10-06 07:19:07 +00:00
Rasmus Lerdorf
26b69a7d93 Fix for bug #19700 - code by Wez 2002-10-06 06:47:53 +00:00
Rasmus Lerdorf
72d90fc41c As discussed a while ago, decoding GIF images is not considered a Unisys
LZW patent violation so we can distribute read-only GIF support with
our bundled GD2.  The patent also expires in 2003, which is quickly
approaching, so we can roll in write support soon unless things change.
2002-10-06 06:03:17 +00:00
Tim Toohey
6a952f0856 fix gdImageCopyResampled() for non-constant alpha layer 2002-09-30 07:23:34 +00:00
Ilia Alshanetsky
fba852e16b Fixed bug #19366 2002-09-29 14:45:57 +00:00
Marcus Boerger
902c17e05a fiw warnings 2002-08-22 16:21:32 +00:00
Tim Toohey
266193159b (PHP imagecolormatch) makes a palette image match the colours in the
true-color version.
(PHP imagelayereffect) extended alpha-channel mixing effects for the
                       bundled GD library
@Added ImageColorMatch() and ImageLayerEffect() functions
@which work with the bundled GD library (ttoohey)
2002-08-22 07:28:26 +00:00
Marcus Boerger
ac9991a245 -wrong fabsf define for MSVC.6
-MIN and MAX only if undefined
#should be last commit to fix all warnings (-:
2002-08-12 19:09:26 +00:00
Marcus Boerger
bdaae34cb9 ups wrong include committed
#if anybody objects we would need config stuuf in ligd otherwise but
#this way we can use other php functions...for example we could use
#php_error_docref....
2002-08-12 15:29:05 +00:00
Marcus Boerger
2df2e24a54 check for fabsf and floorf in config.m4
msvc.6 needs a define, msvc.net needs special treatment
2002-08-12 13:59:01 +00:00
Marcus Boerger
9d03c0bdf0 more conversion fixes 2002-08-12 09:58:51 +00:00
Marcus Boerger
0dcbf7e375 -quick hack to allow compilation under windows again
-correct solution to follow tomorrow
2002-08-11 23:56:11 +00:00
Marcus Boerger
251882de7d missed to commit this fix: correct since this is only a flag 2002-08-11 19:19:35 +00:00