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

consolidate OpenSlide setup into one function

This commit is contained in:
Benjamin Gilbert 2011-11-27 17:44:18 -05:00
parent a9933071ec
commit bade737cc2
1 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
libvips/format/openslide.c
View File

@ -10,6 +10,7 @@
* - fix black background in transparent areas * - fix black background in transparent areas
* - no need to set *stop on fill_region() error return * - no need to set *stop on fill_region() error return
* - add OpenSlide properties to image metadata * - add OpenSlide properties to image metadata
* - consolidate setup into one function
*/ */
/* /*
@ -53,38 +54,59 @@ typedef struct {
} ReadSlide; } ReadSlide;
static void static void
close_slide( VipsImage *image, openslide_t *osr ) readslide_destroy_cb( VipsImage *image, ReadSlide *rslide )
{ {
openslide_close( osr ); VIPS_FREEF( openslide_close, rslide->osr );
} }
static int static ReadSlide *
load_header( openslide_t *osr, VipsImage *out ) readslide_new( const char *filename, VipsImage *out )
{ {
ReadSlide *rslide;
const char *background;
int64_t w, h; int64_t w, h;
const char * const *properties; const char * const *properties;
openslide_get_layer0_dimensions( osr, &w, &h ); rslide = VIPS_NEW( out, ReadSlide );
memset( rslide, 0, sizeof( *rslide ));
g_signal_connect( out, "close", G_CALLBACK( readslide_destroy_cb ),
rslide );
rslide->osr = openslide_open( filename );
if( rslide->osr == NULL ) {
vips_error( "im_openslide2vips", _( "failure opening slide" ));
return( NULL );
}
background = openslide_get_property_value( rslide->osr,
OPENSLIDE_PROPERTY_NAME_BACKGROUND_COLOR );
if( background != NULL )
rslide->background = strtoul( background, NULL, 16 );
else
rslide->background = 0xffffff;
openslide_get_layer0_dimensions( rslide->osr, &w, &h );
if( w < 0 || h < 0 ) { if( w < 0 || h < 0 ) {
vips_error( "im_openslide2vips", _( "getting dimensions: %s" ), vips_error( "im_openslide2vips", _( "getting dimensions: %s" ),
openslide_get_error( osr )); openslide_get_error( rslide->osr ));
return( -1 ); return( NULL );
} }
if( w > INT_MAX || h > INT_MAX ) { if( w > INT_MAX || h > INT_MAX ) {
vips_error( "im_openslide2vips", vips_error( "im_openslide2vips",
_( "image dimensions overflow int" )); _( "image dimensions overflow int" ));
return( -1 ); return( NULL );
} }
vips_image_init_fields( out, (int) w, (int) h, 4, VIPS_FORMAT_UCHAR, vips_image_init_fields( out, (int) w, (int) h, 4, VIPS_FORMAT_UCHAR,
VIPS_CODING_NONE, VIPS_INTERPRETATION_RGB, 1.0, 1.0 ); VIPS_CODING_NONE, VIPS_INTERPRETATION_RGB, 1.0, 1.0 );
for( properties = openslide_get_property_names(osr); for( properties = openslide_get_property_names( rslide->osr );
*properties != NULL; properties++ ) *properties != NULL; properties++ )
vips_image_set_string( out, *properties, vips_image_set_string( out, *properties,
openslide_get_property_value( osr, *properties )); openslide_get_property_value( rslide->osr,
*properties ));
return( 0 ); return( rslide );
} }
static int static int
@ -140,17 +162,12 @@ fill_region( VipsRegion *out, void *seq, void *_rslide, void *unused,
static int static int
openslide2vips_header( const char *filename, VipsImage *out ) openslide2vips_header( const char *filename, VipsImage *out )
{ {
openslide_t *osr; ReadSlide *rslide;
int ret;
osr = openslide_open( filename ); rslide = readslide_new( filename, out );
if( osr == NULL ) { if( rslide == NULL )
vips_error( "im_openslide2vips", _( "failure opening slide" ));
return( -1 ); return( -1 );
} return( 0 );
ret = load_header( osr, out );
openslide_close( osr );
return( ret );
} }
/** /**
@ -173,26 +190,9 @@ static int
im_openslide2vips( const char *filename, VipsImage *out ) im_openslide2vips( const char *filename, VipsImage *out )
{ {
ReadSlide *rslide; ReadSlide *rslide;
const char *background;
rslide = VIPS_NEW( out, ReadSlide ); rslide = readslide_new( filename, out );
if( rslide == NULL || vips_image_pio_output( out ))
rslide->osr = openslide_open( filename );
if( rslide->osr == NULL ) {
vips_error( "im_openslide2vips", _( "failure opening slide" ));
return( -1 );
}
g_signal_connect( out, "close", G_CALLBACK( close_slide ),
rslide->osr );
background = openslide_get_property_value( rslide->osr,
OPENSLIDE_PROPERTY_NAME_BACKGROUND_COLOR );
if( background != NULL )
rslide->background = strtoul( background, NULL, 16 );
else
rslide->background = 0xffffff;
if( load_header( rslide->osr, out ) || vips_image_pio_output( out ))
return( -1 ); return( -1 );
vips_demand_hint( out, VIPS_DEMAND_STYLE_SMALLTILE, NULL ); vips_demand_hint( out, VIPS_DEMAND_STYLE_SMALLTILE, NULL );
return vips_image_generate( out, NULL, fill_region, NULL, rslide, return vips_image_generate( out, NULL, fill_region, NULL, rslide,