diff options
| author | Raymond Lu <songyulu@hdfgroup.org> | 2012-08-09 20:24:56 (GMT) |
|---|---|---|
| committer | Raymond Lu <songyulu@hdfgroup.org> | 2012-08-09 20:24:56 (GMT) |
| commit | 527a6edb3ef6cc698efb3ddfb41279541fee0602 (patch) | |
| tree | fbf9942017afe1e55f6d7cf644277ec27bb2a38a /src/H5Dio.c | |
| parent | 3b3ae10c5b7a54a64c92b321d53cfe3b00c6584d (diff) | |
| download | hdf5-527a6edb3ef6cc698efb3ddfb41279541fee0602.zip hdf5-527a6edb3ef6cc698efb3ddfb41279541fee0602.tar.gz hdf5-527a6edb3ef6cc698efb3ddfb41279541fee0602.tar.bz2 | |
[svn-r22655] Dectris project - I changed the rank of the offset for H5PSIdirect_write from RANK+1 to RANK. But internally, it expands to RANK+1 as
the library requires it to terminate with a zero.
Tested on koala.
Diffstat (limited to 'src/H5Dio.c')
| -rw-r--r-- | src/H5Dio.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/src/H5Dio.c b/src/H5Dio.c index b55a263..845f4e9 100644 --- a/src/H5Dio.c +++ b/src/H5Dio.c @@ -291,6 +291,7 @@ H5PSIdirect_write(hid_t dset_id, hid_t dxpl_id, unsigned filters, hsize_t *offse H5D_t *dset = NULL; int ndims; hsize_t *dims = NULL; + hsize_t *internal_offset = NULL; int i; herr_t ret_value = SUCCEED; /* Return value */ @@ -319,21 +320,29 @@ H5PSIdirect_write(hid_t dset_id, hid_t dxpl_id, unsigned filters, hsize_t *offse if(NULL == (dims = (hsize_t *)H5MM_malloc(ndims*sizeof(hsize_t)))) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for dimensions") + if(NULL == (internal_offset = (hsize_t *)H5MM_malloc((ndims+1)*sizeof(hsize_t)))) + HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for offset") + if(H5S_get_simple_extent_dims(dset->shared->space, dims, NULL) < 0) HGOTO_ERROR(H5E_DATASPACE, H5E_CANTGET, FAIL, "can't retrieve dataspace extent dims") - /* Make sure the offset doesn't exceed the dataset's dimensions */ - for(i=0; i<ndims; i++) + for(i=0; i<ndims; i++) { + /* Make sure the offset doesn't exceed the dataset's dimensions */ if(offset[i] > dims[i]) HGOTO_ERROR(H5E_DATASPACE, H5E_BADTYPE, FAIL, "offset exceeds dimensions of dataset") - /* Make sure the offset fall right on a chunk's boundary */ - for(i=0; i<ndims; i++) + /* Make sure the offset fall right on a chunk's boundary */ if(offset[i] % dset->shared->layout.u.chunk.dim[i]) HGOTO_ERROR(H5E_DATASPACE, H5E_BADTYPE, FAIL, "offset doesn't fall on chunks's boundary") + + internal_offset[i] = offset[i]; + } + /* The library's chunking code requires the offset terminates with a zero */ + internal_offset[ndims] = 0; + /* write raw data */ - if(H5D__chunk_direct_write(dset, dxpl_id, filters, offset, data_size, buf) < 0) + if(H5D__chunk_direct_write(dset, dxpl_id, filters, internal_offset, data_size, buf) < 0) HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "can't write data") done: |