add IMAGICK_NOT_EMPTY macro

Imagick · Jun 1, 2023 · 8feba80 · 8feba80
1 parent 3cbbc56
commit 8feba80
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/imagickdraw_class.c b/imagickdraw_class.c
@@ -1315,8 +1315,7 @@ PHP_METHOD(ImagickDraw, composite)
 
 	intern = Z_IMAGICK_P(magick_obj);
 
-	if (php_imagick_ensure_not_empty (intern->magick_wand) == 0)
-		RETURN_THROWS();
+	IMAGICK_NOT_EMPTY (intern->magick_wand);
 
 	internd = Z_IMAGICKDRAW_P(getThis());
 	status = DrawComposite(internd->drawing_wand, compose, x, y, width, height, intern->magick_wand);

diff --git a/php_imagick_macros.h b/php_imagick_macros.h
@@ -43,7 +43,13 @@
 #define IMAGICK_KERNEL_NOT_NULL_EMPTY(kernel) \
 	if (kernel->kernel_info == NULL) { \
 		zend_throw_exception(php_imagickkernel_exception_class_entry, "ImagickKernel is empty, cannot be used", (long)0 TSRMLS_CC); \
-		RETURN_NULL(); \
+		RETURN_THROWS(); \
 	}
 
+#define IMAGICK_NOT_EMPTY(magick_wand) \
+	if (php_imagick_ensure_not_empty (magick_wand) == 0) { \
+		RETURN_THROWS(); \
+	}
+
+
 #endif /* PHP_IMAGICK_MACROS_H */