]> granicus.if.org Git - php/commitdiff
- Made gd extension build when using gd version < 1.5
authorMathieu Kooiman <mathieu@php.net>
Wed, 8 Nov 2000 14:56:09 +0000 (14:56 +0000)
committerMathieu Kooiman <mathieu@php.net>
Wed, 8 Nov 2000 14:56:09 +0000 (14:56 +0000)
ext/gd/gd.c

index 61f4b0fefa3e31114fdb2e99a4c2b1176801173c..54c58eb45f1f244a7cd3f68cf7730b63b6bf57dc 100644 (file)
@@ -480,6 +480,7 @@ PHP_FUNCTION(imagetypes)
 
 static int _php_image_type (char data[8])
 {
+#ifdef HAVE_LIBGD15
        /* Based on ext/standard/images.c */
 
        if (data == NULL)
@@ -507,10 +508,12 @@ static int _php_image_type (char data[8])
        }
 #endif
        return -1;
+#endif
 }
 
 gdImagePtr _php_image_create_from_string (zval **data, char *tn, gdImagePtr (*ioctx_func_p)())
 {
+#ifdef HAVE_LIBGD15 
        gdImagePtr im;
        gdIOCtx *io_ctx;
         
@@ -528,12 +531,14 @@ gdImagePtr _php_image_create_from_string (zval **data, char *tn, gdImagePtr (*io
        }
 
        return im;
+#endif
 }
 
 /* {{{ proto int imagecreatefromstring(string image)
    Create a new image from the image stream in the string */
 PHP_FUNCTION (imagecreatefromstring)
 {
+#ifdef HAVE_LIBGD15
        zval **data;
        gdImagePtr im;
        int imtype;
@@ -596,6 +601,7 @@ PHP_FUNCTION (imagecreatefromstring)
        }
 
        ZEND_REGISTER_RESOURCE(return_value, im, GDG (le_gd));
+#endif
 }
 /* }}} */