Merge branch 'master' of github.com:jcupitt/php-vips-ext

Author: jcupitt

ChangeLog

@@ -1,9 +1,13 @@
 vips extension changelog
 
-Version 1.0.1 (2016-12-06)
+Version 1.0.2 (2016-12-06)
 --------------------------
 	* vips_image_write_to_file() was not setting options, see #3
 
+Version 1.0.1 (2016-11-25)
+--------------------------
+	* Fix for 7.1rc6
+
 Version 1.0.0 (2016-11-24)
 --------------------------
 	* Update package for pecl upload

README.md

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

RELEASE-1.0.0 renamed to RELEASE-1.0.2

@@ -15,9 +15,9 @@ http://pear.php.net/dtd/package-2.0.xsd">
   <email>[email protected]</email>
   <active>yes</active>
  </lead>
- <date>2016-11-24</date>
+ <date>2016-11-25</date>
  <version>
-  <release>1.0.0</release>
+  <release>1.0.1</release>
   <api>1.0.0</api>
  </version>
  <stability>
@@ -34,7 +34,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
    <file role='doc' name='CREDITS'/>
    <file role='doc' name='LICENSE.txt'/>
    <file role='doc' name='README.md'/>
-   <file role='doc' name='RELEASE-1.0.0'/>
+   <file role='doc' name='RELEASE-1.0.2'/>
    <file role='doc' name='ChangeLog'/>
 
    <file role='src' name='config.m4'/>
@@ -88,6 +88,24 @@ http://pear.php.net/dtd/package-2.0.xsd">
  </extsrcrelease>
  <changelog>
 
+   <release>
+   <stability><release>stable</release><api>stable</api></stability>
+   <version><release>1.0.2</release><api>1.0.0</api></version>
+   <date>2016-12-06</date>
+   <notes>
+	* vips_image_write_to_file() was not setting options, see #3
+   </notes>
+  </release>
+
+   <release>
+   <stability><release>stable</release><api>stable</api></stability>
+   <version><release>1.0.1</release><api>1.0.0</api></version>
+   <date>2016-11-25</date>
+   <notes>
+	* Fix with 7.1rc6
+   </notes>
+  </release>
+
    <release>
    <stability><release>stable</release><api>stable</api></stability>
    <version><release>1.0.0</release><api>1.0.0</api></version>

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.0" 
+#define PHP_VIPS_VERSION "1.0.2" 
 
 #ifdef PHP_WIN32
 #	define PHP_VIPS_API __declspec(dllexport)

php_vips.h

@@ -893,8 +893,9 @@ vips_php_get_optional_output(VipsPhpCall *call, zval *options,
 			continue;
 		}
 
-		/* value should always be TRUE.
+		/* value should always be TRUE. 
 		 */
+		value = zval_get_nonref(value); 
 		if (Z_TYPE_P(value) != IS_TRUE) {
 			continue;
 		}