fix up return type of copy_mem

jcupitt · jcupitt · commit ba1d99db44b3 · 2017-04-15T18:21:45.000+01:00
more consistent with the other funcs now
diff --git a/tests/034.phpt b/tests/034.phpt
@@ -6,7 +6,7 @@ can copy to memory
 <?php 
   $filename = dirname(__FILE__) . "/images/img_0076.jpg";
   $image1 = vips_image_new_from_file($filename)["out"];
-  $image2 = vips_image_copy_memory($image1);
+  $image2 = vips_image_copy_memory($image1)["out"];
 
   $avg1 = vips_call("avg", $image1)["out"];
   $avg2 = vips_call("avg", $image2)["out"];
diff --git a/vips-1.0.6.tgz b/vips-1.0.6.tgz
diff --git a/vips.c b/vips.c
@@ -1338,15 +1338,8 @@ PHP_FUNCTION(vips_image_copy_memory)
 	zval *IM;
 	VipsImage *image;
 	VipsImage *new_image;
-
-	char *name;
-	size_t name_len;
-	zval *options;
-	char filename[VIPS_PATH_MAX];
-	char option_string[VIPS_PATH_MAX];
-	const char *operation_name;
-	zval argv[2];
-	int argc;
+	zend_resource *resource;
+	zval zvalue;
 
 	VIPS_DEBUG_MSG("vips_image_copy_memory:\n");
 
@@ -1364,7 +1357,12 @@ PHP_FUNCTION(vips_image_copy_memory)
 		RETURN_LONG(-1);
 	}
 
-	RETURN_RES(zend_register_resource(new_image, le_gobject));
+	/* Return as an array for all OK, -1 for error.
+	 */
+	array_init(return_value);
+	resource = zend_register_resource(new_image, le_gobject);
+	ZVAL_RES(&zvalue, resource);
+	add_assoc_zval(return_value, "out", &zvalue);
 }
 /* }}} */
 
