[PHP-CVS] cvs: php-src(PHP_4_3) /ext/gd/libgd gdft.c

2004-12-09 Thread Pierre-Alain Joye 
pajoye  Thu Dec  9 09:20:20 2004 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/gd/libgd   gdft.c 
  Log:
  - MFH: #28598, attempt to restore MS Symbol ttf support
  
  
http://cvs.php.net/diff.php/php-src/ext/gd/libgd/gdft.c?r1=1.11.2.18r2=1.11.2.19ty=u
Index: php-src/ext/gd/libgd/gdft.c
diff -u php-src/ext/gd/libgd/gdft.c:1.11.2.18 
php-src/ext/gd/libgd/gdft.c:1.11.2.19
--- php-src/ext/gd/libgd/gdft.c:1.11.2.18   Wed Jun  9 10:50:33 2004
+++ php-src/ext/gd/libgd/gdft.c Thu Dec  9 09:20:20 2004
@@ -958,7 +958,6 @@
 
while (*next) {
ch = *next;
-
/* carriage returns */
if (ch == '\r') {
penf.x = 0;
@@ -985,11 +984,12 @@
 
 /* EAM DEBUG */
 #if (defined(FREETYPE_MAJOR)  ((FREETYPE_MAJOR == 2  ((FREETYPE_MINOR == 1 
 FREETYPE_PATCH = 3) || FREETYPE_MINOR  1) || FREETYPE_MAJOR  2)))
-   if (font-face-charmap-encoding == FT_ENCODING_MS_SYMBOL) {
+   if (font-face-charmap-encoding == FT_ENCODING_MS_SYMBOL  
strcmp(font-face-family_name, Symbol) == 0) {
/* I do not know the significance of the constant 
0xf000.
 * It was determined by inspection of the character 
codes
 * stored in Microsoft font symbol.
 */
+   /* Convert to the Symbol glyph range only for a Symbol 
family member */ 
len = gdTcl_UtfToUniChar (next, ch);
ch |= 0xf000;
next += len;
@@ -1060,7 +1060,7 @@
FT_Set_Transform(face, matrix, NULL);
/* Convert character code to glyph index */
glyph_index = FT_Get_Char_Index(face, ch);
-
+   
/* retrieve kerning distance and move pen position */
if (use_kerning  previous  glyph_index) {
FT_Get_Kerning(face, previous, glyph_index, 
ft_kerning_default, delta);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_4_3) /ext/gd/libgd gdft.c

2003-12-16 Thread Ilia Alshanetsky 
iliaa   Tue Dec 16 12:23:27 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/gd/libgd   gdft.c 
  Log:
  ZTS fix.
  
  
Index: php-src/ext/gd/libgd/gdft.c
diff -u php-src/ext/gd/libgd/gdft.c:1.11.2.12 php-src/ext/gd/libgd/gdft.c:1.11.2.13
--- php-src/ext/gd/libgd/gdft.c:1.11.2.12   Mon Dec 15 15:34:57 2003
+++ php-src/ext/gd/libgd/gdft.c Tue Dec 16 12:23:27 2003
@@ -395,6 +395,7 @@
}
for (dir = strtok (path, PATHSEPARATOR); dir; dir = strtok (0, 
PATHSEPARATOR)) {
if (!strcmp(dir, .)) {
+   TSRMLS_FETCH();
 #if HAVE_GETCWD
dir = VCWD_GETCWD(cur_dir, MAXPATHLEN);
 #elif HAVE_GETWD

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src(PHP_4_3) /ext/gd/libgd gdft.c

2003-11-26 Thread Rasmus Lerdorf 
Perhaps not, but Freetype2 won't compile either on those platforms then
and without this patch we don't build at all.

-Rasmus

On Sat, 22 Nov 2003, Jani Taskinen wrote:


 Are you absolutely sure this will work within any platform?
 For example, see this bug report:

   http://bugs.php.net/bug.php?id=25281

 --Jani

 On Sat, 22 Nov 2003, Rasmus Lerdorf wrote:

 rasmus   Fri Nov 21 19:55:29 2003 EDT
 
   Modified files:  (Branch: PHP_4_3)
 /php-src/ext/gd/libgdgdft.c
   Log:
   Compile fix
 
 
 Index: php-src/ext/gd/libgd/gdft.c
 diff -u php-src/ext/gd/libgd/gdft.c:1.11.2.10 php-src/ext/gd/libgd/gdft.c:1.11.2.11
 --- php-src/ext/gd/libgd/gdft.c:1.11.2.10Tue Jun 17 09:37:57 2003
 +++ php-src/ext/gd/libgd/gdft.c  Fri Nov 21 19:55:29 2003
 @@ -60,7 +60,8 @@
  #else
 
  #include gdcache.h
 -#include freetype/freetype.h
 +#include ft2build.h
 +#include FT_FREETYPE_H
  #include freetype/ftglyph.h
 
  /* number of fonts cached before least recently used is replaced */
 
 

 --
 PHP CVS Mailing List (http://www.php.net/)
 To unsubscribe, visit: http://www.php.net/unsub.php


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src(PHP_4_3) /ext/gd/libgd gdft.c

2003-11-26 Thread Jani Taskinen 

What exactly is that compile error? And on what platform?
This has been like this for a long time, funny that nobody
hasn't complained before?

And it works just fine for me on RH9. :)

--Jani


On Tue, 25 Nov 2003, Rasmus Lerdorf wrote:

Perhaps not, but Freetype2 won't compile either on those platforms then
and without this patch we don't build at all.

-Rasmus

On Sat, 22 Nov 2003, Jani Taskinen wrote:


 Are you absolutely sure this will work within any platform?
 For example, see this bug report:

   http://bugs.php.net/bug.php?id=25281

 --Jani

 On Sat, 22 Nov 2003, Rasmus Lerdorf wrote:

 rasmus  Fri Nov 21 19:55:29 2003 EDT
 
   Modified files:  (Branch: PHP_4_3)
 /php-src/ext/gd/libgd   gdft.c
   Log:
   Compile fix
 
 
 Index: php-src/ext/gd/libgd/gdft.c
 diff -u php-src/ext/gd/libgd/gdft.c:1.11.2.10 php-src/ext/gd/libgd/gdft.c:1.11.2.11
 --- php-src/ext/gd/libgd/gdft.c:1.11.2.10   Tue Jun 17 09:37:57 2003
 +++ php-src/ext/gd/libgd/gdft.c Fri Nov 21 19:55:29 2003
 @@ -60,7 +60,8 @@
  #else
 
  #include gdcache.h
 -#include freetype/freetype.h
 +#include ft2build.h
 +#include FT_FREETYPE_H
  #include freetype/ftglyph.h
 
  /* number of fonts cached before least recently used is replaced */
 
 

 --
 PHP CVS Mailing List (http://www.php.net/)
 To unsubscribe, visit: http://www.php.net/unsub.php




-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src(PHP_4_3) /ext/gd/libgd gdft.c

2003-11-26 Thread Rasmus Lerdorf 
On Wed, 26 Nov 2003, Jani Taskinen wrote:
 What exactly is that compile error? And on what platform?
 This has been like this for a long time, funny that nobody
 hasn't complained before?

 And it works just fine for me on RH9. :)

i386 Fedora (ie latest freetype2)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src(PHP_4_3) /ext/gd/libgd gdft.c (resent)

2003-11-25 Thread Jani Taskinen 

Are you absolutely sure this will work within any platform?
For example, see this bug report:

  http://bugs.php.net/bug.php?id=25281

And what compile error did you actually fix with this?

--Jani

On Sat, 22 Nov 2003, Rasmus Lerdorf wrote:

rasmus Fri Nov 21 19:55:29 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/gd/libgd  gdft.c 
  Log:
  Compile fix
  
  
Index: php-src/ext/gd/libgd/gdft.c
diff -u php-src/ext/gd/libgd/gdft.c:1.11.2.10 php-src/ext/gd/libgd/gdft.c:1.11.2.11
--- php-src/ext/gd/libgd/gdft.c:1.11.2.10  Tue Jun 17 09:37:57 2003
+++ php-src/ext/gd/libgd/gdft.cFri Nov 21 19:55:29 2003
@@ -60,7 +60,8 @@
 #else
 
 #include gdcache.h
-#include freetype/freetype.h
+#include ft2build.h
+#include FT_FREETYPE_H
 #include freetype/ftglyph.h
 
 /* number of fonts cached before least recently used is replaced */



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_4_3) /ext/gd/libgd gdft.c

2003-11-21 Thread Rasmus Lerdorf 
rasmus  Fri Nov 21 19:55:29 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/gd/libgd   gdft.c 
  Log:
  Compile fix
  
  
Index: php-src/ext/gd/libgd/gdft.c
diff -u php-src/ext/gd/libgd/gdft.c:1.11.2.10 php-src/ext/gd/libgd/gdft.c:1.11.2.11
--- php-src/ext/gd/libgd/gdft.c:1.11.2.10   Tue Jun 17 09:37:57 2003
+++ php-src/ext/gd/libgd/gdft.c Fri Nov 21 19:55:29 2003
@@ -60,7 +60,8 @@
 #else
 
 #include gdcache.h
-#include freetype/freetype.h
+#include ft2build.h
+#include FT_FREETYPE_H
 #include freetype/ftglyph.h
 
 /* number of fonts cached before least recently used is replaced */

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src(PHP_4_3) /ext/gd/libgd gdft.c

2003-11-21 Thread Jani Taskinen 

Are you absolutely sure this will work within any platform?
For example, see this bug report:

  http://bugs.php.net/bug.php?id=25281

--Jani

On Sat, 22 Nov 2003, Rasmus Lerdorf wrote:

rasmus Fri Nov 21 19:55:29 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/gd/libgd  gdft.c 
  Log:
  Compile fix
  
  
Index: php-src/ext/gd/libgd/gdft.c
diff -u php-src/ext/gd/libgd/gdft.c:1.11.2.10 php-src/ext/gd/libgd/gdft.c:1.11.2.11
--- php-src/ext/gd/libgd/gdft.c:1.11.2.10  Tue Jun 17 09:37:57 2003
+++ php-src/ext/gd/libgd/gdft.cFri Nov 21 19:55:29 2003
@@ -60,7 +60,8 @@
 #else
 
 #include gdcache.h
-#include freetype/freetype.h
+#include ft2build.h
+#include FT_FREETYPE_H
 #include freetype/ftglyph.h
 
 /* number of fonts cached before least recently used is replaced */



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php