subject:"\[PHP\-CVS\] cvs\: php4\(PHP_4_3\) \/ext\/gd gd.c php

[PHP-CVS] cvs: php4(PHP_4_3) /ext/gd gd.c php_gd.h

2003-03-31 Thread Jani Taskinen

sniper  Mon Mar 31 03:49:30 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/gdgd.c php_gd.h 
  Log:
  cleanup
  
Index: php4/ext/gd/gd.c
diff -u php4/ext/gd/gd.c:1.221.2.18 php4/ext/gd/gd.c:1.221.2.19
--- php4/ext/gd/gd.c:1.221.2.18 Sun Mar 30 13:05:40 2003
+++ php4/ext/gd/gd.cMon Mar 31 03:49:30 2003
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: gd.c,v 1.221.2.18 2003/03/30 18:05:40 rasmus Exp $ */
+/* $Id: gd.c,v 1.221.2.19 2003/03/31 08:49:30 sniper Exp $ */
 
 /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, 
Cold Spring Harbor Labs. */
@@ -376,13 +376,13 @@
 
 /* {{{ PHP_RSHUTDOWN_FUNCTION
  */
+#if HAVE_LIBGD20  HAVE_GD_STRINGFT
 PHP_RSHUTDOWN_FUNCTION(gd)
 {
-#if HAVE_LIBGD20  HAVE_GD_STRINGFT
gdFreeFontCache();
-#endif
return SUCCESS;
 }
+#endif
 /* }}} */
 
 /* {{{ PHP_MINFO_FUNCTION
Index: php4/ext/gd/php_gd.h
diff -u php4/ext/gd/php_gd.h:1.44.2.4 php4/ext/gd/php_gd.h:1.44.2.5
--- php4/ext/gd/php_gd.h:1.44.2.4   Wed Mar  5 11:04:20 2003
+++ php4/ext/gd/php_gd.hMon Mar 31 03:49:30 2003
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: php_gd.h,v 1.44.2.4 2003/03/05 16:04:20 iliaa Exp $ */
+/* $Id: php_gd.h,v 1.44.2.5 2003/03/31 08:49:30 sniper Exp $ */
 
 #ifndef PHP_GD_H
 #define PHP_GD_H
@@ -58,7 +58,9 @@
 PHP_MINFO_FUNCTION(gd);
 PHP_MINIT_FUNCTION(gd);
 PHP_MSHUTDOWN_FUNCTION(gd);
+#if HAVE_LIBGD20  HAVE_GD_STRINGFT
 PHP_RSHUTDOWN_FUNCTION(gd);
+#endif
 
 PHP_FUNCTION(gd_info);
 PHP_FUNCTION(imagearc);



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

[PHP-CVS] cvs: php4(PHP_4_3) /ext/gd gd.c php_gd.h

2002-12-11 Thread Ilia Alshanetsky

iliaa   Wed Dec 11 18:30:24 2002 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/gdgd.c php_gd.h 
  Log:
  MFH (make imagecreatefromxpm() unavailable when bundled GD is used)
  
  
Index: php4/ext/gd/gd.c
diff -u php4/ext/gd/gd.c:1.221.2.6 php4/ext/gd/gd.c:1.221.2.7
--- php4/ext/gd/gd.c:1.221.2.6  Tue Dec 10 12:57:54 2002
+++ php4/ext/gd/gd.cWed Dec 11 18:30:23 2002
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: gd.c,v 1.221.2.6 2002/12/10 17:57:54 iliaa Exp $ */
+/* $Id: gd.c,v 1.221.2.7 2002/12/11 23:30:23 iliaa Exp $ */
 
 /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, 
Cold Spring Harbor Labs. */
@@ -188,7 +188,7 @@
 #ifdef HAVE_GD_XBM
PHP_FE(imagecreatefromxbm,  NULL)
 #endif
-#ifdef HAVE_GD_XPM
+#if defined(HAVE_GD_XPM)  defined(HAVE_GD_BUNDLED)
PHP_FE(imagecreatefromxpm,  NULL)
 #endif
PHP_FE(imagecreatefromgd,   NULL)
@@ -1358,7 +1358,7 @@
case PHP_GDIMG_TYPE_GD2PART:
im = (*func_p)(fp, Z_LVAL_PP(srcx), Z_LVAL_PP(srcy), 
Z_LVAL_PP(width), Z_LVAL_PP(height));
break;
-#ifdef HAVE_GD_XPM
+#if defined(HAVE_GD_XPM)  defined(HAVE_GD_BUNDLED)
case PHP_GDIMG_TYPE_XPM:
im = gdImageCreateFromXpm(fn);
break;
@@ -1425,7 +1425,7 @@
 /* }}} */
 #endif /* HAVE_GD_XBM */
 
-#ifdef HAVE_GD_XPM
+#if defined(HAVE_GD_XPM)  defined(HAVE_GD_BUNDLED)
 /* {{{ proto int imagecreatefromxpm(string filename)
Create a new image from XPM file or URL */
 PHP_FUNCTION(imagecreatefromxpm)
Index: php4/ext/gd/php_gd.h
diff -u php4/ext/gd/php_gd.h:1.44 php4/ext/gd/php_gd.h:1.44.2.1
--- php4/ext/gd/php_gd.h:1.44   Tue Nov 12 06:49:11 2002
+++ php4/ext/gd/php_gd.hWed Dec 11 18:30:23 2002
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: php_gd.h,v 1.44 2002/11/12 11:49:11 helly Exp $ */
+/* $Id: php_gd.h,v 1.44.2.1 2002/12/11 23:30:23 iliaa Exp $ */
 
 #ifndef PHP_GD_H
 #define PHP_GD_H
@@ -110,12 +110,14 @@
 PHP_FUNCTION(imagecreatefromgif);
 PHP_FUNCTION(imagecreatefromjpeg);
 PHP_FUNCTION(imagecreatefromxbm);
-PHP_FUNCTION(imagecreatefromxpm);
 PHP_FUNCTION(imagecreatefrompng);
 PHP_FUNCTION(imagecreatefromwbmp);
 PHP_FUNCTION(imagecreatefromgd);
 PHP_FUNCTION(imagecreatefromgd2);
 PHP_FUNCTION(imagecreatefromgd2part);
+#if defined(HAVE_GD_XPM)  defined(HAVE_GD_BUNDLED)
+PHP_FUNCTION(imagecreatefromxpm);
+#endif
 
 PHP_FUNCTION(imagegammacorrect);
 PHP_FUNCTION(imagedestroy);



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

Re: [PHP-CVS] cvs: php4(PHP_4_3) /ext/gd gd.c php_gd.h

2002-12-11 Thread Ilia A.

Small correction, it actually should say non-bundled.

On December 11, 2002 06:30 pm, Ilia Alshanetsky wrote:
 iliaa Wed Dec 11 18:30:24 2002 EDT

   Modified files:  (Branch: PHP_4_3)
 /php4/ext/gd  gd.c php_gd.h
   Log:
   MFH (make imagecreatefromxpm() unavailable when bundled GD is used)


 Index: php4/ext/gd/gd.c
 diff -u php4/ext/gd/gd.c:1.221.2.6 php4/ext/gd/gd.c:1.221.2.7
 --- php4/ext/gd/gd.c:1.221.2.6Tue Dec 10 12:57:54 2002
 +++ php4/ext/gd/gd.c  Wed Dec 11 18:30:23 2002
 @@ -18,7 +18,7 @@

 +--+ */

 -/* $Id: gd.c,v 1.221.2.6 2002/12/10 17:57:54 iliaa Exp $ */
 +/* $Id: gd.c,v 1.221.2.7 2002/12/11 23:30:23 iliaa Exp $ */

  /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
 Cold Spring Harbor Labs. */
 @@ -188,7 +188,7 @@
  #ifdef HAVE_GD_XBM
   PHP_FE(imagecreatefromxbm,  NULL)
  #endif
 -#ifdef HAVE_GD_XPM
 +#if defined(HAVE_GD_XPM)  defined(HAVE_GD_BUNDLED)
   PHP_FE(imagecreatefromxpm,  NULL)
  #endif
   PHP_FE(imagecreatefromgd,   NULL)
 @@ -1358,7 +1358,7 @@
   case PHP_GDIMG_TYPE_GD2PART:
   im = (*func_p)(fp, Z_LVAL_PP(srcx), Z_LVAL_PP(srcy), 
Z_LVAL_PP(width),
 Z_LVAL_PP(height)); break;
 -#ifdef HAVE_GD_XPM
 +#if defined(HAVE_GD_XPM)  defined(HAVE_GD_BUNDLED)
   case PHP_GDIMG_TYPE_XPM:
   im = gdImageCreateFromXpm(fn);
   break;
 @@ -1425,7 +1425,7 @@
  /* }}} */
  #endif /* HAVE_GD_XBM */

 -#ifdef HAVE_GD_XPM
 +#if defined(HAVE_GD_XPM)  defined(HAVE_GD_BUNDLED)
  /* {{{ proto int imagecreatefromxpm(string filename)
 Create a new image from XPM file or URL */
  PHP_FUNCTION(imagecreatefromxpm)
 Index: php4/ext/gd/php_gd.h
 diff -u php4/ext/gd/php_gd.h:1.44 php4/ext/gd/php_gd.h:1.44.2.1
 --- php4/ext/gd/php_gd.h:1.44 Tue Nov 12 06:49:11 2002
 +++ php4/ext/gd/php_gd.h  Wed Dec 11 18:30:23 2002
 @@ -17,7 +17,7 @@

 +--+ */

 -/* $Id: php_gd.h,v 1.44 2002/11/12 11:49:11 helly Exp $ */
 +/* $Id: php_gd.h,v 1.44.2.1 2002/12/11 23:30:23 iliaa Exp $ */

  #ifndef PHP_GD_H
  #define PHP_GD_H
 @@ -110,12 +110,14 @@
  PHP_FUNCTION(imagecreatefromgif);
  PHP_FUNCTION(imagecreatefromjpeg);
  PHP_FUNCTION(imagecreatefromxbm);
 -PHP_FUNCTION(imagecreatefromxpm);
  PHP_FUNCTION(imagecreatefrompng);
  PHP_FUNCTION(imagecreatefromwbmp);
  PHP_FUNCTION(imagecreatefromgd);
  PHP_FUNCTION(imagecreatefromgd2);
  PHP_FUNCTION(imagecreatefromgd2part);
 +#if defined(HAVE_GD_XPM)  defined(HAVE_GD_BUNDLED)
 +PHP_FUNCTION(imagecreatefromxpm);
 +#endif

  PHP_FUNCTION(imagegammacorrect);
  PHP_FUNCTION(imagedestroy);


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

[PHP-CVS] cvs: php4(PHP_4_3) /ext/gd gd.c php_gd.h

[PHP-CVS] cvs: php4(PHP_4_3) /ext/gd gd.c php_gd.h

Re: [PHP-CVS] cvs: php4(PHP_4_3) /ext/gd gd.c php_gd.h

3 matches

Site Navigation

Mail list logo

Footer information