summaryrefslogtreecommitdiffstats
path: root/src/H5Tconv.c
diff options
context:
space:
mode:
authorRobb Matzke <matzke@llnl.gov>1999-02-25 15:40:27 (GMT)
committerRobb Matzke <matzke@llnl.gov>1999-02-25 15:40:27 (GMT)
commit17535fbc174978ae71d916a02ee4dacee66a9d8c (patch)
treed3114488ba01370e6b21acca5915c4f771125713 /src/H5Tconv.c
parentd8b07ce1d025e3f4284c5038347097180fc2da11 (diff)
downloadhdf5-17535fbc174978ae71d916a02ee4dacee66a9d8c.zip
hdf5-17535fbc174978ae71d916a02ee4dacee66a9d8c.tar.gz
hdf5-17535fbc174978ae71d916a02ee4dacee66a9d8c.tar.bz2
[svn-r1101] Changes since 19990219
---------------------- ./config/irix64 The old (-32) compiler is now supported by setting envrionment CC='cc -32'. The -64 compiler is the default or you can set CC='cc -64'. ./src/H5A.c ./src/H5D.c ./src/H5F.c ./src/H5Fistore.c ./src/H5Flow.c ./src/H5G.c ./src/H5I.c ./src/H5Ocomp.c ./src/H5P.c ./src/H5R.c ./src/H5RA.c ./src/H5T.c ./src/H5Tbit.c ./src/H5Tconv.c ./src/H5Z.c ./src/H5detect.c ./test/big.c ./test/cmpd_dset.c ./test/dsets.c ./test/dtypes.c ./test/enum.c ./test/mtime.c ./test/ohdr.c ./tools/h5ls.c Fixed lots of warnings on Irix64. Mailed a few remaining warnings in H5S to Quincey and a few in the dumper to Ruey-Hsia.
Diffstat (limited to 'src/H5Tconv.c')
-rw-r--r--src/H5Tconv.c38
1 files changed, 21 insertions, 17 deletions
diff --git a/src/H5Tconv.c b/src/H5Tconv.c
index 8816894..462bc25 100644
--- a/src/H5Tconv.c
+++ b/src/H5Tconv.c
@@ -126,7 +126,7 @@ static intn interface_initialize_g = 0;
#define H5T_CONV_sS(S_ALIGN,D_ALIGN,ST,DT) { \
assert(sizeof(ST)<=sizeof(DT)); \
CI_BEGIN(S_ALIGN, D_ALIGN, ST, DT, nelmts-1, --) { \
- *d = *s; \
+ *d = (DT)(*s); \
} CI_END; \
}
@@ -139,7 +139,7 @@ static intn interface_initialize_g = 0;
*d = 0; \
} \
} else { \
- *d = *s; \
+ *d = (DT)(*s); \
} \
} CI_END; \
}
@@ -153,7 +153,7 @@ static intn interface_initialize_g = 0;
*d = (D_MAX); \
} \
} else { \
- *d = *s; \
+ *d = (DT)(*s); \
} \
} CI_END; \
}
@@ -161,7 +161,7 @@ static intn interface_initialize_g = 0;
#define H5T_CONV_uU(STYPE,DTYPE,ST,DT) { \
assert(sizeof(ST)<=sizeof(DT)); \
CI_BEGIN(STYPE, DTYPE, ST, DT, nelmts-1, --) { \
- *d = *s; \
+ *d = (DT)(*s); \
} CI_END; \
}
@@ -179,7 +179,7 @@ static intn interface_initialize_g = 0;
*d = (D_MIN); \
} \
} else { \
- *d = *s; \
+ *d = (DT)(*s); \
} \
} CI_END; \
}
@@ -199,7 +199,7 @@ static intn interface_initialize_g = 0;
*d = (D_MAX); \
} \
} else { \
- *d = *s; \
+ *d = (DT)(*s); \
} \
} CI_END; \
}
@@ -213,7 +213,7 @@ static intn interface_initialize_g = 0;
*d = (D_MAX); \
} \
} else { \
- *d = *s; \
+ *d = (DT)(*s); \
} \
} CI_END; \
}
@@ -227,7 +227,7 @@ static intn interface_initialize_g = 0;
*d = (D_MAX); \
} \
} else { \
- *d = *s; \
+ *d = (DT)(*s); \
} \
} CI_END; \
}
@@ -241,7 +241,7 @@ static intn interface_initialize_g = 0;
*d = 0; \
} \
} else { \
- *d = *s; \
+ *d = (DT)(*s); \
} \
} CI_END; \
}
@@ -255,7 +255,7 @@ static intn interface_initialize_g = 0;
*d = (D_MAX); \
} \
} else { \
- *d = *s; \
+ *d = (DT)(*s); \
} \
} CI_END; \
}
@@ -1100,12 +1100,12 @@ H5T_conv_enum(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
* Direction of conversion.
*/
if (dst->size <= src->size) {
- src_delta = src->size;
- dst_delta = dst->size;
+ src_delta = (int)src->size; /*overflow shouldn't be possible*/
+ dst_delta = (int)dst->size; /*overflow shouldn't be possible*/
s = d = buf;
} else {
- src_delta = -(src->size);
- dst_delta = -(dst->size);
+ src_delta = -(int)src->size; /*overflow shouldn't be possible*/
+ dst_delta = -(int)dst->size; /*overflow shouldn't be possible*/
s = buf + (nelmts-1) * src->size;
d = buf + (nelmts-1) * dst->size;
}
@@ -2013,14 +2013,18 @@ H5T_conv_s_s (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
direction = 1;
olap = 0;
} else if (src->size>=dst->size) {
+ double olapd = HDceil((double)(dst->size)/
+ (double)(src->size-dst->size));
+ olap = (size_t)olapd;
sp = dp = (uint8_t*)buf;
direction = 1;
- olap = HDceil((double)(dst->size)/(double)(src->size-dst->size));
} else {
+ double olapd = HDceil((double)(src->size)/
+ (double)(dst->size-src->size));
+ olap = (size_t)olapd;
sp = (uint8_t*)buf + (nelmts-1) * src->size;
dp = (uint8_t*)buf + (nelmts-1) * dst->size;
direction = -1;
- olap = HDceil((double)(src->size)/(double)(dst->size-src->size));
}
/* Allocate the overlap buffer */
@@ -2034,7 +2038,7 @@ H5T_conv_s_s (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
/*
* If the source and destination buffers overlap then use a
- * temporary buffer fot eh destination.
+ * temporary buffer for the destination.
*/
if (direction>0) {
s = sp;