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

remove a copy on load

Browse Source
This commit is contained in:
John Cupitt 2018-07-05 15:22:11 +01:00
parent 294104da32
commit b0168a3cf6
1 changed files with 18 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
libvips/foreign/niftiload.c
View File

@ -73,8 +73,15 @@ typedef struct _VipsForeignLoadNifti {
*/ */
char *filename; char *filename;
/* The NIFTI image loaded to memory.
*/
nifti_image *nim; nifti_image *nim;
/* Wrap this VipsImage around the NIFTI pointer, then redirect read
* requests to that. Saves a copy.
*/
VipsImage *memory;
} VipsForeignLoadNifti; } VipsForeignLoadNifti;
typedef VipsForeignLoadClass VipsForeignLoadNiftiClass; typedef VipsForeignLoadClass VipsForeignLoadNiftiClass;
@ -87,6 +94,7 @@ vips_foreign_load_nifti_dispose( GObject *gobject )
{ {
VipsForeignLoadNifti *nifti = (VipsForeignLoadNifti *) gobject; VipsForeignLoadNifti *nifti = (VipsForeignLoadNifti *) gobject;
VIPS_UNREF( nifti->memory );
VIPS_FREEF( nifti_image_free, nifti->nim ); VIPS_FREEF( nifti_image_free, nifti->nim );
G_OBJECT_CLASS( vips_foreign_load_nifti_parent_class )-> G_OBJECT_CLASS( vips_foreign_load_nifti_parent_class )->
@ -417,6 +425,9 @@ vips_foreign_load_nifti_set_header( VipsForeignLoadNifti *nifti,
(VipsCallbackFn) vips_free, data_copy, ext->esize ); (VipsCallbackFn) vips_free, data_copy, ext->esize );
} }
if( nim->ny > 1 )
vips_image_set_int( out, VIPS_META_PAGE_HEIGHT, nim->ny );
return( 0 ); return( 0 );
} }
@ -426,7 +437,6 @@ vips_foreign_load_nifti_header( VipsForeignLoad *load )
VipsObjectClass *class = VIPS_OBJECT_GET_CLASS( load ); VipsObjectClass *class = VIPS_OBJECT_GET_CLASS( load );
VipsForeignLoadNifti *nifti = (VipsForeignLoadNifti *) load; VipsForeignLoadNifti *nifti = (VipsForeignLoadNifti *) load;
/* We can't use the (much faster) nifti_read_header() since it just /* We can't use the (much faster) nifti_read_header() since it just
* reads the 348 bytes iof the analyze struct and does not read any of * reads the 348 bytes iof the analyze struct and does not read any of
* the extension fields. * the extension fields.
@ -451,34 +461,6 @@ vips_foreign_load_nifti_header( VipsForeignLoad *load )
return( 0 ); return( 0 );
} }
static int
vips_foreign_load_nifti_generate( VipsRegion *out,
void *seq, void *a, void *b, gboolean *stop )
{
VipsForeignLoadNifti *nifti = (VipsForeignLoadNifti *) a;
VipsRect *r = &out->valid;
size_t len = VIPS_REGION_SIZEOF_LINE( out );
size_t line_stride = VIPS_IMAGE_SIZEOF_LINE( out->im );
size_t pixel_stride = VIPS_IMAGE_SIZEOF_PEL( out->im );
int y;
VIPS_DEBUG_MSG( "vips_foreign_load_nifti_generate: "
"generating left = %d, top = %d, width = %d, height = %d\n",
r->left, r->top, r->width, r->height );
for( y = r->top; y < VIPS_RECT_BOTTOM( r ); y++ ) {
VipsPel *q = VIPS_REGION_ADDR( out, r->left, y );
VipsPel *p = (VipsPel *) nifti->nim->data +
y * line_stride +
r->left * pixel_stride;
memcpy( q, p, len );
}
return( 0 );
}
static int static int
vips_foreign_load_nifti_load( VipsForeignLoad *load ) vips_foreign_load_nifti_load( VipsForeignLoad *load )
{ {
@ -489,18 +471,21 @@ vips_foreign_load_nifti_load( VipsForeignLoad *load )
printf( "vips_foreign_load_nifti_load: loading image\n" ); printf( "vips_foreign_load_nifti_load: loading image\n" );
#endif /*DEBUG*/ #endif /*DEBUG*/
/* We just read the entire image to memory.
*/
if( nifti_image_load( nifti->nim ) ) { if( nifti_image_load( nifti->nim ) ) {
vips_error( class->nickname, vips_error( class->nickname,
"%s", _( "unable to load NIFTI file" ) ); "%s", _( "unable to load NIFTI file" ) );
return( -1 ); return( -1 );
} }
if( vips_foreign_load_nifti_set_header( nifti, if( !(nifti->memory = vips_image_new_from_memory(
nifti->nim, load->real ) ) nifti->nim->data, VIPS_IMAGE_SIZEOF_IMAGE( load->out ),
load->out->Xsize, load->out->Ysize,
load->out->Bands, load->out->BandFmt )) )
return( -1 ); return( -1 );
if( vips_image_generate( load->real, if( vips_copy( nifti->memory, &load->real, NULL ) )
NULL, vips_foreign_load_nifti_generate, NULL, nifti, NULL ) )
return( -1 ); return( -1 );
return( 0 ); return( 0 );