diff options
| author | Robert E. McGrath <mcgrath@ncsa.uiuc.edu> | 2004-08-11 17:48:19 (GMT) |
|---|---|---|
| committer | Robert E. McGrath <mcgrath@ncsa.uiuc.edu> | 2004-08-11 17:48:19 (GMT) |
| commit | c58e0caeba6baffe9a3a385d17a69a9fb4a9ca81 (patch) | |
| tree | d1b16d3ebced79fb4c0ad21312b4e0424aa3536d /src | |
| parent | bd19d3c8b18dcd37f8a198a746c98c0da9ab8d0b (diff) | |
| download | hdf5-c58e0caeba6baffe9a3a385d17a69a9fb4a9ca81.zip hdf5-c58e0caeba6baffe9a3a385d17a69a9fb4a9ca81.tar.gz hdf5-c58e0caeba6baffe9a3a385d17a69a9fb4a9ca81.tar.bz2 | |
[svn-r9066] Purpose:
Bug. See other checkin.
Description:
Solution:
Platforms tested:
Misc. update:
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5Zszip.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/H5Zszip.c b/src/H5Zszip.c index 2133311..bca998e 100644 --- a/src/H5Zszip.c +++ b/src/H5Zszip.c @@ -83,13 +83,7 @@ H5Z_class_t H5Z_SZIP[1] = {{ * Programmer: Quincey Koziol * Monday, April 7, 2003 * - * Modifications: Used new logic to set the size of the scanline parameter. - * Now SZIP compression can be applied to the chunk - * of any shape and size with only one restriction: the number - * of elements in the chunk has to be not less than number - * of elements (pixels) in the block (cd_values[H5Z_SZIP_PARM_PPB] - * parameter). - * Elena Pourmal, July 20, 2004 + * Modifications: * *------------------------------------------------------------------------- */ @@ -135,7 +129,13 @@ done: * Programmer: Quincey Koziol * Monday, April 7, 2003 * - * Modifications: + * Modifications: Used new logic to set the size of the scanline parameter. + * Now SZIP compression can be applied to the chunk + * of any shape and size with only one restriction: the number + * of elements in the chunk has to be not less than number + * of elements (pixels) in the block (cd_values[H5Z_SZIP_PARM_PPB] + * parameter). + * Elena Pourmal, July 20, 2004 * *------------------------------------------------------------------------- */ @@ -211,7 +211,7 @@ H5Z_set_local_szip(hid_t dcpl_id, hid_t type_id, hid_t space_id) if ((npoints=H5Sget_simple_extent_npoints(space_id))<0) HGOTO_ERROR(H5E_PLINE, H5E_CANTGET, FAIL, "unable to get number of points in the dataspace") if(npoints<cd_values[H5Z_SZIP_PARM_PPB]) - HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FALSE, "pixels per block greater than total number of elements in the chunk") + HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "pixels per block greater than total number of elements in the chunk") scanline = MIN((cd_values[H5Z_SZIP_PARM_PPB] * SZ_MAX_BLOCKS_PER_SCANLINE), npoints); } else { |