From 2e8d01481198ac9edf70de89a5af3d219bb8e323 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Sat, 25 Jan 2014 02:31:20 -0500 Subject: [PATCH] update for new format support in OpenSlide 3.4.0 --- README.md | 2 +- libvips/deprecated/im_openslide2vips.c | 2 ++ libvips/foreign/foreign.c | 4 ++-- libvips/foreign/openslideload.c | 2 ++ 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 979fb164..820f139e 100644 --- a/README.md +++ b/README.md @@ -189,7 +189,7 @@ OpenEXR images. ## OpenSlide If available, libvips can load OpenSlide-supported virtual slide -files: Aperio, Hamamatsu VMS and VMU, Leica, MIRAX, and Trestle. +files: Aperio, Hamamatsu, Leica, MIRAX, Sakura, Trestle, and Ventana. ## swig, python, python-dev diff --git a/libvips/deprecated/im_openslide2vips.c b/libvips/deprecated/im_openslide2vips.c index a1c27d58..105ea762 100644 --- a/libvips/deprecated/im_openslide2vips.c +++ b/libvips/deprecated/im_openslide2vips.c @@ -98,7 +98,9 @@ static const char *openslide_suffs[] = { ".vms", ".vmu", ".ndpi", /* Hamamatsu */ ".scn", /* Leica */ ".mrxs", /* MIRAX */ + ".svslide", /* Sakura */ ".tif", /* Trestle */ + ".bif", /* Ventana */ NULL }; diff --git a/libvips/foreign/foreign.c b/libvips/foreign/foreign.c index 0f6cc8e0..eb91a9b8 100644 --- a/libvips/foreign/foreign.c +++ b/libvips/foreign/foreign.c @@ -2361,8 +2361,8 @@ vips_openexrload( const char *filename, VipsImage **out, ... ) * @associated: load this associated image * * Read a virtual slide supported by the OpenSlide library into a VIPS image. - * OpenSlide supports images in Aperio, Hamamatsu VMS, Hamamatsu VMU, MIRAX, - * and Trestle formats. + * OpenSlide supports images in Aperio, Hamamatsu, MIRAX, Sakura, Trestle, + * and Ventana formats. * * To facilitate zooming, virtual slide formats include multiple scaled-down * versions of the high-resolution image. These are typically called diff --git a/libvips/foreign/openslideload.c b/libvips/foreign/openslideload.c index 4d52301b..dc44d037 100644 --- a/libvips/foreign/openslideload.c +++ b/libvips/foreign/openslideload.c @@ -140,7 +140,9 @@ static const char *vips_foreign_openslide_suffs[] = { ".vms", ".vmu", ".ndpi", /* Hamamatsu */ ".scn", /* Leica */ ".mrxs", /* MIRAX */ + ".svslide", /* Sakura */ ".tif", /* Trestle */ + ".bif", /* Ventana */ NULL };