diff options
| author | lrknox <lrknox> | 2017-05-20 02:32:43 (GMT) |
|---|---|---|
| committer | lrknox <lrknox> | 2017-05-20 02:32:43 (GMT) |
| commit | 3a43f7af3eaf807fbdf4cf26c10eadb67903b4a8 (patch) | |
| tree | a9af55e96791ecc7845a67a5b2ec6e667a24dd12 /tools/h5import | |
| parent | 197b461bceee6b066ba7560766644ad2a26c361c (diff) | |
| parent | d2db9140b298cf4ffa75255743a709a8b5362135 (diff) | |
| download | hdf5-3a43f7af3eaf807fbdf4cf26c10eadb67903b4a8.zip hdf5-3a43f7af3eaf807fbdf4cf26c10eadb67903b4a8.tar.gz hdf5-3a43f7af3eaf807fbdf4cf26c10eadb67903b4a8.tar.bz2 | |
Merge branch 'hdf5_1_8' of https://bitbucket.hdfgroup.org/scm/~lrknox/hdf5_lrk into hdf5_1_8
Diffstat (limited to 'tools/h5import')
| -rw-r--r-- | tools/h5import/CMakeTests.cmake | 11 | ||||
| -rw-r--r-- | tools/h5import/h5importtest.c | 16 | ||||
| -rw-r--r-- | tools/h5import/h5importtestutil.sh.in | 3 |
3 files changed, 20 insertions, 10 deletions
diff --git a/tools/h5import/CMakeTests.cmake b/tools/h5import/CMakeTests.cmake index bfc5ef8..84d1190 100644 --- a/tools/h5import/CMakeTests.cmake +++ b/tools/h5import/CMakeTests.cmake @@ -1,3 +1,14 @@ +# +# Copyright by The HDF Group. +# All rights reserved. +# +# This file is part of HDF5. The full HDF5 copyright notice, including +# terms governing use, modification, and redistribution, is contained in +# the COPYING file, which can be found at the root of the source code +# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases. +# If you do not have access to either file, you may request a copy from +# help@hdfgroup.org. +# ############################################################################## ############################################################################## diff --git a/tools/h5import/h5importtest.c b/tools/h5import/h5importtest.c index a304f90..135b8e4 100644 --- a/tools/h5import/h5importtest.c +++ b/tools/h5import/h5importtest.c @@ -117,8 +117,8 @@ main(void) #ifdef H5_SIZEOF_LONG_LONG row4i64[i] = row4i64[i - 1] + rowi4i64; #endif - row4i16[i] = row4i16[i - 1] + rowi4i16; - row4i8[i] = row4i8[i - 1] + rowi4i8; + row4i16[i] = (short)(row4i16[i - 1] + rowi4i16); + row4i8[i] = (char)(row4i8[i - 1] + rowi4i8); } for (j = 1; j < ncol; j++) @@ -129,8 +129,8 @@ main(void) #ifdef H5_SIZEOF_LONG_LONG col4i64[j] = col4i64[j - 1] + coli4i64; #endif - col4i16[j] = col4i16[j - 1] + coli4i16; - col4i8[j] = col4i8[j - 1] + coli4i8; + col4i16[j] = (short)(col4i16[j - 1] + coli4i16); + col4i8[j] = (char)(col4i8[j - 1] + coli4i8); } for (k = 1; k < npln; k++) { @@ -140,8 +140,8 @@ main(void) #ifdef H5_SIZEOF_LONG_LONG pln4i64[k] = pln4i64[k - 1] + plni4i64; #endif - pln4i16[k] = pln4i16[k - 1] + plni4i16; - pln4i8[k] = pln4i8[k - 1] + plni4i8; + pln4i16[k] = (short)(pln4i16[k - 1] + plni4i16); + pln4i8[k] = (char)(pln4i8[k - 1] + plni4i8); } /* @@ -155,8 +155,8 @@ main(void) for (k = 0; k < npln; k++) { b64r3[k][i][j] = row8[i] + col8[j] + pln8[k]; b32i3[k][i][j] = row4i[i] + col4i[j] + pln4i[k]; - b16i3[k][i][j] = row4i16[i] + col4i16[j] + pln4i16[k]; - b8i3[k][i][j] = row4i8[i] + col4i8[j] + pln4i8[k]; + b16i3[k][i][j] = (short)(row4i16[i] + col4i16[j] + pln4i16[k]); + b8i3[k][i][j] = (char)(row4i8[i] + col4i8[j] + pln4i8[k]); } diff --git a/tools/h5import/h5importtestutil.sh.in b/tools/h5import/h5importtestutil.sh.in index 4c80c8b..b724957 100644 --- a/tools/h5import/h5importtestutil.sh.in +++ b/tools/h5import/h5importtestutil.sh.in @@ -11,8 +11,7 @@ # If you do not have access to either file, you may request a copy from # help@hdfgroup.org. # -# HDF Utilities Test script -# Usage: h5importtestutil.sh [machine-type] +# Tests for the h5import tool srcdir=@srcdir@ |