diff options
Diffstat (limited to 'src/H5Dscatgath.c')
| -rw-r--r-- | src/H5Dscatgath.c | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/src/H5Dscatgath.c b/src/H5Dscatgath.c index 9b60d81..4fc32dd 100644 --- a/src/H5Dscatgath.c +++ b/src/H5Dscatgath.c @@ -576,8 +576,8 @@ H5D__scatgath_read(const H5D_io_info_t *io_info, const H5D_dset_io_info_t *dset_ /* * Perform datatype conversion. */ - if (H5T_convert(dset_info->type_info.tpath, dset_info->type_info.src_type_id, - dset_info->type_info.dst_type_id, smine_nelmts, (size_t)0, (size_t)0, tmp_buf, + if (H5T_convert(dset_info->type_info.tpath, dset_info->type_info.src_type, + dset_info->type_info.dst_type, smine_nelmts, (size_t)0, (size_t)0, tmp_buf, io_info->bkg_buf) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTCONVERT, FAIL, "datatype conversion failed"); @@ -772,8 +772,8 @@ H5D__scatgath_write(const H5D_io_info_t *io_info, const H5D_dset_io_info_t *dset /* * Perform datatype conversion. */ - if (H5T_convert(dset_info->type_info.tpath, dset_info->type_info.src_type_id, - dset_info->type_info.dst_type_id, smine_nelmts, (size_t)0, (size_t)0, tmp_buf, + if (H5T_convert(dset_info->type_info.tpath, dset_info->type_info.src_type, + dset_info->type_info.dst_type, smine_nelmts, (size_t)0, (size_t)0, tmp_buf, io_info->bkg_buf) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTCONVERT, FAIL, "datatype conversion failed"); } /* end else */ @@ -975,10 +975,9 @@ H5D__scatgath_read_select(H5D_io_info_t *io_info) /* * Perform datatype conversion. */ - if (H5T_convert(dset_info->type_info.tpath, dset_info->type_info.src_type_id, - dset_info->type_info.dst_type_id, - (size_t)io_info->sel_pieces[i]->piece_points, (size_t)0, (size_t)0, - tmp_bufs[i], tmp_bkg_buf) < 0) + if (H5T_convert(dset_info->type_info.tpath, dset_info->type_info.src_type, + dset_info->type_info.dst_type, (size_t)io_info->sel_pieces[i]->piece_points, + (size_t)0, (size_t)0, tmp_bufs[i], tmp_bkg_buf) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTCONVERT, FAIL, "datatype conversion failed"); /* Do the data transform after the conversion (since we're using type mem_type) */ @@ -1232,8 +1231,8 @@ H5D__scatgath_write_select(H5D_io_info_t *io_info) /* * Perform datatype conversion. */ - if (H5T_convert(dset_info->type_info.tpath, dset_info->type_info.src_type_id, - dset_info->type_info.dst_type_id, + if (H5T_convert(dset_info->type_info.tpath, dset_info->type_info.src_type, + dset_info->type_info.dst_type, (size_t)io_info->sel_pieces[i]->piece_points, (size_t)0, (size_t)0, tmp_write_buf, tmp_bkg_buf) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTCONVERT, FAIL, "datatype conversion failed"); @@ -1292,10 +1291,9 @@ H5D__scatgath_write_select(H5D_io_info_t *io_info) * Perform datatype conversion. */ assert(j < bkg_pieces); - if (H5T_convert(dset_info->type_info.tpath, dset_info->type_info.src_type_id, - dset_info->type_info.dst_type_id, - (size_t)io_info->sel_pieces[i]->piece_points, (size_t)0, (size_t)0, - tmp_write_buf, bkg_bufs[j]) < 0) + if (H5T_convert(dset_info->type_info.tpath, dset_info->type_info.src_type, + dset_info->type_info.dst_type, (size_t)io_info->sel_pieces[i]->piece_points, + (size_t)0, (size_t)0, tmp_write_buf, bkg_bufs[j]) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTCONVERT, FAIL, "datatype conversion failed"); /* Advance to next background buffer */ |