Merge remote-tracking branch 'origin/7.34'

Conflicts:
	ChangeLog
	TODO
	configure.ac

ChangeLog

@@ -3,6 +3,10 @@
 - rename image arrays as image matrices ... INTERPRETATION_ARRAY ->
   INTERPRETAtioN_MATRIX etc. 
 
+3/7/13 started 7.34.2
+- lower priority for Matlab load to reduce segvs from Mat_Open(), thanks
+  Michael
+
 28/6/13 started 7.34.1
 - fix morphological operators on non-uchar images
 - remove any ICC profile when we use vips to go to srgb

TODO

@@ -7,7 +7,7 @@
 
   https://github.com/jcupitt/libvips/issues/64
 
-  we worked around this bu adding vips_class_ping_all() to dsave build, but
+  we worked around this by adding vips_class_ping_all() to dsave build, but
   this is not a good fix
 
   find out why vips class construct fails, test on seurat, kirk's 12-core

libvips/foreign/matload.c

@@ -2,6 +2,8 @@
  *
  * 5/12/11
  * 	- from tiffload.c
+ * 3/7/13
+ * 	- lower priority to reduce segvs from Mat_Open()
  */
 
 /*
@@ -118,6 +120,11 @@ vips_foreign_load_mat_class_init( VipsForeignLoadMatClass *class )
 
 	foreign_class->suffs = vips__mat_suffs;
 
+	/* We need to be lower priority than the jpeg loader, since some jpegs
+	 * can make libmatio segv on Mat_Open(). 
+	 */
+	foreign_class->priority = -50;
+
 	load_class->is_a = vips__mat_ismat;
 	load_class->get_flags_filename = 
 		vips_foreign_load_mat_get_flags_filename;