Commit graph

60 commits

Author SHA1 Message Date
Anatol Belski
bdeb220f48 first shot remove TSRMLS_* things 2014-12-13 23:06:14 +01:00
Veres Lajos
06fdf359e3 typo fixes - https://github.com/vlajos/misspell_fixer 2014-11-23 14:52:47 -08:00
Sara Golemon
1ec93f8069 Merge branch 'PHP-5.6'
* PHP-5.6:
  Switch use of strtok() to gd_strtok_r()
2014-08-19 13:24:49 -07:00
Sara Golemon
a309dda777 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Switch use of strtok() to gd_strtok_r()
2014-08-19 13:22:14 -07:00
Sara Golemon
cbe1597b74 Switch use of strtok() to gd_strtok_r()
strtok() is not thread safe, so this will potentially break in
very bad ways if used in ZTS mode.

I'm not sure why gd_strtok_r() exists since it seems to do the
same thing as strtok_r(), but I'll assume it's a portability
decision and do as the Romans do.
2014-08-19 13:16:44 -07:00
Scott MacVicar
24092b7196 Merge branch 'PHP-5.6'
* PHP-5.6:
  imagettftext() uses the last charactermap it found and not the one you want
  [libxml] Unit test for libxml_disable_entity_loader()
  Add pgsql related change information to NEWS and UPGRADING
2014-02-16 22:51:20 -08:00
Scott MacVicar
796bfb0bd0 imagettftext() uses the last charactermap it found and not the one you want
Summary:
This caused issues when you picked a font with multiple maps, it wouldn't
pick the unicode version but instead pick the last one it saw. Change so
we cache on a per encoding level. There was even a todo list item in the code.

In an ideal world we can probably iterate through at font write time.

Test Plan:
See said unit test, it's Apache Licensed font included
2014-02-16 22:49:31 -08:00
Paul Tarjan
d599d36d49 Dont ignore errors from FT_Get_Glyph 2014-01-13 16:30:48 -08:00
Takeshi Abe
42c14bf473 Fixed bug #51263 (imagettftext and rotated text uses wrong baseline) 2010-03-24 04:12:19 +00:00
Takeshi Abe
9a73e1c2bf Bug #49600 (imageTTFText text shifted right)
- fix difference of horizontal position between imagettftext() and imagettfbbox()
2010-01-08 12:18:52 +00:00
Takeshi Abe
06c411b9ef Fixed a possible memory leak in case that FT_Glyph_To_Bitmap() fails 2009-11-01 05:04:35 +00:00
Takeshi Abe
2d2f18dedc fixed #48732 (TTF Bounding box wrong for letters below baseline) and #48801 (Problem with imagettfbbox) 2009-07-27 15:02:15 +00:00
Takeshi Abe
8990a91fd7 fixed bug #48555 (ImageFTBBox() differs from previous versions for texts with new lines) 2009-06-21 05:59:25 +00:00
Takeshi Abe
cd31aa574b MFB: #43073, TrueType bounding box is wrong for angle<>0 2009-03-25 16:15:18 +00:00
Pierre Joye
fa3f2f7ead - MFB: #43790, fix crash when no family name has been found 2008-01-09 01:52:03 +00:00
Scott MacVicar
fef929f044 Fixed bug #40130 (TTF usage doesn't work properly under Netware) 2007-04-23 15:06:13 +00:00
Nuno Lopes
5e50336e7e MFB: fix race condition on font cache shutdown 2007-04-04 14:26:04 +00:00
Pierre Joye
1cd4938ef5 - remove double lock (tween colors cache is created in each thread, the
cache mutex is already locked earlier)
- #40858, other TS improvements for gd freetype cache management
  cache initialization and shutdown is now done in MINIT and MSHUTDOWN.
2007-04-04 00:44:38 +00:00
Nuno Lopes
ea624e97e5 MFB 2007-03-01 18:41:45 +00:00
Pierre Joye
519e18a2c3 - MFB: sync with libgd.org, patch from Kees Cook 2007-02-25 02:56:03 +00:00
Pierre Joye
7d437feb83 - MFB: #40578, fix the 2nd race condition on shutdown when the cache is
freed
2007-02-23 01:02:57 +00:00
Antony Dovgal
c3b7cb1901 fix #40578 (imagettftext() multithreading issue) 2007-02-21 14:59:36 +00:00
Nuno Lopes
678b162fef MFB 2006-09-15 16:14:57 +00:00
Pierre Joye
96aedc6efd - add support for entities in hexadecimal format, like &copy; can
be passed as &#169 or &#xA9;
2006-08-23 20:21:34 +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
Ilia Alshanetsky
f0ffe7c85b Fixed bug #28175 (Allow bundled GD to compile against freetype 2.1.2). 2004-06-09 14:50:05 +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
8b079070a3 Synchronized bundled GD library with GD 2.0.22. 2004-03-29 18:20:33 +00:00
Ilia Alshanetsky
53e56151fe Fixed bug #27437 (wrong freetype include inside GD library). 2004-03-06 18:24:41 +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
Ilia Alshanetsky
cadc8a15f9 Fixed bug #24223 (missing variable initialization in bundled gd) 2003-06-17 13:37:43 +00:00
Ilia Alshanetsky
e1b8cad26f Syncronize bunbled GD with gd 2.0.14 2003-06-03 23:54:56 +00:00
Rasmus Lerdorf
63c966a33d MFB 2003-04-30 16:26:22 +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
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
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
Marcus Boerger
65eb0d8125 Conversion fixes 2002-11-29 01:44:19 +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
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
Derick Rethans
8c86784cae - MFB 2002-11-17 19:45:10 +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
b06085dd46 fix warnings 2002-11-12 13:12:58 +00:00