aboutsummaryrefslogtreecommitdiff
path: root/libcrystfel
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2014-10-29 16:20:16 +0100
committerThomas White <taw@physics.org>2014-10-29 16:20:16 +0100
commit4b7f031271a7f77a99c86b3010c97e426068675e (patch)
tree7cbf14a214a8a4f37d0883ce491e7f75a8f23fff /libcrystfel
parent5085744888104a8caf199f9aff5df35def025bb6 (diff)
Change nx/ny to nfs/nss, fixing a bug in the process
(Patch from Valerio Mariani)
Diffstat (limited to 'libcrystfel')
-rw-r--r--libcrystfel/src/hdf5-file.c24
1 files changed, 11 insertions, 13 deletions
diff --git a/libcrystfel/src/hdf5-file.c b/libcrystfel/src/hdf5-file.c
index 02cb66ee..615a2faf 100644
--- a/libcrystfel/src/hdf5-file.c
+++ b/libcrystfel/src/hdf5-file.c
@@ -88,8 +88,8 @@ struct hdfile {
const char *path; /* Current data path */
- size_t nx; /* Image width */
- size_t ny; /* Image height */
+ size_t nfs; /* Image width */
+ size_t nss; /* Image height */
hid_t fh; /* HDF file handle */
hid_t dh; /* Dataset handle */
@@ -167,18 +167,18 @@ int hdfile_set_image(struct hdfile *f, const char *path,
if ( p == NULL ) {
- f->nx = size[0];
- f->ny = size[1];
+ f->nss = size[0];
+ f->nfs = size[1];
} else {
for ( di=0; di<p->dim_structure->num_dims; di++ ) {
if ( p->dim_structure->dims[di] == HYSL_SS ) {
- f->ny = size[di];
+ f->nss = size[di];
}
if ( p->dim_structure->dims[di] == HYSL_FS ) {
- f->nx = size[di];
+ f->nfs = size[di];
}
}
@@ -950,12 +950,10 @@ int hdf5_read(struct hdfile *f, struct image *image, const char *element,
return 1;
}
- /* Note the "swap" here, according to section 3.2.5,
- * "C versus Fortran Dataspaces", of the HDF5 user's guide. */
- image->width = f->ny;
- image->height = f->nx;
+ image->width = f->nfs;
+ image->height = f->nss;
- buf = malloc(sizeof(float)*f->nx*f->ny);
+ buf = malloc(sizeof(float)*f->nfs*f->nss);
r = H5Dread(f->dh, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL,
H5P_DEFAULT, buf);
@@ -1159,8 +1157,8 @@ int hdf5_read2(struct hdfile *f, struct image *image, struct event *ev,
return 1;
}
- data_width = f->ny;
- data_height = f->nx;
+ data_width = f->nfs;
+ data_height = f->nss;
if ( (data_width < p->w )
|| (data_height < p->h) )