pajoye          Wed Dec 14 19:10:52 2005 EDT

  Modified files:              
    /php-src/ext/gd     config.m4 gd.c 
  Log:
  - remove HAVE_GD_GD2, always valid now (2.0.33 or bundled)
  
  
http://cvs.php.net/viewcvs.cgi/php-src/ext/gd/config.m4?r1=1.158&r2=1.159&diff_format=u
Index: php-src/ext/gd/config.m4
diff -u php-src/ext/gd/config.m4:1.158 php-src/ext/gd/config.m4:1.159
--- php-src/ext/gd/config.m4:1.158      Thu Dec  1 00:36:26 2005
+++ php-src/ext/gd/config.m4    Wed Dec 14 19:10:52 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.158 2005/12/01 00:36:26 sniper Exp $
+dnl $Id: config.m4,v 1.159 2005/12/14 19:10:52 pajoye Exp $
 dnl
 
 dnl
@@ -327,7 +327,6 @@
 
 dnl These defines are always available
 dnl FIXME: Cleanup the sources so that these are not needed!
-  AC_DEFINE(HAVE_GD_GD2,              1, [ ])
   AC_DEFINE(HAVE_GD_WBMP,             1, [ ])
   AC_DEFINE(HAVE_LIBGD13,             1, [ ])
   AC_DEFINE(HAVE_LIBGD15,             1, [ ])
http://cvs.php.net/viewcvs.cgi/php-src/ext/gd/gd.c?r1=1.323&r2=1.324&diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.323 php-src/ext/gd/gd.c:1.324
--- php-src/ext/gd/gd.c:1.323   Tue Dec  6 02:24:30 2005
+++ php-src/ext/gd/gd.c Wed Dec 14 19:10:52 2005
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: gd.c,v 1.323 2005/12/06 02:24:30 sniper Exp $ */
+/* $Id: gd.c,v 1.324 2005/12/14 19:10:52 pajoye Exp $ */
 
 /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
    Cold Spring Harbor Labs. */
@@ -239,10 +239,8 @@
        PHP_FE(imagecreatefromxpm,                                              
NULL)
 #endif
        PHP_FE(imagecreatefromgd,                                               
NULL)
-#ifdef HAVE_GD_GD2
        PHP_FE(imagecreatefromgd2,                                              
NULL)
        PHP_FE(imagecreatefromgd2part,                                  NULL)
-#endif
 #ifdef HAVE_GD_PNG
        PHP_FE(imagepng,                                                        
        NULL)
 #endif
@@ -256,9 +254,7 @@
        PHP_FE(imagewbmp,                               NULL)
 #endif
        PHP_FE(imagegd,                                                         
        NULL)
-#ifdef HAVE_GD_GD2
        PHP_FE(imagegd2,                                                        
        NULL)
-#endif
 
        PHP_FE(imagedestroy,                                                    
NULL)
        PHP_FE(imagegammacorrect,                                               
NULL)
@@ -1449,12 +1445,7 @@
                        break;
 
                case PHP_GDIMG_TYPE_GD2:
-#ifdef HAVE_GD_GD2
                        im = _php_image_create_from_string(data, "GD2", 
gdImageCreateFromGd2Ctx TSRMLS_CC);
-#else
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "No GD2 
support in this PHP build");
-                       RETURN_FALSE;
-#endif
                        break;
 
                default:
@@ -1652,7 +1643,6 @@
 }
 /* }}} */
 
-#ifdef HAVE_GD_GD2
 /* {{{ proto resource imagecreatefromgd2(string filename)
    Create a new image from GD2 file or URL */
 PHP_FUNCTION(imagecreatefromgd2)
@@ -1668,7 +1658,6 @@
        _php_image_create_from(INTERNAL_FUNCTION_PARAM_PASSTHRU, 
PHP_GDIMG_TYPE_GD2PART, "GD2", gdImageCreateFromGd2Part, 
gdImageCreateFromGd2PartCtx);
 }
 /* }}} */
-#endif /* HAVE_GD_GD2 */
 
 /* {{{ _php_image_output
  */
@@ -1887,7 +1876,6 @@
 }
 /* }}} */
 
-#ifdef HAVE_GD_GD2
 /* {{{ proto bool imagegd2(resource im [, string filename, [, int chunk_size, 
[, int type]]])
    Output GD2 image to browser or file */
 PHP_FUNCTION(imagegd2)
@@ -1895,7 +1883,6 @@
        _php_image_output(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_GD2, 
"GD2", gdImageGd2);
 }
 /* }}} */
-#endif /* HAVE_GD_GD2 */
 
 /* {{{ proto bool imagedestroy(resource im)
    Destroy an image */

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

Reply via email to