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

fix fitsload

Browse Source
This commit is contained in:
John Cupitt 2017-01-17 19:09:00 +00:00
parent 0231b512b4
commit 2b72244a45
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libvips/foreign/fits.c
View File

@ -364,11 +364,16 @@ vips__fits_read_header( const char *filename, VipsImage *out )
static int static int
vips_fits_read_subset( VipsFits *fits, vips_fits_read_subset( VipsFits *fits,
long fpixel[MAX_DIMENSIONS], long lpixel[MAX_DIMENSIONS], long *fpixel, long *lpixel, long *inc, VipsPel *q )
long inc[MAX_DIMENSIONS], VipsPel *q )
{ {
int status; int status;
/* We must zero this or fits_read_subset() fails.
*/
status = 0;
/* Break on ffgsv() for this call.
*/
if( fits_read_subset( fits->fptr, fits->datatype, if( fits_read_subset( fits->fptr, fits->datatype,
fpixel, lpixel, inc, fpixel, lpixel, inc,
NULL, q, NULL, &status ) ) { NULL, q, NULL, &status ) ) {
@ -422,8 +427,6 @@ fits2vips_generate( VipsRegion *out,
q = VIPS_REGION_ADDR( out, r->left, r->top ); q = VIPS_REGION_ADDR( out, r->left, r->top );
/* Break on ffgsv() for this call.
*/
g_mutex_lock( fits->lock ); g_mutex_lock( fits->lock );
if( vips_fits_read_subset( fits, fpixel, lpixel, inc, q ) ) { if( vips_fits_read_subset( fits, fpixel, lpixel, inc, q ) ) {
g_mutex_unlock( fits->lock ); g_mutex_unlock( fits->lock );
@ -452,8 +455,6 @@ fits2vips_generate( VipsRegion *out,
q = VIPS_REGION_ADDR( out, r->left, y ); q = VIPS_REGION_ADDR( out, r->left, y );
/* Break on ffgsv() for this call.
*/
g_mutex_lock( fits->lock ); g_mutex_lock( fits->lock );
if( vips_fits_read_subset( fits, if( vips_fits_read_subset( fits,
fpixel, lpixel, inc, q ) ) { fpixel, lpixel, inc, q ) ) {