From 8896429125c74fa66a53fb1a98b8eb89256d7507 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Paw=C5=82ow?= Date: Fri, 23 Sep 2016 02:26:32 +0200 Subject: Use constants for resource names. --- php_imlib.c | 134 ++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 71 insertions(+), 63 deletions(-) (limited to 'php_imlib.c') diff --git a/php_imlib.c b/php_imlib.c index 71b9666..85cf9c5 100644 --- a/php_imlib.c +++ b/php_imlib.c @@ -72,14 +72,22 @@ zend_imlib_globals imlib_globals; ZEND_ARG_PASS_INFO(1) ZEND_END_ARG_INFO(); +static const char le_imlib_cr_name[] = "Imlib Color Range"; static int le_imlib_cr; +static const char le_imlib_font_name[] = "Imlib Font"; static int le_imlib_font; +static const char le_imlib_img_name[] = "Imlib Image"; static int le_imlib_img; +static const char le_imlib_poly_name[] = "Imlib Polygon"; static int le_imlib_poly; +static const char le_imlib_filter_name[] = "Imlib Filter"; static int le_imlib_filter; +static const char le_imlib_cm_name[] = "Imlib Color Modifier"; static int le_imlib_cm; #if HAVE_LIBT1 -static int le_ps_font, le_ps_enc; +static const char le_ps_font_name[] = "Type 1 font"; +static int le_ps_font; +static int le_ps_enc; #endif zend_function_entry imlib_functions[] = { @@ -955,7 +963,7 @@ static void _php_imlib_draw_something(INTERNAL_FUNCTION_PARAMETERS, void (*func) return; } - ZEND_FETCH_RESOURCE(im, Imlib_Image, &img, -1, "Imlib Image", le_imlib_img); + ZEND_FETCH_RESOURCE(im, Imlib_Image, &img, -1, le_imlib_img_name, le_imlib_img); imlib_context_set_image(im); imlib_context_set_color(r,g,b,a); @@ -982,7 +990,7 @@ static void _php_imlib_single_arg(INTERNAL_FUNCTION_PARAMETERS, void (*func)()) if (zend_parse_parameters(1 TSRMLS_CC, "r", &img) == FAILURE) return; - ZEND_FETCH_RESOURCE(im, Imlib_Image, &img, -1, "Imlib Image", le_imlib_img); + ZEND_FETCH_RESOURCE(im, Imlib_Image, &img, -1, le_imlib_img_name, le_imlib_img); imlib_context_set_image(im); (*func)(); @@ -1006,7 +1014,7 @@ PHP_FUNCTION(imlib_add_color_to_color_range) if (zend_parse_parameters(6 TSRMLS_CC, "rlllll", &crange, &x, &r, &g, &b, &a) == FAILURE) return; - ZEND_FETCH_RESOURCE(range, Imlib_Color_Range, &crange, -1, "Imlib Color Range", le_imlib_cr); + ZEND_FETCH_RESOURCE(range, Imlib_Color_Range, &crange, -1, le_imlib_cr_name, le_imlib_cr); imlib_context_set_color_range(range); imlib_context_set_color(r,g,b,a); @@ -1026,8 +1034,8 @@ PHP_FUNCTION(imlib_blend_image_onto_image) if (zend_parse_parameters(14 TSRMLS_CC, "rrllllllllllll", &dstimg, &srcimg, &calpha, &sx, &sy, &sw, &sh, &dx, &dy, &dw, &dh, &cdither, &cblend, &calias) == FAILURE) return; - ZEND_FETCH_RESOURCE(src, Imlib_Image, &srcimg, -1, "Imlib Image", le_imlib_img); - ZEND_FETCH_RESOURCE(dst, Imlib_Image, &dstimg, -1, "Imlib Image", le_imlib_img); + ZEND_FETCH_RESOURCE(src, Imlib_Image, &srcimg, -1, le_imlib_img_name, le_imlib_img); + ZEND_FETCH_RESOURCE(dst, Imlib_Image, &dstimg, -1, le_imlib_img_name, le_imlib_img); imlib_context_set_image(dst); imlib_context_set_anti_alias(calias); @@ -1048,7 +1056,7 @@ PHP_FUNCTION(imlib_clone_image) if (zend_parse_parameters(1 TSRMLS_CC, "r", &img) == FAILURE) return; - ZEND_FETCH_RESOURCE(src, Imlib_Image, &img, -1, "Imlib Image", le_imlib_img); + ZEND_FETCH_RESOURCE(src, Imlib_Image, &img, -1, le_imlib_img_name, le_imlib_img); imlib_context_set_image(src); dst = imlib_clone_image(); @@ -1111,7 +1119,7 @@ PHP_FUNCTION(imlib_create_cropped_image) if (zend_parse_parameters(5 TSRMLS_CC, "rllll", &img, &sx, &sy, &sw, &sh) == FAILURE) return; - ZEND_FETCH_RESOURCE(src, Imlib_Image, &img, -1, "Imlib Image", le_imlib_img); + ZEND_FETCH_RESOURCE(src, Imlib_Image, &img, -1, le_imlib_img_name, le_imlib_img); imlib_context_set_image(src); dst = imlib_create_cropped_image(sx,sy,sw,sh); @@ -1131,7 +1139,7 @@ PHP_FUNCTION(imlib_create_cropped_scaled_image) if (zend_parse_parameters(7 TSRMLS_CC, "rllllll", &img, &sx, &sy, &sw, &sh, &dw, &dh) == FAILURE) return; - ZEND_FETCH_RESOURCE(src, Imlib_Image, &img, -1, "Imlib Image", le_imlib_img); + ZEND_FETCH_RESOURCE(src, Imlib_Image, &img, -1, le_imlib_img_name, le_imlib_img); imlib_context_set_image(src); dst = imlib_create_cropped_scaled_image(sx,sy, sw,sh, dw,dh); @@ -1177,7 +1185,7 @@ PHP_FUNCTION(imlib_create_rotated_image) argc = ZEND_NUM_ARGS(); if (zend_parse_parameters(argc TSRMLS_CC, "rd|d", &srcimg, &angle, &radians) == FAILURE) return; - ZEND_FETCH_RESOURCE(src, Imlib_Image, &srcimg, -1, "Imlib Image", le_imlib_img); + ZEND_FETCH_RESOURCE(src, Imlib_Image, &srcimg, -1, le_imlib_img_name, le_imlib_img); if (argc == 2) radians = angle * M_PI/180; @@ -1200,7 +1208,7 @@ PHP_FUNCTION(imlib_create_scaled_image) if (zend_parse_parameters(3 TSRMLS_CC, "rZZ", &img, &dstw, &dsth) == FAILURE) return; - ZEND_FETCH_RESOURCE(src, Imlib_Image, &img, -1, "Imlib Image", le_imlib_img); + ZEND_FETCH_RESOURCE(src, Imlib_Image, &img, -1, le_imlib_img_name, le_imlib_img); convert_to_long_ex(dstw); convert_to_long_ex(dsth); @@ -1248,7 +1256,7 @@ PHP_FUNCTION(imlib_dump_image) ZVAL_LONG(*err,0); } - ZEND_FETCH_RESOURCE(im, Imlib_Image, &img, -1, "Imlib Image", le_imlib_img); + ZEND_FETCH_RESOURCE(im, Imlib_Image, &img, -1, le_imlib_img_name, le_imlib_img); tmp = php_open_temporary_file("", "", &tmpfile TSRMLS_CC); if (tmp == NULL) { @@ -1316,7 +1324,7 @@ PHP_FUNCTION(imlib_free_color_range) if (zend_parse_parameters(1 TSRMLS_CC, "r", &fcr) == FAILURE) return; - ZEND_FETCH_RESOURCE(cr, Imlib_Color_Range, &fcr, -1, "Imlib Color Range", le_imlib_cr); + ZEND_FETCH_RESOURCE(cr, Imlib_Color_Range, &fcr, -1, le_imlib_cr_name, le_imlib_cr); zend_list_delete(Z_LVAL_PP(&fcr)); } /* }}} */ @@ -1331,7 +1339,7 @@ PHP_FUNCTION(imlib_free_color_modifier) if (zend_parse_parameters(1 TSRMLS_CC, "r", &fcm) == FAILURE) return; - ZEND_FETCH_RESOURCE(cm, PHP_Imlib_Color_Modifier, &fcm, -1, "Imlib Color Modifier", le_imlib_cm); + ZEND_FETCH_RESOURCE(cm, PHP_Imlib_Color_Modifier, &fcm, -1, le_imlib_cm_name, le_imlib_cm); zend_list_delete(Z_LVAL_PP(&fcm)); } /* }}} */ @@ -1345,7 +1353,7 @@ PHP_FUNCTION(imlib_free_font) if (zend_parse_parameters(1 TSRMLS_CC, "r", &font) == FAILURE) return; - ZEND_FETCH_RESOURCE(fn, PHP_Imlib_Font, &font, -1, "Imlib Font", le_imlib_font); + ZEND_FETCH_RESOURCE(fn, PHP_Imlib_Font, &font, -1, le_imlib_font_name, le_imlib_font); zend_list_delete(Z_LVAL_PP(&font)); } /* }}} */ @@ -1360,7 +1368,7 @@ PHP_FUNCTION(imlib_free_image) if (zend_parse_parameters(1 TSRMLS_CC, "r", &img) == FAILURE) return; - ZEND_FETCH_RESOURCE(im, Imlib_Image, &img, -1, "Imlib Image", le_imlib_img); + ZEND_FETCH_RESOURCE(im, Imlib_Image, &img, -1, le_imlib_img_name, le_imlib_img); zend_list_delete(Z_LVAL_PP(&img)); } /* }}} */ @@ -1379,7 +1387,7 @@ PHP_FUNCTION(imlib_get_text_advance) if (zend_parse_parameters(5 TSRMLS_CC, "rsZZl", &font, &text, &text_len, &thoriz_adv, &tvert_adv, &dir) == FAILURE) return; - ZEND_FETCH_RESOURCE(fn, PHP_Imlib_Font, &font, -1, "Imlib Font", le_imlib_font); + ZEND_FETCH_RESOURCE(fn, PHP_Imlib_Font, &font, -1, le_imlib_font_name, le_imlib_font); imlib_context_set_font(fn->font); imlib_context_set_direction(dir); @@ -1406,7 +1414,7 @@ PHP_FUNCTION(imlib_get_text_size) if (zend_parse_parameters(5 TSRMLS_CC, "rsZZl", &font, &text, &text_len, &tw, &th, &dir) == FAILURE) return; - ZEND_FETCH_RESOURCE(fn, PHP_Imlib_Font, &font, -1, "Imlib Font", le_imlib_font); + ZEND_FETCH_RESOURCE(fn, PHP_Imlib_Font, &font, -1, le_imlib_font_name, le_imlib_font); zval_dtor(*tw); zval_dtor(*th); @@ -1431,7 +1439,7 @@ PHP_FUNCTION(imlib_image_blur) if (zend_parse_parameters(2 TSRMLS_CC, "rl", &img, &r) == FAILURE) return; - ZEND_FETCH_RESOURCE(im, Imlib_Image, &img, -1, "Imlib Image", le_imlib_img); + ZEND_FETCH_RESOURCE(im, Imlib_Image, &img, -1, le_imlib_img_name, le_imlib_img); imlib_context_set_image(im); imlib_image_blur(r); @@ -1473,8 +1481,8 @@ PHP_FUNCTION(imlib_image_draw_polygon) argc = ZEND_NUM_ARGS(); if (zend_parse_parameters(argc TSRMLS_CC, "rrbllll|a", &img, &polygon, &closed, &r, &g, &b, &a, &dbox) == FAILURE) return; - ZEND_FETCH_RESOURCE(im, Imlib_Image, &img, -1, "Imlib Image", le_imlib_img); - ZEND_FETCH_RESOURCE(poly, ImlibPolygon, &polygon, -1, "Imlib Polygon", le_imlib_poly); + ZEND_FETCH_RESOURCE(im, Imlib_Image, &img, -1, le_imlib_img_name, le_imlib_img); + ZEND_FETCH_RESOURCE(poly, ImlibPolygon, &polygon, -1, le_imlib_poly_name, le_imlib_poly); imlib_context_set_image(im); imlib_context_set_color(r,g,b,a); @@ -1516,8 +1524,8 @@ PHP_FUNCTION(imlib_image_fill_color_range_rectangle) argc = ZEND_NUM_ARGS(); if (zend_parse_parameters(argc TSRMLS_CC, "rrlllld|a", &fim, &fcr, &x, &y, &width, &height, &angle, &fbox) == FAILURE) return; - ZEND_FETCH_RESOURCE(cr, Imlib_Color_Range, &fcr, -1, "Imlib Color Range", le_imlib_cr); - ZEND_FETCH_RESOURCE(im, Imlib_Image, &fim, -1, "Imlib Image", le_imlib_img); + ZEND_FETCH_RESOURCE(cr, Imlib_Color_Range, &fcr, -1, le_imlib_cr_name, le_imlib_cr); + ZEND_FETCH_RESOURCE(im, Imlib_Image, &fim, -1, le_imlib_img_name, le_imlib_img); imlib_context_set_color_range(cr); imlib_context_set_image(im); @@ -1559,8 +1567,8 @@ PHP_FUNCTION(imlib_image_fill_polygon) argc = ZEND_NUM_ARGS(); if (zend_parse_parameters(argc TSRMLS_CC, "rrllll|a", &img, &polygon, &r, &g, &b, &a, &dbox) == FAILURE) return; - ZEND_FETCH_RESOURCE(im, Imlib_Image, &img, -1, "Imlib Image", le_imlib_img); - ZEND_FETCH_RESOURCE(poly, ImlibPolygon, &polygon, -1, "Imlib Polygon", le_imlib_poly); + ZEND_FETCH_RESOURCE(im, Imlib_Image, &img, -1, le_imlib_img_name, le_imlib_img); + ZEND_FETCH_RESOURCE(poly, ImlibPolygon, &polygon, -1, le_imlib_poly_name, le_imlib_poly); imlib_context_set_image(im); imlib_context_set_color(r,g,b,a); @@ -1629,7 +1637,7 @@ PHP_FUNCTION(imlib_image_orientate) if (zend_parse_parameters(2 TSRMLS_CC, "rl", &img, &r) == FAILURE) return; - ZEND_FETCH_RESOURCE(im, Imlib_Image, &img, -1, "Imlib Image", le_imlib_img); + ZEND_FETCH_RESOURCE(im, Imlib_Image, &img, -1, le_imlib_img_name, le_imlib_img); imlib_context_set_image(im); imlib_image_orientate(r); @@ -1647,7 +1655,7 @@ PHP_FUNCTION(imlib_image_format) if (zend_parse_parameters(1 TSRMLS_CC, "r", &img) == FAILURE) return; - ZEND_FETCH_RESOURCE(im, Imlib_Image, &img, -1, "Imlib Image", le_imlib_img); + ZEND_FETCH_RESOURCE(im, Imlib_Image, &img, -1, le_imlib_img_name, le_imlib_img); imlib_context_set_image(im); name = imlib_image_format(); @@ -1669,7 +1677,7 @@ PHP_FUNCTION(imlib_image_get_filename) if (zend_parse_parameters(1 TSRMLS_CC, "r", &img) == FAILURE) return; - ZEND_FETCH_RESOURCE(im, Imlib_Image, &img, -1, "Imlib Image", le_imlib_img); + ZEND_FETCH_RESOURCE(im, Imlib_Image, &img, -1, le_imlib_img_name, le_imlib_img); imlib_context_set_image(im); name = imlib_image_get_filename(); @@ -1691,7 +1699,7 @@ PHP_FUNCTION(imlib_image_get_height) if (zend_parse_parameters(1 TSRMLS_CC, "r", &img) == FAILURE) return; - ZEND_FETCH_RESOURCE(im, Imlib_Image, &img, -1, "Imlib Image", le_imlib_img); + ZEND_FETCH_RESOURCE(im, Imlib_Image, &img, -1, le_imlib_img_name, le_imlib_img); imlib_context_set_image(im); height = imlib_image_get_height(); @@ -1711,7 +1719,7 @@ PHP_FUNCTION(imlib_image_get_width) if (zend_parse_parameters(1 TSRMLS_CC, "r", &img) == FAILURE) return; - ZEND_FETCH_RESOURCE(im, Imlib_Image, &img, -1, "Imlib Image", le_imlib_img); + ZEND_FETCH_RESOURCE(im, Imlib_Image, &img, -1, le_imlib_img_name, le_imlib_img); imlib_context_set_image(im); width = imlib_image_get_width(); @@ -1730,7 +1738,7 @@ PHP_FUNCTION(imlib_image_has_alpha) if (zend_parse_parameters(1 TSRMLS_CC, "r", &img) == FAILURE) return; - ZEND_FETCH_RESOURCE(im, Imlib_Image, &img, -1, "Imlib Image", le_imlib_img); + ZEND_FETCH_RESOURCE(im, Imlib_Image, &img, -1, le_imlib_img_name, le_imlib_img); imlib_context_set_image(im); if (imlib_image_has_alpha()) @@ -1759,7 +1767,7 @@ PHP_FUNCTION(imlib_image_modify_alpha) if (zend_parse_parameters(2 TSRMLS_CC, "rl", &img, &malpha) == FAILURE) return; - ZEND_FETCH_RESOURCE(im, Imlib_Image, &img, -1, "Imlib Image", le_imlib_img); + ZEND_FETCH_RESOURCE(im, Imlib_Image, &img, -1, le_imlib_img_name, le_imlib_img); ratio = ((double)malpha) / 255; @@ -1796,7 +1804,7 @@ PHP_FUNCTION(imlib_image_set_format) if (zend_parse_parameters(2 TSRMLS_CC, "rs", &img, &format, &format_len) == FAILURE) return; - ZEND_FETCH_RESOURCE(im, Imlib_Image, &img, -1, "Imlib Image", le_imlib_img); + ZEND_FETCH_RESOURCE(im, Imlib_Image, &img, -1, le_imlib_img_name, le_imlib_img); imlib_context_set_image(im); imlib_image_set_format(format); @@ -1816,7 +1824,7 @@ PHP_FUNCTION(imlib_image_sharpen) if (zend_parse_parameters(2 TSRMLS_CC, "rl", &img, &r) == FAILURE) return; - ZEND_FETCH_RESOURCE(im, Imlib_Image, &img, -1, "Imlib Image", le_imlib_img); + ZEND_FETCH_RESOURCE(im, Imlib_Image, &img, -1, le_imlib_img_name, le_imlib_img); imlib_context_set_image(im); imlib_image_sharpen(r); @@ -1961,7 +1969,7 @@ PHP_FUNCTION(imlib_polygon_add_point) if (zend_parse_parameters(3 TSRMLS_CC, "rll", &polygon, &x, &y) == FAILURE) return; - ZEND_FETCH_RESOURCE(poly, ImlibPolygon, &polygon, -1, "Imlib Polygon", le_imlib_poly); + ZEND_FETCH_RESOURCE(poly, ImlibPolygon, &polygon, -1, le_imlib_poly_name, le_imlib_poly); imlib_polygon_add_point(poly,x,y); } @@ -1979,7 +1987,7 @@ PHP_FUNCTION(imlib_polygon_contains_point) if (zend_parse_parameters(3 TSRMLS_CC, "rll", &polygon, &x, &y) == FAILURE) return; - ZEND_FETCH_RESOURCE(poly, ImlibPolygon, &polygon, -1, "Imlib Polygon", le_imlib_poly); + ZEND_FETCH_RESOURCE(poly, ImlibPolygon, &polygon, -1, le_imlib_poly_name, le_imlib_poly); ret = imlib_polygon_contains_point(poly,x,y); @@ -2004,7 +2012,7 @@ PHP_FUNCTION(imlib_polygon_free) if (zend_parse_parameters(1 TSRMLS_CC, "r", &polygon) == FAILURE) return; - ZEND_FETCH_RESOURCE(poly, ImlibPolygon, &polygon, -1, "Imlib Polygon", le_imlib_poly); + ZEND_FETCH_RESOURCE(poly, ImlibPolygon, &polygon, -1, le_imlib_poly_name, le_imlib_poly); zend_list_delete(Z_LVAL_PP(&polygon)); } /* }}} */ @@ -2021,7 +2029,7 @@ PHP_FUNCTION(imlib_polygon_get_bounds) if (zend_parse_parameters(5 TSRMLS_CC, "rZZZZ", &polygon, &px1, &py1, &px2, &py2) == FAILURE) return; - ZEND_FETCH_RESOURCE(poly, ImlibPolygon, &polygon, -1, "Imlib Polygon", le_imlib_poly); + ZEND_FETCH_RESOURCE(poly, ImlibPolygon, &polygon, -1, le_imlib_poly_name, le_imlib_poly); zval_dtor(*px1); zval_dtor(*py1); @@ -2071,7 +2079,7 @@ PHP_FUNCTION(imlib_save_image) argc = ZEND_NUM_ARGS(); if (zend_parse_parameters(argc TSRMLS_CC, "rs|Zl", &img, &name, &name_len, &err, &q) == FAILURE) return; - ZEND_FETCH_RESOURCE(im, Imlib_Image, &img, -1, "Imlib Image", le_imlib_img); + ZEND_FETCH_RESOURCE(im, Imlib_Image, &img, -1, le_imlib_img_name, le_imlib_img); imlib_context_set_image(im); @@ -2122,8 +2130,8 @@ PHP_FUNCTION(imlib_text_draw) if (zend_parse_parameters(10 TSRMLS_CC, "rrllslllll", &img, &font, &x, &y, &text, &text_len, &dir, &r, &g, &b, &a) == FAILURE) return; - ZEND_FETCH_RESOURCE(im, Imlib_Image, &img, -1, "Imlib Image", le_imlib_img); - ZEND_FETCH_RESOURCE(fn, PHP_Imlib_Font, &font, -1, "Imlib Font", le_imlib_font); + ZEND_FETCH_RESOURCE(im, Imlib_Image, &img, -1, le_imlib_img_name, le_imlib_img); + ZEND_FETCH_RESOURCE(fn, PHP_Imlib_Font, &font, -1, le_imlib_font_name, le_imlib_font); imlib_context_set_image(im); imlib_context_set_color(r,g,b,a); @@ -2166,7 +2174,7 @@ PHP_FUNCTION(imlib_apply_filter) HashTable* arg_ht; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|a", &img, &filter_name, &filter_name_len, &tparams) == FAILURE) return; - ZEND_FETCH_RESOURCE(im, Imlib_Image, &img, -1, "Imlib Image", le_imlib_img); + ZEND_FETCH_RESOURCE(im, Imlib_Image, &img, -1, le_imlib_img_name, le_imlib_img); filter = _php_imlib_find_filter(filter_name TSRMLS_CC); @@ -2215,7 +2223,7 @@ PHP_FUNCTION(imlib_free_filter) if (zend_parse_parameters(1 TSRMLS_CC, "r", &filter) == FAILURE) return; - ZEND_FETCH_RESOURCE(fil, Imlib_Filter, &filter, -1, "Imlib Filter", le_imlib_filter); + ZEND_FETCH_RESOURCE(fil, Imlib_Filter, &filter, -1, le_imlib_filter_name, le_imlib_filter); zend_list_delete(Z_LVAL_PP(&filter)); } /* }}} */ @@ -2230,8 +2238,8 @@ PHP_FUNCTION(imlib_image_filter) if (zend_parse_parameters(2 TSRMLS_CC, "rr", &img, &filter) == FAILURE) return; - ZEND_FETCH_RESOURCE(im, Imlib_Image, &img, -1, "Imlib Image", le_imlib_img); - ZEND_FETCH_RESOURCE(fil, Imlib_Filter, &filter, -1, "Imlib Filter", le_imlib_filter); + ZEND_FETCH_RESOURCE(im, Imlib_Image, &img, -1, le_imlib_img_name, le_imlib_img); + ZEND_FETCH_RESOURCE(fil, Imlib_Filter, &filter, -1, le_imlib_filter_name, le_imlib_filter); imlib_context_set_image(im); imlib_context_set_filter(fil); @@ -2248,7 +2256,7 @@ static void _php_imlib_filter_set(INTERNAL_FUNCTION_PARAMETERS, int type) if (zend_parse_parameters(7 TSRMLS_CC, "rllllll", &filter, &xoff, &yoff, &a, &r, &g, &b) == FAILURE) return; - ZEND_FETCH_RESOURCE(fil, Imlib_Filter, &filter, -1, "Imlib Filter", le_imlib_filter); + ZEND_FETCH_RESOURCE(fil, Imlib_Filter, &filter, -1, le_imlib_filter_name, le_imlib_filter); imlib_context_set_filter(fil); @@ -2311,7 +2319,7 @@ PHP_FUNCTION(imlib_filter_constants) if (zend_parse_parameters(5 TSRMLS_CC, "rllll", &filter, &a, &r, &g, &b) == FAILURE) return; - ZEND_FETCH_RESOURCE(fil, Imlib_Filter, &filter, -1, "Imlib Filter", le_imlib_filter); + ZEND_FETCH_RESOURCE(fil, Imlib_Filter, &filter, -1, le_imlib_filter_name, le_imlib_filter); imlib_context_set_filter(fil); imlib_filter_constants(a,r,g,b); @@ -2328,7 +2336,7 @@ PHP_FUNCTION(imlib_filter_divisors) if (zend_parse_parameters(5 TSRMLS_CC, "rllll", &filter, &a, &r, &g, &b) == FAILURE) return; - ZEND_FETCH_RESOURCE(fil, Imlib_Filter, &filter, -1, "Imlib Filter", le_imlib_filter); + ZEND_FETCH_RESOURCE(fil, Imlib_Filter, &filter, -1, le_imlib_filter_name, le_imlib_filter); imlib_context_set_filter(fil); imlib_filter_divisors(a,r,g,b); @@ -2346,7 +2354,7 @@ PHP_FUNCTION(imlib_modify_color_modifier_gamma) if (zend_parse_parameters(2 TSRMLS_CC, "rd", &color_modifier, &gamma) == FAILURE) return; - ZEND_FETCH_RESOURCE(cm, PHP_Imlib_Color_Modifier, &color_modifier, -1, "Imlib Color Modifier", le_imlib_cm); + ZEND_FETCH_RESOURCE(cm, PHP_Imlib_Color_Modifier, &color_modifier, -1, le_imlib_cm_name, le_imlib_cm); if (cm->modified) _php_imlib_color_modifier_synch(cm); imlib_context_set_color_modifier(cm->cm); imlib_modify_color_modifier_gamma(gamma); @@ -2366,7 +2374,7 @@ PHP_FUNCTION(imlib_modify_color_modifier_brightness) if (zend_parse_parameters(2 TSRMLS_CC, "rd", &color_modifier, &brightness) == FAILURE) return; - ZEND_FETCH_RESOURCE(cm, Imlib_Color_Modifier, &color_modifier, -1, "Imlib Color Modifier", le_imlib_cm); + ZEND_FETCH_RESOURCE(cm, Imlib_Color_Modifier, &color_modifier, -1, le_imlib_cm_name, le_imlib_cm); if (cm->modified) _php_imlib_color_modifier_synch(cm); imlib_context_set_color_modifier(cm->cm); imlib_modify_color_modifier_brightness(brightness); @@ -2386,7 +2394,7 @@ PHP_FUNCTION(imlib_modify_color_modifier_contrast) if (zend_parse_parameters(2 TSRMLS_CC, "rd", &color_modifier, &contrast) == FAILURE) return; - ZEND_FETCH_RESOURCE(cm, PHP_Imlib_Color_Modifier, &color_modifier, -1, "Imlib Color Modifier", le_imlib_cm); + ZEND_FETCH_RESOURCE(cm, PHP_Imlib_Color_Modifier, &color_modifier, -1, le_imlib_cm_name, le_imlib_cm); if (cm->modified) _php_imlib_color_modifier_synch(cm); imlib_context_set_color_modifier(cm->cm); imlib_modify_color_modifier_contrast(contrast); @@ -2405,7 +2413,7 @@ PHP_FUNCTION(imlib_reset_color_modifier) if (zend_parse_parameters(1 TSRMLS_CC, "r", &color_modifier) == FAILURE) return; - ZEND_FETCH_RESOURCE(cm, PHP_Imlib_Color_Modifier, &color_modifier, -1, "Imlib Color Modifier", le_imlib_cm); + ZEND_FETCH_RESOURCE(cm, PHP_Imlib_Color_Modifier, &color_modifier, -1, le_imlib_cm_name, le_imlib_cm); imlib_context_set_color_modifier(cm->cm); imlib_reset_color_modifier(); imlib_context_set_color_modifier(NULL); @@ -2427,8 +2435,8 @@ PHP_FUNCTION(imlib_apply_color_modifier) argc=ZEND_NUM_ARGS(); if (zend_parse_parameters(argc TSRMLS_CC, "rr|llll", &image, &color_modifier, &x, &y, &width, &height) == FAILURE) return; - ZEND_FETCH_RESOURCE(cm, PHP_Imlib_Color_Modifier, &color_modifier, -1, "Imlib Color Modifier", le_imlib_cm); - ZEND_FETCH_RESOURCE(img, Imlib_Image, &image, -1, "Imlib Image", le_imlib_img); + ZEND_FETCH_RESOURCE(cm, PHP_Imlib_Color_Modifier, &color_modifier, -1, le_imlib_cm_name, le_imlib_cm); + ZEND_FETCH_RESOURCE(img, Imlib_Image, &image, -1, le_imlib_img_name, le_imlib_img); if (cm->modified) _php_imlib_color_modifier_synch(cm); imlib_context_set_image(img); @@ -2454,7 +2462,7 @@ PHP_FUNCTION(imlib_set_color_modifier) argc=ZEND_NUM_ARGS(); if (zend_parse_parameters(argc TSRMLS_CC, "rll|l", &color_modifier, &index, &value, &channels) == FAILURE) return; - ZEND_FETCH_RESOURCE(cm, PHP_Imlib_Color_Modifier, &color_modifier, -1, "Imlib Color Modifier", le_imlib_cm); + ZEND_FETCH_RESOURCE(cm, PHP_Imlib_Color_Modifier, &color_modifier, -1, le_imlib_cm_name, le_imlib_cm); if (!cm->valid) _php_imlib_color_modifier_synch(cm); while (i<4) { if (channels&1) { @@ -2479,7 +2487,7 @@ PHP_FUNCTION(imlib_get_color_modifier) PHP_Imlib_Color_Modifier cm; if (zend_parse_parameters(6 TSRMLS_CC, "rlZZZZ", &color_modifier, &index, &tred, &tgreen, &tblue, &talpha) == FAILURE) return; - ZEND_FETCH_RESOURCE(cm, PHP_Imlib_Color_Modifier, &color_modifier, -1, "Imlib Color Modifier", le_imlib_cm); + ZEND_FETCH_RESOURCE(cm, PHP_Imlib_Color_Modifier, &color_modifier, -1, le_imlib_cm_name, le_imlib_cm); if (!cm->valid) _php_imlib_color_modifier_synch(cm); zval_dtor(*tred); @@ -2527,8 +2535,8 @@ PHP_FUNCTION(imlib_pstext) color=(r<<16)|(g<<8)|b; - ZEND_FETCH_RESOURCE(bg_img, Imlib_Image, &img, -1, "Imlib Image", le_imlib_img); - ZEND_FETCH_RESOURCE(f_ind, int *, &fnt, -1, "Type 1 font", le_ps_font); + ZEND_FETCH_RESOURCE(bg_img, Imlib_Image, &img, -1, le_imlib_img_name, le_imlib_img); + ZEND_FETCH_RESOURCE(f_ind, int *, &fnt, -1, le_ps_font_name, le_ps_font); T1_errno = 0; T1_AASetBitsPerPixel(32); @@ -2686,7 +2694,7 @@ PHP_FUNCTION(imlib_psfreefont) if (zend_parse_parameters(1 TSRMLS_CC, "r", &fnt) == FAILURE) return; - ZEND_FETCH_RESOURCE(f_ind, int *, &fnt, -1, "Type 1 font", le_ps_font); + ZEND_FETCH_RESOURCE(f_ind, int *, &fnt, -1, le_ps_font_name, le_ps_font); zend_list_delete(Z_LVAL_PP(&fnt)); RETURN_TRUE; @@ -2712,7 +2720,7 @@ PHP_FUNCTION(imlib_psencodefont) if (zend_parse_parameters(2 TSRMLS_CC, "rs", &fnt, &enc, &enc_len) == FAILURE) return; - ZEND_FETCH_RESOURCE(f_ind, int *, &fnt, -1, "Type 1 font", le_ps_font); + ZEND_FETCH_RESOURCE(f_ind, int *, &fnt, -1, le_ps_font_name, le_ps_font); f = php_stream_open_wrapper_as_file(enc, "rb", IGNORE_PATH | REPORT_ERRORS, &filename); if (f == NULL) RETURN_FALSE; @@ -2753,7 +2761,7 @@ PHP_FUNCTION(imlib_psextendfont) if (zend_parse_parameters(2 TSRMLS_CC, "rd", &fnt, &ext) == FAILURE) return; - ZEND_FETCH_RESOURCE(f_ind, int *, &fnt, -1, "Type 1 font", le_ps_font); + ZEND_FETCH_RESOURCE(f_ind, int *, &fnt, -1, le_ps_font_name, le_ps_font); if (T1_ExtendFont(*f_ind, ext) != 0) RETURN_FALSE; @@ -2776,7 +2784,7 @@ PHP_FUNCTION(imlib_psslantfont) if (zend_parse_parameters(2 TSRMLS_CC, "rd", &fnt, &slt) == FAILURE) return; - ZEND_FETCH_RESOURCE(f_ind, int *, &fnt, -1, "Type 1 font", le_ps_font); + ZEND_FETCH_RESOURCE(f_ind, int *, &fnt, -1, le_ps_font_name, le_ps_font); if (T1_SlantFont(*f_ind, slt) != 0) RETURN_FALSE; RETURN_TRUE; @@ -2810,7 +2818,7 @@ PHP_FUNCTION(imlib_psbbox) cos_a = cos(angle); per_char = add_width || angle ? 1 : 0; - ZEND_FETCH_RESOURCE(f_ind, int *, &fnt, -1, "Type 1 font", le_ps_font); + ZEND_FETCH_RESOURCE(f_ind, int *, &fnt, -1, le_ps_font_name, le_ps_font); #define max(a, b) (a > b ? a : b) #define min(a, b) (a < b ? a : b) -- cgit v1.2.3