Added version check for color matrix image.

Imagick · Jul 13, 2014 · 9b44663 · 9b44663
1 parent 45c2c52
commit 9b44663
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/imagick.c b/imagick.c
@@ -1303,9 +1303,11 @@ PHP_IMAGICK_API zend_class_entry *php_imagickpixel_get_class_entry()
 		ZEND_ARG_INFO(0, CHANNEL)
 	ZEND_END_ARG_INFO()
 
+#if MagickLibVersion > 0x661
 	ZEND_BEGIN_ARG_INFO_EX(imagick_colormatriximage_args, 0, 0, 1)
 		ZEND_ARG_INFO(0, color_matrix)
 	ZEND_END_ARG_INFO()
+#endif
 
 	ZEND_BEGIN_ARG_INFO_EX(imagick_selectiveblurimage_args, 0, 0, 4)
 		ZEND_ARG_INFO(0, radius)
@@ -2451,7 +2453,9 @@ static zend_function_entry php_imagick_class_methods[] =
 	PHP_ME(imagick, valid, imagick_zero_args, ZEND_ACC_PUBLIC)
 	PHP_ME(imagick, current, imagick_zero_args, ZEND_ACC_PUBLIC)
 	PHP_ME(imagick, brightnesscontrastimage, imagick_brightnesscontrastimage_args, ZEND_ACC_PUBLIC)
+#if MagickLibVersion > 0x661
 	PHP_ME(imagick, colormatriximage, imagick_colormatriximage_args, ZEND_ACC_PUBLIC)
+#endif
 	PHP_ME(imagick, selectiveblurimage, imagick_selectiveblurimage_args, ZEND_ACC_PUBLIC)
 #if MagickLibVersion >= 0x689
 	PHP_ME(imagick, rotationalblurimage, imagick_rotationalblurimage_args, ZEND_ACC_PUBLIC)

diff --git a/php_imagick_defs.h b/php_imagick_defs.h
@@ -591,7 +591,9 @@ PHP_METHOD(imagick, setsamplingfactors);
 PHP_METHOD(imagick, setsize);
 PHP_METHOD(imagick, settype);
 PHP_METHOD(imagick, brightnesscontrastimage);
+#if MagickLibVersion > 0x661
 PHP_METHOD(imagick, colormatriximage);
+#endif
 PHP_METHOD(imagick, selectiveblurimage);
 #if MagickLibVersion >= 0x689
 PHP_METHOD(imagick, rotationalblurimage);