Patch add-interlinespacing for imagick Bug #60434

Patch version 2011-12-03 08:24 UTC

• 2011-12-03 08:24 UTC [diff to current]

Developer: aem@teletype.ru

Index: trunk/imagick.c
===================================================================
--- trunk/imagick.c	(revision 320302)
+++ trunk/imagick.c	(working copy)
@@ -1251,7 +1251,11 @@
 		ZEND_ARG_INFO(0, spacing)
 	ZEND_END_ARG_INFO()
 #endif
-
+#if MagickLibVersion > 0x655
+	ZEND_BEGIN_ARG_INFO_EX(imagickdraw_settextinterlinespacing_args, 0, 0, 1)
+		ZEND_ARG_INFO(0, spacing)
+	ZEND_END_ARG_INFO()
+#endif
 	ZEND_BEGIN_ARG_INFO_EX(imagickdraw_zero_args, 0, 0, 0)
 	ZEND_END_ARG_INFO()
 
@@ -1720,6 +1724,10 @@
 	PHP_ME(imagickdraw, gettextinterwordspacing, imagickdraw_zero_args, ZEND_ACC_PUBLIC)
 	PHP_ME(imagickdraw, settextinterwordspacing, imagickdraw_settextinterwordspacing_args, ZEND_ACC_PUBLIC)
 #endif
+#if MagickLibVersion > 0x655
+	PHP_ME(imagickdraw, gettextinterlinespacing, imagickdraw_zero_args, ZEND_ACC_PUBLIC)
+	PHP_ME(imagickdraw, settextinterlinespacing, imagickdraw_settextinterlinespacing_args, ZEND_ACC_PUBLIC)
+#endif
 	PHP_ME(imagickdraw, __construct, imagickdraw_zero_args, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(imagickdraw, setfillcolor, imagickdraw_setfillcolor_args, ZEND_ACC_PUBLIC)
 	PHP_ME(imagickdraw, setfillalpha, imagickdraw_setfillalpha_args, ZEND_ACC_PUBLIC)
Index: trunk/imagickdraw_class.c
===================================================================
--- trunk/imagickdraw_class.c	(revision 320302)
+++ trunk/imagickdraw_class.c	(working copy)
@@ -112,6 +112,42 @@
 /* }}} */
 #endif
 
+#if MagickLibVersion > 0x655
+/* {{{ proto bool ImagickDraw::getTextInterlineSpacing()
+	Gets the text interword spacing
+*/
+PHP_METHOD(imagickdraw, gettextinterlinespacing)
+{
+	php_imagickdraw_object *internd;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+		return;
+	}
+
+	internd = (php_imagickdraw_object *)zend_object_store_get_object(getThis() TSRMLS_CC);
+	RETURN_DOUBLE(DrawGetTextInterlineSpacing(internd->drawing_wand));
+}
+/* }}} */
+
+/* {{{ proto bool ImagickDraw::setTextInterlineSpacing(float spacing)
+	Sets the text interword spacing
+*/
+PHP_METHOD(imagickdraw, settextinterlinespacing)
+{
+	php_imagickdraw_object *internd;
+	double spacing;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "d", &spacing) == FAILURE) {
+		return;
+	}
+
+	internd = (php_imagickdraw_object *)zend_object_store_get_object(getThis() TSRMLS_CC);
+	DrawSetTextInterlineSpacing(internd->drawing_wand, spacing);
+	RETURN_TRUE;
+}
+/* }}} */
+#endif
+
 /* {{{ proto ImagickDraw ImagickDraw::__construct()
    The ImagickDraw constructor
 */
Index: trunk/php_imagick_defs.h
===================================================================
--- trunk/php_imagick_defs.h	(revision 320302)
+++ trunk/php_imagick_defs.h	(working copy)
@@ -530,6 +530,10 @@
 PHP_METHOD(imagickdraw, gettextinterwordspacing);
 PHP_METHOD(imagickdraw, settextinterwordspacing);
 #endif
+#if MagickLibVersion > 0x655
+PHP_METHOD(imagickdraw, gettextinterlinespacing);
+PHP_METHOD(imagickdraw, settextinterlinespacing);
+#endif
 PHP_METHOD(imagickdraw, __construct);
 PHP_METHOD(imagickdraw, setfillcolor);
 PHP_METHOD(imagickdraw, setfillalpha);