Merge branch '8.4'

ChangeLog

@@ -7,6 +7,9 @@
 - added vips_image_hasalpha()
 - added vips_thumbnail() / vips_thumbnail_buffer()
 
+11/11/16 started 8.4.4
+- fix crash in vips.exe arg parsing on Windows, thanks Yury
+
 18/10/16 started 8.4.3
 - fix error detection in gif_close, thanks aaron42net
 - fix tiny threading memleak

tools/vips.c

@@ -1041,12 +1041,18 @@ parse_options( GOptionContext *context, int *argc, char **argv )
 		vips_error_exit( NULL );
 	}
 
+	/* On Windows, argc will not have been updated by
+	 * g_option_context_parse_strv().
+	 */
+	for( *argc = 0; argv[*argc]; (*argc)++ )
+		;
+
 	/* Remove any "--" argument. If one of our arguments is a negative
 	 * number, the user will need to have added the "--" flag to stop
 	 * GOption parsing. But "--" is still passed down to us and we need to
 	 * ignore it.
 	 */
-	for( i = 1; i < *argc - 1; i++ )
+	for( i = 1; i < *argc; i++ )
 		if( strcmp( argv[i], "--" ) == 0 ) {
 			for( j = i; j < *argc; j++ )
 				argv[j] = argv[j + 1];