diff --git a/ChangeLog b/ChangeLog index ec4b047a..e4e3c475 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +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 diff --git a/configure.ac b/configure.ac index 18ba33c3..df67eb25 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # also update the version number in the m4 macros below -AC_INIT([vips], [7.34.1], [vipsip@jiscmail.ac.uk]) +AC_INIT([vips], [7.34.2], [vipsip@jiscmail.ac.uk]) # required for gobject-introspection AC_PREREQ(2.62) @@ -17,7 +17,7 @@ AC_CONFIG_MACRO_DIR([m4]) # user-visible library versioning m4_define([vips_major_version], [7]) m4_define([vips_minor_version], [34]) -m4_define([vips_micro_version], [1]) +m4_define([vips_micro_version], [2]) m4_define([vips_version], [vips_major_version.vips_minor_version.vips_micro_version]) @@ -37,7 +37,7 @@ VIPS_VERSION_STRING=$VIPS_VERSION-`date` # binary interface changes not backwards compatible?: reset age to 0 LIBRARY_CURRENT=34 -LIBRARY_REVISION=4 +LIBRARY_REVISION=5 LIBRARY_AGE=3 # patched into include/vips/version.h diff --git a/libvips/foreign/matload.c b/libvips/foreign/matload.c index 04c0ef6a..c066b110 100644 --- a/libvips/foreign/matload.c +++ b/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;