diff options
| author | Robert E. McGrath <mcgrath@ncsa.uiuc.edu> | 2004-08-11 17:45:51 (GMT) |
|---|---|---|
| committer | Robert E. McGrath <mcgrath@ncsa.uiuc.edu> | 2004-08-11 17:45:51 (GMT) |
| commit | 82af9859efa01e72d0e0a9ce968d1ae19f78987e (patch) | |
| tree | 0fe352798c1227c797e5e0b9869d3586772cfbb6 /src | |
| parent | ebd477c930ed6bf1b4b9b96ed735c1b2da9b191e (diff) | |
| download | hdf5-82af9859efa01e72d0e0a9ce968d1ae19f78987e.zip hdf5-82af9859efa01e72d0e0a9ce968d1ae19f78987e.tar.gz hdf5-82af9859efa01e72d0e0a9ce968d1ae19f78987e.tar.bz2 | |
[svn-r9065] Purpose:
Bug fix
Description:
Wrong value returned for error
Solution:
Return correct value
Platforms tested:
verbena
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 f07303f..0fa91d4 100644 --- a/src/H5Zszip.c +++ b/src/H5Zszip.c @@ -77,13 +77,7 @@ const 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: * *------------------------------------------------------------------------- */ @@ -129,7 +123,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 * *------------------------------------------------------------------------- */ @@ -201,7 +201,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 { |