Skip to content

Commit

Permalink
Merge pull request #20 from Danack/adding_draw_methods
Browse files Browse the repository at this point in the history 
Adding draw methods
  • Loading branch information
@vitoc
vitoc committed Jan 5, 2016
2 parents dafecee + 51c066b commit 847dc64
Show file tree
Hide file tree
Showing 17 changed files with 2,245 additions and 3 deletions.
271 changes: 271 additions & 0 deletions gmagick.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -904,6 +904,9 @@ static zend_function_entry php_gmagick_class_methods[] =
};
/* }}} */

ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_zero_args, 0, 0, 0)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_setstrokecolor_args, 0, 0, 1)
ZEND_ARG_INFO(0, color)
ZEND_END_ARG_INFO()
Expand Down Expand Up @@ -1055,6 +1058,218 @@ ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_setstrokedasharray_args, 0, 0, 1)
ZEND_END_ARG_INFO()
#endif


ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_circle_args, 0, 0, 4)
ZEND_ARG_INFO(0, ox)
ZEND_ARG_INFO(0, oy)
ZEND_ARG_INFO(0, px)
ZEND_ARG_INFO(0, py)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_setclippath_args, 0, 0, 1)
ZEND_ARG_INFO(0, clipMask)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_setcliprule_args, 0, 0, 1)
ZEND_ARG_INFO(0, FILLRULE)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_setclipunits_args, 0, 0, 1)
ZEND_ARG_INFO(0, PATHUNITS)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_color_args, 0, 0, 3)
ZEND_ARG_INFO(0, x)
ZEND_ARG_INFO(0, y)
ZEND_ARG_INFO(0, PAINTMETHOD)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_comment_args, 0, 0, 1)
ZEND_ARG_INFO(0, comment)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_setfillpatternurl_args, 0, 0, 1)
ZEND_ARG_INFO(0, url)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_setfillrule_args, 0, 0, 1)
ZEND_ARG_INFO(0, FILLRULE)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_setfontfamily_args, 0, 0, 1)
ZEND_ARG_INFO(0, fontfamily)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_setfontstretch_args, 0, 0, 1)
ZEND_ARG_INFO(0, STRETCH)
ZEND_END_ARG_INFO()

//ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_composite_args, 0, 0, 6)
// ZEND_ARG_INFO(0, COMPOSE)
// ZEND_ARG_INFO(0, x)
// ZEND_ARG_INFO(0, y)
// ZEND_ARG_INFO(0, width)
// ZEND_ARG_INFO(0, height)
// ZEND_ARG_OBJ_INFO(0, Gmagick, Gmagick, 0)
//ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_pathcurvetoabsolute_args, 0, 0, 6)
ZEND_ARG_INFO(0, x1)
ZEND_ARG_INFO(0, y1)
ZEND_ARG_INFO(0, x2)
ZEND_ARG_INFO(0, y2)
ZEND_ARG_INFO(0, x)
ZEND_ARG_INFO(0, y)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_pathcurvetorelative_args, 0, 0, 6)
ZEND_ARG_INFO(0, x1)
ZEND_ARG_INFO(0, y1)
ZEND_ARG_INFO(0, x2)
ZEND_ARG_INFO(0, y2)
ZEND_ARG_INFO(0, x)
ZEND_ARG_INFO(0, y)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_pathcurvetoquadraticbezierabsolute_args, 0, 0, 4)
ZEND_ARG_INFO(0, x1)
ZEND_ARG_INFO(0, y1)
ZEND_ARG_INFO(0, x)
ZEND_ARG_INFO(0, y)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_pathcurvetoquadraticbezierrelative_args, 0, 0, 4)
ZEND_ARG_INFO(0, x1)
ZEND_ARG_INFO(0, y1)
ZEND_ARG_INFO(0, x)
ZEND_ARG_INFO(0, y)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_pathcurvetoquadraticbeziersmoothabsolute_args, 0, 0, 2)
ZEND_ARG_INFO(0, x)
ZEND_ARG_INFO(0, y)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_pathcurvetoquadraticbeziersmoothrelative_args, 0, 0, 2)
ZEND_ARG_INFO(0, x)
ZEND_ARG_INFO(0, y)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_pathcurvetosmoothabsolute_args, 0, 0, 4)
ZEND_ARG_INFO(0, x1)
ZEND_ARG_INFO(0, y1)
ZEND_ARG_INFO(0, x)
ZEND_ARG_INFO(0, y)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_pathcurvetosmoothrelative_args, 0, 0, 4)
ZEND_ARG_INFO(0, x1)
ZEND_ARG_INFO(0, y1)
ZEND_ARG_INFO(0, x)
ZEND_ARG_INFO(0, y)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_pathellipticarcabsolute_args, 0, 0, 7)
ZEND_ARG_INFO(0, rx)
ZEND_ARG_INFO(0, ry)
ZEND_ARG_INFO(0, xAxisRotation)
ZEND_ARG_INFO(0, largeArc)
ZEND_ARG_INFO(0, sweep)
ZEND_ARG_INFO(0, x)
ZEND_ARG_INFO(0, y)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_pathellipticarcrelative_args, 0, 0, 7)
ZEND_ARG_INFO(0, rx)
ZEND_ARG_INFO(0, ry)
ZEND_ARG_INFO(0, xAxisRotation)
ZEND_ARG_INFO(0, largeArc)
ZEND_ARG_INFO(0, sweep)
ZEND_ARG_INFO(0, x)
ZEND_ARG_INFO(0, y)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_pathlinetoabsolute_args, 0, 0, 2)
ZEND_ARG_INFO(0, x)
ZEND_ARG_INFO(0, y)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_pathlinetorelative_args, 0, 0, 2)
ZEND_ARG_INFO(0, x)
ZEND_ARG_INFO(0, y)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_pathlinetohorizontalabsolute_args, 0, 0, 1)
ZEND_ARG_INFO(0, y)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_pathlinetohorizontalrelative_args, 0, 0, 1)
ZEND_ARG_INFO(0, x)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_pathlinetoverticalabsolute_args, 0, 0, 1)
ZEND_ARG_INFO(0, y)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_pathlinetoverticalrelative_args, 0, 0, 1)
ZEND_ARG_INFO(0, x)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_pathmovetoabsolute_args, 0, 0, 2)
ZEND_ARG_INFO(0, x)
ZEND_ARG_INFO(0, y)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_pathmovetorelative_args, 0, 0, 2)
ZEND_ARG_INFO(0, x)
ZEND_ARG_INFO(0, y)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_pushclippath_args, 0, 0, 1)
ZEND_ARG_INFO(0, clipMask)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_pushpattern_args, 0, 0, 5)
ZEND_ARG_INFO(0, pattern_id)
ZEND_ARG_INFO(0, x)
ZEND_ARG_INFO(0, y)
ZEND_ARG_INFO(0, width)
ZEND_ARG_INFO(0, height)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_skewx_args, 0, 0, 1)
ZEND_ARG_INFO(0, degrees)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_skewy_args, 0, 0, 1)
ZEND_ARG_INFO(0, degrees)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_setstrokepatternurl_args, 0, 0, 1)
ZEND_ARG_INFO(0, url)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_settextantialias_args, 0, 0, 1)
ZEND_ARG_INFO(0, antialias)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_settextundercolor_args, 0, 0, 1)
ZEND_ARG_INFO(0, color)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_translate_args, 0, 0, 2)
ZEND_ARG_INFO(0, x)
ZEND_ARG_INFO(0, y)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(gmagickdraw_setviewbox_args, 0, 0, 4)
ZEND_ARG_INFO(0, sx)
ZEND_ARG_INFO(0, sy)
ZEND_ARG_INFO(0, ex)
ZEND_ARG_INFO(0, ey)
ZEND_END_ARG_INFO()


static zend_function_entry php_gmagickdraw_class_methods[] =
{
PHP_ME(gmagickdraw, setstrokecolor, gmagickdraw_setstrokecolor_args, ZEND_ACC_PUBLIC)
Expand Down Expand Up @@ -1109,6 +1324,62 @@ static zend_function_entry php_gmagickdraw_class_methods[] =
PHP_ME(gmagickdraw, setstrokedasharray, gmagickdraw_setstrokedasharray_args, ZEND_ACC_PUBLIC)
#endif

PHP_ME(gmagickdraw, circle, gmagickdraw_circle_args, ZEND_ACC_PUBLIC)
PHP_ME(gmagickdraw, getclippath, gmagickdraw_zero_args, ZEND_ACC_PUBLIC)
PHP_ME(gmagickdraw, setclippath, gmagickdraw_setclippath_args, ZEND_ACC_PUBLIC)
PHP_ME(gmagickdraw, getcliprule, gmagickdraw_zero_args, ZEND_ACC_PUBLIC)
PHP_ME(gmagickdraw, setcliprule, gmagickdraw_setcliprule_args, ZEND_ACC_PUBLIC)
PHP_ME(gmagickdraw, getclipunits, gmagickdraw_zero_args, ZEND_ACC_PUBLIC)
PHP_ME(gmagickdraw, setclipunits, gmagickdraw_setclipunits_args, ZEND_ACC_PUBLIC)
PHP_ME(gmagickdraw, color, gmagickdraw_color_args, ZEND_ACC_PUBLIC)
PHP_ME(gmagickdraw, comment, gmagickdraw_comment_args, ZEND_ACC_PUBLIC)
PHP_ME(gmagickdraw, setfillpatternurl, gmagickdraw_setfillpatternurl_args, ZEND_ACC_PUBLIC)
PHP_ME(gmagickdraw, getfillrule, gmagickdraw_zero_args, ZEND_ACC_PUBLIC)
PHP_ME(gmagickdraw, setfillrule, gmagickdraw_setfillrule_args, ZEND_ACC_PUBLIC)
PHP_ME(gmagickdraw, getfontfamily, gmagickdraw_zero_args, ZEND_ACC_PUBLIC)
PHP_ME(gmagickdraw, setfontfamily, gmagickdraw_setfontfamily_args, ZEND_ACC_PUBLIC)
PHP_ME(gmagickdraw, getfontstretch, gmagickdraw_zero_args, ZEND_ACC_PUBLIC)
PHP_ME(gmagickdraw, setfontstretch, gmagickdraw_setfontstretch_args, ZEND_ACC_PUBLIC)
// PHP_ME(gmagickdraw, composite, gmagickdraw_composite_args, ZEND_ACC_PUBLIC)
PHP_ME(gmagickdraw, pathclose, gmagickdraw_zero_args, ZEND_ACC_PUBLIC)
PHP_ME(gmagickdraw, pathcurvetoabsolute, gmagickdraw_pathcurvetoabsolute_args, ZEND_ACC_PUBLIC)
PHP_ME(gmagickdraw, pathcurvetorelative, gmagickdraw_pathcurvetorelative_args, ZEND_ACC_PUBLIC)
PHP_ME(gmagickdraw, pathcurvetoquadraticbezierabsolute, gmagickdraw_pathcurvetoquadraticbezierabsolute_args, ZEND_ACC_PUBLIC)
PHP_ME(gmagickdraw, pathcurvetoquadraticbezierrelative, gmagickdraw_pathcurvetoquadraticbezierrelative_args, ZEND_ACC_PUBLIC)
PHP_ME(gmagickdraw, pathcurvetoquadraticbeziersmoothabsolute, gmagickdraw_pathcurvetoquadraticbeziersmoothabsolute_args, ZEND_ACC_PUBLIC)
PHP_ME(gmagickdraw, pathcurvetoquadraticbeziersmoothrelative, gmagickdraw_pathcurvetoquadraticbeziersmoothrelative_args, ZEND_ACC_PUBLIC)
PHP_ME(gmagickdraw, pathcurvetosmoothabsolute, gmagickdraw_pathcurvetosmoothabsolute_args, ZEND_ACC_PUBLIC)
PHP_ME(gmagickdraw, pathcurvetosmoothrelative, gmagickdraw_pathcurvetosmoothrelative_args, ZEND_ACC_PUBLIC)
PHP_ME(gmagickdraw, pathellipticarcabsolute, gmagickdraw_pathellipticarcabsolute_args, ZEND_ACC_PUBLIC)
PHP_ME(gmagickdraw, pathellipticarcrelative, gmagickdraw_pathellipticarcrelative_args, ZEND_ACC_PUBLIC)
PHP_ME(gmagickdraw, pathfinish, gmagickdraw_zero_args, ZEND_ACC_PUBLIC)
PHP_ME(gmagickdraw, pathlinetoabsolute, gmagickdraw_pathlinetoabsolute_args, ZEND_ACC_PUBLIC)
PHP_ME(gmagickdraw, pathlinetorelative, gmagickdraw_pathlinetorelative_args, ZEND_ACC_PUBLIC)
PHP_ME(gmagickdraw, pathlinetohorizontalabsolute, gmagickdraw_pathlinetohorizontalabsolute_args, ZEND_ACC_PUBLIC)
PHP_ME(gmagickdraw, pathlinetohorizontalrelative, gmagickdraw_pathlinetohorizontalrelative_args, ZEND_ACC_PUBLIC)
PHP_ME(gmagickdraw, pathlinetoverticalabsolute, gmagickdraw_pathlinetoverticalabsolute_args, ZEND_ACC_PUBLIC)
PHP_ME(gmagickdraw, pathlinetoverticalrelative, gmagickdraw_pathlinetoverticalrelative_args, ZEND_ACC_PUBLIC)
PHP_ME(gmagickdraw, pathmovetoabsolute, gmagickdraw_pathmovetoabsolute_args, ZEND_ACC_PUBLIC)
PHP_ME(gmagickdraw, pathmovetorelative, gmagickdraw_pathmovetorelative_args, ZEND_ACC_PUBLIC)
PHP_ME(gmagickdraw, pathstart, gmagickdraw_zero_args, ZEND_ACC_PUBLIC)
PHP_ME(gmagickdraw, popclippath, gmagickdraw_zero_args, ZEND_ACC_PUBLIC)
PHP_ME(gmagickdraw, popdefs, gmagickdraw_zero_args, ZEND_ACC_PUBLIC)
PHP_ME(gmagickdraw, poppattern, gmagickdraw_zero_args, ZEND_ACC_PUBLIC)
PHP_ME(gmagickdraw, pushclippath, gmagickdraw_pushclippath_args, ZEND_ACC_PUBLIC)
PHP_ME(gmagickdraw, pushdefs, gmagickdraw_zero_args, ZEND_ACC_PUBLIC)
PHP_ME(gmagickdraw, pushpattern, gmagickdraw_pushpattern_args, ZEND_ACC_PUBLIC)
PHP_ME(gmagickdraw, skewx, gmagickdraw_skewx_args, ZEND_ACC_PUBLIC)
PHP_ME(gmagickdraw, skewy, gmagickdraw_skewy_args, ZEND_ACC_PUBLIC)
PHP_ME(gmagickdraw, setstrokepatternurl, gmagickdraw_setstrokepatternurl_args, ZEND_ACC_PUBLIC)
PHP_ME(gmagickdraw, gettextantialias, gmagickdraw_zero_args, ZEND_ACC_PUBLIC)
PHP_ME(gmagickdraw, settextantialias, gmagickdraw_settextantialias_args, ZEND_ACC_PUBLIC)
PHP_ME(gmagickdraw, gettextundercolor, gmagickdraw_zero_args, ZEND_ACC_PUBLIC)
PHP_ME(gmagickdraw, settextundercolor, gmagickdraw_settextundercolor_args, ZEND_ACC_PUBLIC)
PHP_ME(gmagickdraw, translate, gmagickdraw_translate_args, ZEND_ACC_PUBLIC)
PHP_ME(gmagickdraw, setviewbox, gmagickdraw_setviewbox_args, ZEND_ACC_PUBLIC)
PHP_ME(gmagickdraw, popGraphicContext, gmagickdraw_zero_args, ZEND_ACC_PUBLIC)
PHP_ME(gmagickdraw, pushGraphicContext, gmagickdraw_zero_args, ZEND_ACC_PUBLIC)

{ NULL, NULL, NULL }
};
/* }}} */
Expand Down
Loading

0 comments on commit 847dc64

Please sign in to comment.