summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2001-09-28 19:46:04 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2001-09-28 19:46:04 (GMT)
commit938be578415512b31d8ceec35dd69547232b5164 (patch)
tree82e1e533384df08dfb06d4291424767eff68d4ea
parenta0d5c60945a025c78407d3867e8936cbd3485515 (diff)
downloadhdf5-938be578415512b31d8ceec35dd69547232b5164.zip
hdf5-938be578415512b31d8ceec35dd69547232b5164.tar.gz
hdf5-938be578415512b31d8ceec35dd69547232b5164.tar.bz2
[svn-r4494] Purpose:
Bug fix. Problem: When an entire dataset was selected (through whatever means, H5S_ALL, making an explicit "all" selection, etc.), the code was not allowing the optimized routine to read the entire dataset in at once when the current dimensions did not match the maximum dimensions and instead was defaulting to a [much] slower method to read in the dataset. Solution: Took out check which was requiring current dimensions to be equal to the maximum dimensions. Platforms tested: FreeBSD 4.4 (hawkwind)
-rw-r--r--src/H5Sall.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/src/H5Sall.c b/src/H5Sall.c
index 46ef817..5d79baf 100644
--- a/src/H5Sall.c
+++ b/src/H5Sall.c
@@ -459,13 +459,6 @@ printf("%s: check 1.0\n",FUNC);
/* Get information about memory and file */
for (u=0; u<mem_space->extent.u.simple.rank; u++) {
- if (mem_space->extent.u.simple.max &&
- mem_space->extent.u.simple.size[u]!=mem_space->extent.u.simple.max[u])
- goto fall_through;
- if (file_space->extent.u.simple.max &&
- file_space->extent.u.simple.size[u]!=file_space->extent.u.simple.max[u])
- goto fall_through;
-
if(mem_space->select.type==H5S_SEL_HYPERSLABS) {
/* Check for a "regular" hyperslab selection */
if(mem_space->select.sel_info.hslab.diminfo != NULL) {
@@ -620,13 +613,6 @@ H5S_all_write(H5F_t *f, const struct H5O_layout_t *layout,
/* Get information about memory and file */
for (u=0; u<mem_space->extent.u.simple.rank; u++) {
- if (mem_space->extent.u.simple.max &&
- mem_space->extent.u.simple.size[u]!=mem_space->extent.u.simple.max[u])
- goto fall_through;
- if (file_space->extent.u.simple.max &&
- file_space->extent.u.simple.size[u]!=file_space->extent.u.simple.max[u])
- goto fall_through;
-
if(mem_space->select.type==H5S_SEL_HYPERSLABS) {
/* Check for a "regular" hyperslab selection */
if(mem_space->select.sel_info.hslab.diminfo != NULL) {