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

2008-01-08 Thread Pierre-Alain Joye 
pajoye  Wed Jan  9 01:50:59 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/gd/libgd   gdft.c 
  Log:
  - #43790, fix crash when no family name has been found
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gdft.c?r1=1.36.4.9&r2=1.36.4.10&diff_format=u
Index: php-src/ext/gd/libgd/gdft.c
diff -u php-src/ext/gd/libgd/gdft.c:1.36.4.9 
php-src/ext/gd/libgd/gdft.c:1.36.4.10
--- php-src/ext/gd/libgd/gdft.c:1.36.4.9Mon Apr 23 15:17:47 2007
+++ php-src/ext/gd/libgd/gdft.c Wed Jan  9 01:50:59 2008
@@ -947,7 +947,8 @@
 
 /* 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 && 
strcmp(font->face->family_name, "Symbol") == 0) {
+   if (font->face->family_name && font->face->charmap->encoding &&
+   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.

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

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

2007-04-04 Thread Nuno Lopes 
nlopess Wed Apr  4 14:24:03 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/gd/libgd   gdft.c 
  Log:
  fix race condition on font cache shutdown
  
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gdft.c?r1=1.36.4.7&r2=1.36.4.8&diff_format=u
Index: php-src/ext/gd/libgd/gdft.c
diff -u php-src/ext/gd/libgd/gdft.c:1.36.4.7 
php-src/ext/gd/libgd/gdft.c:1.36.4.8
--- php-src/ext/gd/libgd/gdft.c:1.36.4.7Wed Apr  4 00:47:55 2007
+++ php-src/ext/gd/libgd/gdft.c Wed Apr  4 14:24:03 2007
@@ -715,13 +715,15 @@
 
 void gdFontCacheShutdown()
 {
+   gdMutexLock(gdFontCacheMutex);
+
if (fontCache) {
-   gdMutexLock(gdFontCacheMutex);
gdCacheDelete(fontCache);
fontCache = NULL;
-   gdMutexUnlock(gdFontCacheMutex);
FT_Done_FreeType(library);
}
+
+   gdMutexUnlock(gdFontCacheMutex);
 }
 
 void gdFreeFontCache()

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

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

2007-03-01 Thread Nuno Lopes 
nlopess Thu Mar  1 18:39:50 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/gd/libgd   gdft.c 
  Log:
  merge from gd sources: unlock mutex before shuting it down
  
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gdft.c?r1=1.36.4.5&r2=1.36.4.6&diff_format=u
Index: php-src/ext/gd/libgd/gdft.c
diff -u php-src/ext/gd/libgd/gdft.c:1.36.4.5 
php-src/ext/gd/libgd/gdft.c:1.36.4.6
--- php-src/ext/gd/libgd/gdft.c:1.36.4.5Sun Feb 25 02:45:06 2007
+++ php-src/ext/gd/libgd/gdft.c Thu Mar  1 18:39:49 2007
@@ -721,6 +721,7 @@
gdMutexLock(gdFontCacheMutex);
gdCacheDelete(fontCache);
fontCache = NULL;
+   gdMutexUnlock(gdFontCacheMutex);
gdMutexShutdown(gdFontCacheMutex);
FT_Done_FreeType(library);
}

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

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

2007-02-24 Thread Pierre-Alain Joye 
pajoye  Sun Feb 25 02:45:06 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/gd/libgd   gdft.c 
  Log:
  - sync with libgd.org, patch from Kees Cook
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gdft.c?r1=1.36.4.4&r2=1.36.4.5&diff_format=u
Index: php-src/ext/gd/libgd/gdft.c
diff -u php-src/ext/gd/libgd/gdft.c:1.36.4.4 
php-src/ext/gd/libgd/gdft.c:1.36.4.5
--- php-src/ext/gd/libgd/gdft.c:1.36.4.4Fri Feb 23 00:58:49 2007
+++ php-src/ext/gd/libgd/gdft.c Sun Feb 25 02:45:06 2007
@@ -986,7 +986,7 @@
} else {
ch = c & 0xFF;  /* don't extend 
sign */
}
-   next++;
+   if (*next) next++;
}
break;
case gdFTEX_Big5: {

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

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

2006-09-15 Thread Nuno Lopes 
nlopess Fri Sep 15 16:11:39 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/gd/libgd   gdft.c 
  Log:
  fix a valgrind warning. this also provides a 5x speedup in the 
imagefttext.phpt test, because without this patch it never got cache hits
  
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gdft.c?r1=1.36.4.1&r2=1.36.4.2&diff_format=u
Index: php-src/ext/gd/libgd/gdft.c
diff -u php-src/ext/gd/libgd/gdft.c:1.36.4.1 
php-src/ext/gd/libgd/gdft.c:1.36.4.2
--- php-src/ext/gd/libgd/gdft.c:1.36.4.1Wed Aug 23 20:22:31 2006
+++ php-src/ext/gd/libgd/gdft.c Fri Sep 15 16:11:39 2006
@@ -534,7 +534,7 @@
pixel = a->pixel = b->pixel;
bg = a->bgcolor = b->bgcolor;
fg = a->fgcolor = b->fgcolor;
-   im = b->im;
+   im = a->im = b->im;
 
/* if fg is specified by a negative color idx, then don't antialias */
if (fg < 0) {

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