diff options
| author | MuQun Yang <ymuqun@hdfgroup.org> | 2001-08-18 03:01:42 (GMT) |
|---|---|---|
| committer | MuQun Yang <ymuqun@hdfgroup.org> | 2001-08-18 03:01:42 (GMT) |
| commit | 74e21d7249ebd20ae38551fb968afb7890063ce3 (patch) | |
| tree | 55f87f4d409e0013a2104fe06bdc8d79d76d34ca /tools | |
| parent | 59791dedb9d027e604a8c98d0d9f32cf1622d416 (diff) | |
| download | hdf5-74e21d7249ebd20ae38551fb968afb7890063ce3.zip hdf5-74e21d7249ebd20ae38551fb968afb7890063ce3.tar.gz hdf5-74e21d7249ebd20ae38551fb968afb7890063ce3.tar.bz2 | |
[svn-r4386]
Purpose:
update h4toh5test.c to avoid CVS conflict
Description:
Solution:
Platforms tested:
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/h4toh5/h4toh5test.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/tools/h4toh5/h4toh5test.c b/tools/h4toh5/h4toh5test.c index e398a11..6276fa4 100644 --- a/tools/h4toh5/h4toh5test.c +++ b/tools/h4toh5/h4toh5test.c @@ -1071,13 +1071,9 @@ int test_ras24() { int32 start[2], edges[2],dims[2]; int8 image_data24[Y_LENGTH][X_LENGTH][3]; uint8 image_datau24[Y_LENGTH][X_LENGTH][3]; -<<<<<<< h4toh5test.c unsigned char t24[13][15][3],tl24[13][3][15],tp24[3][13][15]; int32 dimst24[2]; intn i, j,k,m,n,p,q,co; -======= - int i, j; ->>>>>>> 1.3.2.5 int32 CUB_SIZE; |