version 1.1.1.1, 2012/02/21 23:47:56
|
version 1.1.1.2, 2012/05/29 12:34:39
|
Line 33
|
Line 33
|
#if HAVE_LIBGD |
#if HAVE_LIBGD |
|
|
/* open_basedir and safe_mode checks */ |
/* open_basedir and safe_mode checks */ |
#define PHP_GD_CHECK_OPEN_BASEDIR(filename, errormsg) \ | #define PHP_GD_CHECK_OPEN_BASEDIR(filename, errormsg) \ |
if (!filename || php_check_open_basedir(filename TSRMLS_CC) || \ | if (!filename || php_check_open_basedir(filename TSRMLS_CC)) { \ |
(PG(safe_mode) && !php_checkuid(filename, NULL, CHECKUID_CHECK_FILE_AND_DIR)) \ | php_error_docref(NULL TSRMLS_CC, E_WARNING, errormsg); \ |
) { \ | RETURN_FALSE; \ |
php_error_docref(NULL TSRMLS_CC, E_WARNING, errormsg); \ | |
RETURN_FALSE; \ | |
} |
} |
|
|
#define PHP_GDIMG_TYPE_GIF 1 |
#define PHP_GDIMG_TYPE_GIF 1 |
Line 50
|
Line 48
|
#define PHP_GDIMG_CONVERT_WBM 7 |
#define PHP_GDIMG_CONVERT_WBM 7 |
#define PHP_GDIMG_TYPE_GD 8 |
#define PHP_GDIMG_TYPE_GD 8 |
#define PHP_GDIMG_TYPE_GD2 9 |
#define PHP_GDIMG_TYPE_GD2 9 |
#define PHP_GDIMG_TYPE_GD2PART 10 | #define PHP_GDIMG_TYPE_GD2PART 10 |
| #define PHP_GDIMG_TYPE_WEBP 11 |
|
|
#ifdef PHP_WIN32 |
#ifdef PHP_WIN32 |
# define PHP_GD_API __declspec(dllexport) |
# define PHP_GD_API __declspec(dllexport) |
Line 137 PHP_FUNCTION(imagecreatefromstring);
|
Line 136 PHP_FUNCTION(imagecreatefromstring);
|
PHP_FUNCTION(imagecreatefromgif); |
PHP_FUNCTION(imagecreatefromgif); |
PHP_FUNCTION(imagecreatefromjpeg); |
PHP_FUNCTION(imagecreatefromjpeg); |
PHP_FUNCTION(imagecreatefromxbm); |
PHP_FUNCTION(imagecreatefromxbm); |
|
PHP_FUNCTION(imagecreatefromwebp); |
PHP_FUNCTION(imagecreatefrompng); |
PHP_FUNCTION(imagecreatefrompng); |
PHP_FUNCTION(imagecreatefromwbmp); |
PHP_FUNCTION(imagecreatefromwbmp); |
PHP_FUNCTION(imagecreatefromgd); |
PHP_FUNCTION(imagecreatefromgd); |
Line 158 PHP_FUNCTION(imagefontheight);
|
Line 158 PHP_FUNCTION(imagefontheight);
|
PHP_FUNCTION(imagegif ); |
PHP_FUNCTION(imagegif ); |
PHP_FUNCTION(imagejpeg ); |
PHP_FUNCTION(imagejpeg ); |
PHP_FUNCTION(imagepng); |
PHP_FUNCTION(imagepng); |
|
PHP_FUNCTION(imagewebp); |
PHP_FUNCTION(imagewbmp); |
PHP_FUNCTION(imagewbmp); |
PHP_FUNCTION(imagegd); |
PHP_FUNCTION(imagegd); |
PHP_FUNCTION(imagegd2); |
PHP_FUNCTION(imagegd2); |