vips_image_set_type() can be passed a type name

fixes 32-bit support

see #38

Author: jcupitt

Diff for: ChangeLog

@@ -1,5 +1,10 @@
 vips extension changelog
 
+Version 1.0.12 (2020-8-xx)
+--------------------------
+	* vips_image_set_type() can be passed a type name
+	  https://github.com/libvips/php-vips-ext/issues/38
+
 Version 1.0.11 (2020-1-xx)
 --------------------------
 	* More php_info() output [jcupitt]

Diff for: README.md

@@ -91,7 +91,7 @@ libvips website, or build your own.
 $ pear package
 ```
 
-To make `vips-1.0.11.tgz`.
+To make `vips-1.0.12.tgz`.
 
 To install by hand:
 

Diff for: RELEASE-1.0.11 renamed to RELEASE-1.0.12

@@ -15,9 +15,9 @@ http://pear.php.net/dtd/package-2.0.xsd">
   <email>[email protected]</email>
   <active>yes</active>
  </lead>
- <date>2020-08-28</date>
+ <date>2020-08-29</date>
  <version>
-  <release>1.0.11</release>
+  <release>1.0.12</release>
   <api>1.0.0</api>
  </version>
  <stability>
@@ -26,16 +26,15 @@ http://pear.php.net/dtd/package-2.0.xsd">
  </stability>
  <license filesource="LICENSE.txt">MIT</license>
  <notes>
-	* add vips_image_set_type()
-	* More php_info() output [jcupitt]
+	* vips_image_set_type() can be passed a type name
  </notes>
  <contents>
   <dir name="/">
    <file role='doc' name='API-1.0.0'/>
    <file role='doc' name='CREDITS'/>
    <file role='doc' name='LICENSE.txt'/>
    <file role='doc' name='README.md'/>
-   <file role='doc' name='RELEASE-1.0.11'/>
+   <file role='doc' name='RELEASE-1.0.12'/>
    <file role='doc' name='ChangeLog'/>
 
    <file role='src' name='config.m4'/>
@@ -102,6 +101,15 @@ http://pear.php.net/dtd/package-2.0.xsd">
  </extsrcrelease>
  <changelog>
 
+  <release>
+   <stability><release>stable</release><api>stable</api></stability>
+   <version><release>1.0.12</release><api>1.0.0</api></version>
+   <date>2020-08-29</date>
+   <notes>
+	* vips_image_set_type() can be passed a type name
+   </notes>
+  </release>
+
   <release>
    <stability><release>stable</release><api>stable</api></stability>
    <version><release>1.0.11</release><api>1.0.0</api></version>

Diff for: package.xml

@@ -5,7 +5,7 @@
 extern zend_module_entry vips_module_entry;
 #define phpext_vips_ptr &vips_module_entry
 
-#define PHP_VIPS_VERSION "1.0.11" 
+#define PHP_VIPS_VERSION "1.0.12" 
 
 #ifdef PHP_WIN32
 #	define PHP_VIPS_API __declspec(dllexport)

Diff for: php_vips.h

@@ -7,12 +7,11 @@ can set metadata
   $filename = dirname(__FILE__) . "/images/img_0076.jpg";
   $profilename = dirname(__FILE__) . "/images/sRGB.icc";
   $image = vips_image_new_from_file($filename)["out"];
-  $blob_type = vips_type_from_name("VipsBlob");
   $data = file_get_contents($profilename);
   $output_filename = dirname(__FILE__) . "/x.tif";
 
   $image = vips_call("copy", $image)["out"];
-  $result = vips_image_set_type($image, $blob_type, "icc-profile-data", $data);
+  $result = vips_image_set_type($image, "VipsBlob", "icc-profile-data", $data);
   if ($result == 0) {
     echo "pass set_metadata\n";
   }

Diff for: tests/042.phpt

@@ -1777,19 +1777,20 @@ PHP_FUNCTION(vips_type_from_name)
 }
 /* }}} */
 
-/* {{{ proto long vips_image_set_type(resource image, integer gtype, string field, mixed value)
+/* {{{ proto long vips_image_set_type(resource image, integer|string type, string field, mixed value)
    Set field on image */
 PHP_FUNCTION(vips_image_set_type)
 {
 	zval *im;
-	long type;
+	zval *type;
 	char *field_name;
 	size_t field_name_len;
 	zval *zvalue;
 	VipsImage *image;
+	GType gtype;
 	GValue gvalue = { 0 };
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rlsz", 
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rzsz", 
 		&im, &type, &field_name, &field_name_len, &zvalue) == FAILURE) {
 		RETURN_LONG(-1);
 	}
@@ -1799,11 +1800,27 @@ PHP_FUNCTION(vips_image_set_type)
 		RETURN_LONG(-1);
 	}
 
-	if (type <= 0) {
+	switch (Z_TYPE_P(type)) {
+		case IS_LONG:
+			/* On 32-bit platforms, PHP's long is only 32-bits, so it can't
+			 * hold a GType. We need to be able accept string as well.
+			 */
+			gtype = zval_get_long(type);
+			break;
+
+		case IS_STRING: 
+			gtype = g_type_from_name(ZSTR_VAL(zval_get_string(type)));
+			break;
+
+		default:
+			gtype = 0;
+	}
+
+	if (gtype <= 0) {
 		RETURN_LONG(-1);
 	}
 
-	g_value_init(&gvalue, type);
+	g_value_init(&gvalue, gtype);
 
 	if (vips_php_zval_to_gval(NULL, zvalue, &gvalue)) {
 		RETURN_LONG(-1);