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

phew, working

Browse Source 
found the right set of info fields by trial and error
This commit is contained in:
John Cupitt 2016-02-18 12:46:44 +00:00
parent de59ff0e5a
commit 0b263f7255
1 changed files with 21 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
libvips/foreign/magick2vips.c
View File

@ -205,6 +205,27 @@ read_new( const char *filename, VipsImage *im,
*/
VIPS_SETSTR( read->image_info->density, density );
#ifdef HAVE_SETIMAGEOPTION
/* When reading DICOM images, we want to ignore any
* window_center/_width setting, since it may put pixels outside the
* 0-65535 range and lose data.
*
* These window settings are attached as vips metadata, so our caller
* can interpret them if it wants.
*/
SetImageOption( read->image_info, "dcm:display-range", "reset" );
#endif /*HAVE_SETIMAGEOPTION*/
if( !all_frames ) {
/* Just pick a specific page.
*
* I can't find docs for these fields, but this seems to work.
*/
read->image_info->scene = read->page;
read->image_info->number_scenes = 1;
read->image_info->adjoin = MagickTrue;
}
#ifdef DEBUG
printf( "magick2vips: read_new: %s\n", read->filename );
#endif /*DEBUG*/
@ -689,37 +710,6 @@ vips__magick_read( const char *filename, VipsImage *out,
if( !(read = read_new( filename, out, all_frames, density, page )) )
return( -1 );
#ifdef HAVE_SETIMAGEOPTION
/* When reading DICOM images, we want to ignore any
* window_center/_width setting, since it may put pixels outside the
* 0-65535 range and lose data.
*
* These window settings are attached as vips metadata, so our caller
* can interpret them if it wants.
*/
SetImageOption( read->image_info, "dcm:display-range", "reset" );
#endif /*HAVE_SETIMAGEOPTION*/
if( !all_frames ) {
/* Just pick a specific page.
*/
/* This doesn't seem to work, strange.
read->image_info->number_scenes = 1;
read->image_info->scene = read->page;
*/
/* This works, but is no faster.
*/
char page[256];
vips_snprintf( page, 256, "%d", read->page );
read->image_info->scenes = strdup( page );
}
#ifdef DEBUG
printf( "magick2vips: calling ReadImage() ...\n" );
#endif /*DEBUG*/
@ -800,17 +790,6 @@ vips__magick_read_buffer( const void *buf, const size_t len, VipsImage *out,
if( !(read = read_new( NULL, out, all_frames, density, page )) )
return( -1 );
#ifdef HAVE_SETIMAGEOPTION
/* When reading DICOM images, we want to ignore any
* window_center/_width setting, since it may put pixels outside the
* 0-65535 range and lose data.
*
* These window settings are attached as vips metadata, so our caller
* can interpret them if it wants.
*/
SetImageOption( read->image_info, "dcm:display-range", "reset" );
#endif /*HAVE_SETIMAGEOPTION*/
#ifdef DEBUG
printf( "magick2vips: calling BlobToImage() ...\n" );
#endif /*DEBUG*/