summaryrefslogtreecommitdiff
path: root/ext/gd
diff options
context:
space:
mode:
Diffstat (limited to 'ext/gd')
-rw-r--r--ext/gd/gd.c76
-rw-r--r--ext/gd/gdt1.c24
2 files changed, 50 insertions, 50 deletions
diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index 8b989a8620..1aabbe96e1 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -363,7 +363,7 @@ PHP_FUNCTION(imageloadfont) {
* that overlap with the old fonts (with indices 1-5). The first
* list index given out is always 1.
*/
- ind = 5 + php3_list_insert(font, GD_GLOBAL(le_gd_font));
+ ind = 5 + zend_list_insert(font, GD_GLOBAL(le_gd_font));
RETURN_LONG(ind);
}
@@ -386,7 +386,7 @@ PHP_FUNCTION(imagecreate)
convert_to_long(y_size);
im = gdImageCreate(x_size->value.lval, y_size->value.lval);
- ind = php3_list_insert(im, GD_GLOBAL(le_gd));
+ ind = zend_list_insert(im, GD_GLOBAL(le_gd));
RETURN_LONG(ind);
}
@@ -423,7 +423,7 @@ void php3_imagecreatefrompng (INTERNAL_FUNCTION_PARAMETERS) {
im = gdImageCreateFromPng (fp);
fflush(fp);
fclose(fp);
- ind = php3_list_insert(im, GD_GLOBAL(le_gd));
+ ind = zend_list_insert(im, GD_GLOBAL(le_gd));
RETURN_LONG(ind);
}
/* }}} */
@@ -452,7 +452,7 @@ void php3_imagepng (INTERNAL_FUNCTION_PARAMETERS) {
RETURN_FALSE;
}
}
- im = php3_list_find(imgind->value.lval, &ind_type);
+ im = zend_list_find(imgind->value.lval, &ind_type);
if (!im || ind_type != GD_GLOBAL(le_gd)) {
php3_error(E_WARNING, "ImagePng: unable to find image pointer");
RETURN_FALSE;
@@ -476,7 +476,7 @@ void php3_imagepng (INTERNAL_FUNCTION_PARAMETERS) {
php3_error(E_WARNING, "Unable to open temporary file");
RETURN_FALSE;
}
- output = php3_header();
+ output = php_header();
if (output) {
gdImagePng (im, tmp);
fseek(tmp, 0, SEEK_SET);
@@ -536,7 +536,7 @@ PHP_FUNCTION(imagecreatefromgif )
fflush(fp);
fclose(fp);
- ind = php3_list_insert(im, GD_GLOBAL(le_gd));
+ ind = zend_list_insert(im, GD_GLOBAL(le_gd));
RETURN_LONG(ind);
}
@@ -571,7 +571,7 @@ PHP_FUNCTION(imagegif )
}
}
- im = php3_list_find(imgind->value.lval, &ind_type);
+ im = zend_list_find(imgind->value.lval, &ind_type);
if (!im || ind_type != GD_GLOBAL(le_gd)) {
php_error(E_WARNING, "ImageGif: unable to find image pointer");
RETURN_FALSE;
@@ -598,7 +598,7 @@ PHP_FUNCTION(imagegif )
RETURN_FALSE;
}
- output = php3_header();
+ output = php_header();
if (output) {
gdImageGif (im, tmp);
@@ -637,7 +637,7 @@ PHP_FUNCTION(imagedestroy)
convert_to_long(imgind);
- php3_list_delete(imgind->value.lval);
+ zend_list_delete(imgind->value.lval);
RETURN_TRUE;
}
@@ -669,7 +669,7 @@ PHP_FUNCTION(imagecolorallocate)
g = green->value.lval;
b = blue->value.lval;
- im = php3_list_find(ind, &ind_type);
+ im = zend_list_find(ind, &ind_type);
if (!im || ind_type != GD_GLOBAL(le_gd)) {
php_error(E_WARNING, "ImageColorAllocate: Unable to find image pointer");
RETURN_FALSE;
@@ -699,7 +699,7 @@ PHP_FUNCTION(imagecolorat)
ind = imgind->value.lval;
- im = php3_list_find(ind, &ind_type);
+ im = zend_list_find(ind, &ind_type);
if (!im || ind_type != GD_GLOBAL(le_gd)) {
php_error(E_WARNING, "ImageColorAt: Unable to find image pointer");
RETURN_FALSE;
@@ -743,7 +743,7 @@ PHP_FUNCTION(imagecolorclosest)
g = green->value.lval;
b = blue->value.lval;
- im = php3_list_find(ind, &ind_type);
+ im = zend_list_find(ind, &ind_type);
if (!im || ind_type != GD_GLOBAL(le_gd)) {
php_error(E_WARNING, "ImageColorClosest: Unable to find image pointer");
RETURN_FALSE;
@@ -771,7 +771,7 @@ PHP_FUNCTION(imagecolordeallocate)
ind = imgind->value.lval;
col = index->value.lval;
- im = php3_list_find(ind, &ind_type);
+ im = zend_list_find(ind, &ind_type);
if (!im || ind_type != GD_GLOBAL(le_gd)) {
php_error(E_WARNING, "ImageColorDeallocate: Unable to find image pointer");
RETURN_FALSE;
@@ -814,7 +814,7 @@ PHP_FUNCTION(imagecolorresolve)
g = green->value.lval;
b = blue->value.lval;
- im = php3_list_find(ind, &ind_type);
+ im = zend_list_find(ind, &ind_type);
if (!im || ind_type != GD_GLOBAL(le_gd)) {
php_error(E_WARNING, "ImageColorResolve: Unable to find image pointer");
RETURN_FALSE;
@@ -850,7 +850,7 @@ PHP_FUNCTION(imagecolorexact)
g = green->value.lval;
b = blue->value.lval;
- im = php3_list_find(ind, &ind_type);
+ im = zend_list_find(ind, &ind_type);
if (!im || ind_type != GD_GLOBAL(le_gd)) {
php_error(E_WARNING, "ImageColorExact: Unable to find image pointer");
RETURN_FALSE;
@@ -887,7 +887,7 @@ PHP_FUNCTION(imagecolorset)
g = green->value.lval;
b = blue->value.lval;
- im = php3_list_find(ind, &ind_type);
+ im = zend_list_find(ind, &ind_type);
if (!im || ind_type != GD_GLOBAL(le_gd)) {
php_error(E_WARNING, "ImageColorSet: Unable to find image pointer");
RETURN_FALSE;
@@ -921,7 +921,7 @@ PHP_FUNCTION(imagecolorsforindex)
ind = imgind->value.lval;
col = index->value.lval;
- im = php3_list_find(ind, &ind_type);
+ im = zend_list_find(ind, &ind_type);
if (!im || ind_type != GD_GLOBAL(le_gd)) {
php_error(E_WARNING, "ImageColorsForIndex: Unable to find image pointer");
RETURN_FALSE;
@@ -967,7 +967,7 @@ PHP_FUNCTION(imagesetpixel)
y = yarg->value.lval;
x = xarg->value.lval;
- im = php3_list_find(imarg->value.lval, &ind_type);
+ im = zend_list_find(imarg->value.lval, &ind_type);
if (!im || ind_type != GD_GLOBAL(le_gd)) {
php_error(E_WARNING, "Unable to find image pointer");
RETURN_FALSE;
@@ -1009,7 +1009,7 @@ PHP_FUNCTION(imageline)
y2 = Y2->value.lval;
col = COL->value.lval;
- im = php3_list_find(IM->value.lval, &ind_type);
+ im = zend_list_find(IM->value.lval, &ind_type);
if (!im || ind_type != GD_GLOBAL(le_gd)) {
php_error(E_WARNING, "Unable to find image pointer");
RETURN_FALSE;
@@ -1048,7 +1048,7 @@ PHP_FUNCTION(imagedashedline)
y2 = Y2->value.lval;
col = COL->value.lval;
- im = php3_list_find(IM->value.lval, &ind_type);
+ im = zend_list_find(IM->value.lval, &ind_type);
if (!im || ind_type != GD_GLOBAL(le_gd)) {
php_error(E_WARNING, "Unable to find image pointer");
RETURN_FALSE;
@@ -1089,7 +1089,7 @@ PHP_FUNCTION(imagerectangle)
y2 = Y2->value.lval;
col = COL->value.lval;
- im = php3_list_find(IM->value.lval, &ind_type);
+ im = zend_list_find(IM->value.lval, &ind_type);
if (!im || ind_type != GD_GLOBAL(le_gd)) {
php_error(E_WARNING, "Unable to find image pointer");
RETURN_FALSE;
@@ -1130,7 +1130,7 @@ PHP_FUNCTION(imagefilledrectangle)
y2 = Y2->value.lval;
col = COL->value.lval;
- im = php3_list_find(IM->value.lval, &ind_type);
+ im = zend_list_find(IM->value.lval, &ind_type);
if (!im || ind_type != GD_GLOBAL(le_gd)) {
php_error(E_WARNING, "Unable to find image pointer");
RETURN_FALSE;
@@ -1181,7 +1181,7 @@ PHP_FUNCTION(imagearc)
st %= 360;
}
- im = php3_list_find(IM->value.lval, &ind_type);
+ im = zend_list_find(IM->value.lval, &ind_type);
if (!im || ind_type != GD_GLOBAL(le_gd)) {
php_error(E_WARNING, "Unable to find image pointer");
RETURN_FALSE;
@@ -1220,7 +1220,7 @@ PHP_FUNCTION(imagefilltoborder)
y = Y->value.lval;
x = X->value.lval;
- im = php3_list_find(IM->value.lval, &ind_type);
+ im = zend_list_find(IM->value.lval, &ind_type);
if (!im || ind_type != GD_GLOBAL(le_gd)) {
php_error(E_WARNING, "Unable to find image pointer");
RETURN_FALSE;
@@ -1257,7 +1257,7 @@ PHP_FUNCTION(imagefill)
y = Y->value.lval;
x = X->value.lval;
- im = php3_list_find(IM->value.lval, &ind_type);
+ im = zend_list_find(IM->value.lval, &ind_type);
if (!im || ind_type != GD_GLOBAL(le_gd)) {
php_error(E_WARNING, "Unable to find image pointer");
RETURN_FALSE;
@@ -1282,7 +1282,7 @@ PHP_FUNCTION(imagecolorstotal)
}
convert_to_long(IM);
- im = php3_list_find(IM->value.lval, &ind_type);
+ im = zend_list_find(IM->value.lval, &ind_type);
if (!im || ind_type != GD_GLOBAL(le_gd)) {
php_error(E_WARNING, "Unable to find image pointer");
RETURN_FALSE;
@@ -1320,7 +1320,7 @@ PHP_FUNCTION(imagecolortransparent)
}
convert_to_long(IM);
- im = php3_list_find(IM->value.lval, &ind_type);
+ im = zend_list_find(IM->value.lval, &ind_type);
if (!im || ind_type != GD_GLOBAL(le_gd)) {
php_error(E_WARNING, "Unable to find image pointer");
RETURN_FALSE;
@@ -1363,7 +1363,7 @@ PHP_FUNCTION(imageinterlace)
}
convert_to_long(IM);
- im = php3_list_find(IM->value.lval, &ind_type);
+ im = zend_list_find(IM->value.lval, &ind_type);
if (!im || ind_type != GD_GLOBAL(le_gd)) {
php_error(E_WARNING, "Unable to find image pointer");
RETURN_FALSE;
@@ -1402,7 +1402,7 @@ static void _php3_imagepolygon(INTERNAL_FUNCTION_PARAMETERS, int filled) {
npoints = NPOINTS->value.lval;
col = COL->value.lval;
- im = php3_list_find(IM->value.lval, &ind_type);
+ im = zend_list_find(IM->value.lval, &ind_type);
if (!im || ind_type != GD_GLOBAL(le_gd)) {
php_error(E_WARNING, "Unable to find image pointer");
RETURN_FALSE;
@@ -1505,7 +1505,7 @@ static gdFontPtr _php3_find_gd_font(int size)
font = gdFontGiant;
break;
default:
- font = php3_list_find(size - 5, &ind_type);
+ font = zend_list_find(size - 5, &ind_type);
if (!font || ind_type != GD_GLOBAL(le_gd_font)) {
if (size < 1) {
font = gdFontTiny;
@@ -1618,7 +1618,7 @@ static void _php3_imagechar(INTERNAL_FUNCTION_PARAMETERS, int mode) {
x = X->value.lval;
size = SIZE->value.lval;
- im = php3_list_find(IM->value.lval, &ind_type);
+ im = zend_list_find(IM->value.lval, &ind_type);
if (!im || ind_type != GD_GLOBAL(le_gd)) {
php_error(E_WARNING, "Unable to find image pointer");
if (string) {
@@ -1719,13 +1719,13 @@ PHP_FUNCTION(imagecopy)
dstX = DX->value.lval;
dstY = DY->value.lval;
- im_src = php3_list_find(SIM->value.lval, &ind_type);
+ im_src = zend_list_find(SIM->value.lval, &ind_type);
if (!im_src || ind_type != GD_GLOBAL(le_gd)) {
php_error(E_WARNING, "Unable to find image pointer");
RETURN_FALSE;
}
- im_dst = php3_list_find(DIM->value.lval, &ind_type);
+ im_dst = zend_list_find(DIM->value.lval, &ind_type);
if (!im_dst || ind_type != GD_GLOBAL(le_gd)) {
php_error(E_WARNING, "Unable to find image pointer");
RETURN_FALSE;
@@ -1773,13 +1773,13 @@ PHP_FUNCTION(imagecopyresized)
dstH = DH->value.lval;
dstW = DW->value.lval;
- im_src = php3_list_find(SIM->value.lval, &ind_type);
+ im_src = zend_list_find(SIM->value.lval, &ind_type);
if (!im_src || ind_type != GD_GLOBAL(le_gd)) {
php_error(E_WARNING, "Unable to find image pointer");
RETURN_FALSE;
}
- im_dst = php3_list_find(DIM->value.lval, &ind_type);
+ im_dst = zend_list_find(DIM->value.lval, &ind_type);
if (!im_dst || ind_type != GD_GLOBAL(le_gd)) {
php_error(E_WARNING, "Unable to find image pointer");
RETURN_FALSE;
@@ -1804,7 +1804,7 @@ PHP_FUNCTION(imagesx)
WRONG_PARAM_COUNT;
}
- im = php3_list_find(IM->value.lval, &ind_type);
+ im = zend_list_find(IM->value.lval, &ind_type);
if (!im || ind_type != GD_GLOBAL(le_gd)) {
php_error(E_WARNING, "Unable to find image pointer");
RETURN_FALSE;
@@ -1827,7 +1827,7 @@ PHP_FUNCTION(imagesy)
WRONG_PARAM_COUNT;
}
- im = php3_list_find(IM->value.lval, &ind_type);
+ im = zend_list_find(IM->value.lval, &ind_type);
if (!im || ind_type != GD_GLOBAL(le_gd)) {
php_error(E_WARNING, "Unable to find image pointer");
RETURN_FALSE;
@@ -1897,7 +1897,7 @@ void php3_imagettftext_common(INTERNAL_FUNCTION_PARAMETERS, int mode)
col = COL->value.lval;
y = Y->value.lval;
x = X->value.lval;
- im = php3_list_find(IM->value.lval, &ind_type);
+ im = zend_list_find(IM->value.lval, &ind_type);
if (!im || ind_type != GD_GLOBAL(le_gd)) {
php_error(E_WARNING, "Unable to find image pointer");
RETURN_FALSE;
diff --git a/ext/gd/gdt1.c b/ext/gd/gdt1.c
index d26a4926d4..0b57af449d 100644
--- a/ext/gd/gdt1.c
+++ b/ext/gd/gdt1.c
@@ -68,7 +68,7 @@ void php3_imagepsloadfont(INTERNAL_FUNCTION_PARAMETERS) {
T1_LoadFont(f_ind->font_id);
f_ind->extend = 1;
- l_ind = php3_list_insert(f_ind, GD_GLOBAL(le_ps_font));
+ l_ind = zend_list_insert(f_ind, GD_GLOBAL(le_ps_font));
RETURN_LONG(l_ind);
}
/* }}} */
@@ -88,7 +88,7 @@ void php3_imagepscopyfont(INTERNAL_FUNCTION_PARAMETERS) {
convert_to_long(fnt);
- of_ind = php3_list_find(fnt->value.lval, &type);
+ of_ind = zend_list_find(fnt->value.lval, &type);
if (type != GD_GLOBAL(le_ps_font)) {
php3_error(E_WARNING, "%d is not a Type 1 font index", fnt->value.lval);
@@ -122,7 +122,7 @@ void php3_imagepscopyfont(INTERNAL_FUNCTION_PARAMETERS) {
}
nf_ind->extend = 1;
- l_ind = php3_list_insert(nf_ind, GD_GLOBAL(le_ps_font));
+ l_ind = zend_list_insert(nf_ind, GD_GLOBAL(le_ps_font));
RETURN_LONG(l_ind);
}
*/
@@ -140,14 +140,14 @@ void php3_imagepsfreefont(INTERNAL_FUNCTION_PARAMETERS) {
convert_to_long(fnt);
- php3_list_find(fnt->value.lval, &type);
+ zend_list_find(fnt->value.lval, &type);
if (type != GD_GLOBAL(le_ps_font)) {
php3_error(E_WARNING, "%d is not a Type 1 font index", fnt->value.lval);
RETURN_FALSE;
}
- php3_list_delete(fnt->value.lval);
+ zend_list_delete(fnt->value.lval);
RETURN_TRUE;
}
/* }}} */
@@ -167,7 +167,7 @@ void php3_imagepsencodefont(INTERNAL_FUNCTION_PARAMETERS) {
convert_to_long(fnt);
convert_to_string(enc);
- f_ind = php3_list_find(fnt->value.lval, &type);
+ f_ind = zend_list_find(fnt->value.lval, &type);
if (type != GD_GLOBAL(le_ps_font)) {
php3_error(E_WARNING, "%d is not a Type 1 font index", fnt->value.lval);
@@ -185,7 +185,7 @@ void php3_imagepsencodefont(INTERNAL_FUNCTION_PARAMETERS) {
php3_error(E_WARNING, "Couldn't reencode font");
RETURN_FALSE;
}
- php3_list_insert(enc_vector, GD_GLOBAL(le_ps_enc));
+ zend_list_insert(enc_vector, GD_GLOBAL(le_ps_enc));
RETURN_TRUE;
}
/* }}} */
@@ -204,7 +204,7 @@ void php3_imagepsextendfont(INTERNAL_FUNCTION_PARAMETERS) {
convert_to_long(fnt);
convert_to_double(ext);
- f_ind = php3_list_find(fnt->value.lval, &type);
+ f_ind = zend_list_find(fnt->value.lval, &type);
if (type != GD_GLOBAL(le_ps_font)) {
php3_error(E_WARNING, "%d is not a Type 1 font index", fnt->value.lval);
@@ -231,7 +231,7 @@ void php3_imagepsslantfont(INTERNAL_FUNCTION_PARAMETERS) {
convert_to_long(fnt);
convert_to_double(slt);
- f_ind = php3_list_find(fnt->value.lval, &type);
+ f_ind = zend_list_find(fnt->value.lval, &type);
if (type != GD_GLOBAL(le_ps_font)) {
php3_error(E_WARNING, "%d is not a Type 1 font index", fnt->value.lval);
@@ -309,14 +309,14 @@ void php3_imagepstext(INTERNAL_FUNCTION_PARAMETERS) {
WRONG_PARAM_COUNT;
}
- bg_img = php3_list_find(img->value.lval, &type);
+ bg_img = zend_list_find(img->value.lval, &type);
if (!bg_img || type != GD_GLOBAL(le_gd)) {
php3_error(E_WARNING, "Unable to find image pointer");
RETURN_FALSE;
}
- f_ind = php3_list_find(fnt->value.lval, &type);
+ f_ind = zend_list_find(fnt->value.lval, &type);
if (!f_ind || type != GD_GLOBAL(le_ps_font)) {
php3_error(E_WARNING, "%d is not a Type 1 font index", fnt->value.lval);
@@ -454,7 +454,7 @@ void php3_imagepsbbox(INTERNAL_FUNCTION_PARAMETERS) {
WRONG_PARAM_COUNT;
}
- f_ind = php3_list_find(fnt->value.lval, &type);
+ f_ind = zend_list_find(fnt->value.lval, &type);
if (type != GD_GLOBAL(le_ps_font)) {
php3_error(E_WARNING, "%d is not a Type 1 font index", fnt->value.lval);
View Lorry Controller Status