sergiotarxz/libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bump minimum OpenSlide version to 3.3.0

Browse Source 
- Avoid deprecated API

- Drop unneeded g_log handler
This commit is contained in:
Benjamin Gilbert 2012-09-20 03:11:49 -04:00
parent 6e74234ba7
commit c98d65434b
3 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure.in
View File

@ -482,11 +482,11 @@ AC_ARG_WITH([openslide],
AS_HELP_STRING([--without-openslide], [build without OpenSlide (default: test)])) AS_HELP_STRING([--without-openslide], [build without OpenSlide (default: test)]))
if test x"$with_openslide" != x"no"; then if test x"$with_openslide" != x"no"; then
PKG_CHECK_MODULES(OPENSLIDE, openslide >= 3.2.5, PKG_CHECK_MODULES(OPENSLIDE, openslide >= 3.3.0,
[AC_DEFINE(HAVE_OPENSLIDE,1,[define if you have OpenSlide >= 3.2.5 installed.]) [AC_DEFINE(HAVE_OPENSLIDE,1,[define if you have OpenSlide >= 3.3.0 installed.])
with_openslide=yes with_openslide=yes
PACKAGES_USED="$PACKAGES_USED openslide"], PACKAGES_USED="$PACKAGES_USED openslide"],
[AC_MSG_WARN([OpenSlide >= 3.2.5 not found; disabling virtual slide support]) [AC_MSG_WARN([OpenSlide >= 3.3.0 not found; disabling virtual slide support])
with_openslide=no with_openslide=no
]) ])
fi fi
@ -748,7 +748,7 @@ accelerate loops with orc: $with_orc
ICC profile support with lcms: $with_lcms ICC profile support with lcms: $with_lcms
file import with OpenEXR: $with_OpenEXR file import with OpenEXR: $with_OpenEXR
file import with OpenSlide: $with_openslide file import with OpenSlide: $with_openslide
(requires openslide-3.2.5 or later) (requires openslide-3.3.0 or later)
file import with matio: $with_matio file import with matio: $with_matio
file import with cfitsio: $with_cfitsio file import with cfitsio: $with_cfitsio
text rendering with pangoft2: $with_pangoft2 text rendering with pangoft2: $with_pangoft2

7
libvips/foreign/openslide2vips.c
View File

@ -33,6 +33,7 @@
* - fail if both level and associated image are specified * - fail if both level and associated image are specified
* 20/9/12 * 20/9/12
* - update openslide_open error handling for 3.3.0 semantics * - update openslide_open error handling for 3.3.0 semantics
* - switch from deprecated _layer_ functions
*/ */
/* /*
@ -187,7 +188,7 @@ readslide_new( const char *filename, VipsImage *out,
} }
if( level < 0 || if( level < 0 ||
level >= openslide_get_layer_count( rslide->osr ) ) { level >= openslide_get_level_count( rslide->osr ) ) {
vips_error( "openslide2vips", vips_error( "openslide2vips",
"%s", _( "invalid slide level" ) ); "%s", _( "invalid slide level" ) );
return( NULL ); return( NULL );
@ -205,9 +206,9 @@ readslide_new( const char *filename, VipsImage *out,
vips_demand_hint( out, VIPS_DEMAND_STYLE_THINSTRIP, NULL ); vips_demand_hint( out, VIPS_DEMAND_STYLE_THINSTRIP, NULL );
} }
else { else {
openslide_get_layer_dimensions( rslide->osr, openslide_get_level_dimensions( rslide->osr,
level, &w, &h ); level, &w, &h );
rslide->downsample = openslide_get_layer_downsample( rslide->downsample = openslide_get_level_downsample(
rslide->osr, level ); rslide->osr, level );
vips_image_set_int( out, "slide-level", level ); vips_image_set_int( out, "slide-level", level );
vips_demand_hint( out, VIPS_DEMAND_STYLE_SMALLTILE, NULL ); vips_demand_hint( out, VIPS_DEMAND_STYLE_SMALLTILE, NULL );

14
libvips/foreign/openslideload.c
View File

@ -8,6 +8,7 @@
* - convert remaining uses of "layer" to "level" * - convert remaining uses of "layer" to "level"
* 20/9/12 * 20/9/12
* - add Leica filename suffix * - add Leica filename suffix
* - drop glib log handler (unneeded with >= 3.3.0)
*/ */
/* /*
@ -133,13 +134,6 @@ vips_foreign_load_openslide_load( VipsForeignLoad *load )
return( 0 ); return( 0 );
} }
static void
vips_foreign_load_openslide_error_handler( const char *domain,
GLogLevelFlags level, const char *message, void *data )
{
vips_error( "openslide", "%s", message );
}
static const char *vips_foreign_openslide_suffs[] = { static const char *vips_foreign_openslide_suffs[] = {
".svs", /* Aperio */ ".svs", /* Aperio */
".vms", ".vmu", ".ndpi", /* Hamamatsu */ ".vms", ".vmu", ".ndpi", /* Hamamatsu */
@ -197,12 +191,6 @@ vips_foreign_load_openslide_class_init( VipsForeignLoadOpenslideClass *class )
VIPS_ARGUMENT_OPTIONAL_INPUT, VIPS_ARGUMENT_OPTIONAL_INPUT,
G_STRUCT_OFFSET( VipsForeignLoadOpenslide, associated ), G_STRUCT_OFFSET( VipsForeignLoadOpenslide, associated ),
NULL ); NULL );
/* Catch just openslide errors.
*/
g_log_set_handler( "Openslide",
G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING,
vips_foreign_load_openslide_error_handler, NULL );
} }
static void static void