diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2008-06-16 22:17:29 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2008-06-16 22:17:29 (GMT) |
| commit | db2c4c497abab139485dbf6797e56b1340e4577d (patch) | |
| tree | f7dfb321a3643658ed24aaf776ec4c1e48bc76a3 /hl/fortran | |
| parent | 55af47c47c3c0c7bc17266968f5e0e782189e819 (diff) | |
| download | hdf5-db2c4c497abab139485dbf6797e56b1340e4577d.zip hdf5-db2c4c497abab139485dbf6797e56b1340e4577d.tar.gz hdf5-db2c4c497abab139485dbf6797e56b1340e4577d.tar.bz2 | |
[svn-r15221] Description:
Bring changes from trunk from the time the branch was created (r14280)
up to the 1.8.0 release (r14525) back into the metadata journaling branch.
Tested on:
FreeBSD/32 6.2 (duty) in debug mode
FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
in debug mode
Linux/64-amd64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN,
in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode
Diffstat (limited to 'hl/fortran')
| -rw-r--r-- | hl/fortran/Makefile.in | 1 | ||||
| -rw-r--r-- | hl/fortran/examples/Makefile.in | 1 | ||||
| -rw-r--r-- | hl/fortran/src/H5IMcc.c | 1 | ||||
| -rw-r--r-- | hl/fortran/src/H5IMcc.h | 7 | ||||
| -rw-r--r-- | hl/fortran/src/Makefile.in | 1 | ||||
| -rw-r--r-- | hl/fortran/test/Makefile.in | 1 |
6 files changed, 4 insertions, 8 deletions
diff --git a/hl/fortran/Makefile.in b/hl/fortran/Makefile.in index 8125e3b..ae50941 100644 --- a/hl/fortran/Makefile.in +++ b/hl/fortran/Makefile.in @@ -196,6 +196,7 @@ SET_MAKE = @SET_MAKE@ SHELL = /bin/sh SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ +STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ TIME = @TIME@ diff --git a/hl/fortran/examples/Makefile.in b/hl/fortran/examples/Makefile.in index d4f12d0..062251b 100644 --- a/hl/fortran/examples/Makefile.in +++ b/hl/fortran/examples/Makefile.in @@ -186,6 +186,7 @@ SET_MAKE = @SET_MAKE@ SHELL = /bin/sh SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ +STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ TIME = @TIME@ diff --git a/hl/fortran/src/H5IMcc.c b/hl/fortran/src/H5IMcc.c index e33edb1..492e8b8 100644 --- a/hl/fortran/src/H5IMcc.c +++ b/hl/fortran/src/H5IMcc.c @@ -63,7 +63,6 @@ herr_t H5IMmake_image_8bitf(hid_t loc_id, /* initialize the image dimensions */ dims[0] = height; dims[1] = width; - dims[2] = 1; /*------------------------------------------------------------------------- * create and write the dataset diff --git a/hl/fortran/src/H5IMcc.h b/hl/fortran/src/H5IMcc.h index 6b06b66..9f70bac 100644 --- a/hl/fortran/src/H5IMcc.h +++ b/hl/fortran/src/H5IMcc.h @@ -24,13 +24,6 @@ extern "C" { #endif -#define IMAGE_CLASS "IMAGE" -#define PALETTE_CLASS "PALETTE" -#define IMAGE_VERSION "1.2" -#define IMAGE8_RANK 3 -#define IMAGE24_RANK 3 - - herr_t H5IMmake_image_8bitf( hid_t loc_id, const char *dset_name, diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in index a126837..0e28d46 100644 --- a/hl/fortran/src/Makefile.in +++ b/hl/fortran/src/Makefile.in @@ -216,6 +216,7 @@ SET_MAKE = @SET_MAKE@ SHELL = /bin/sh SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ +STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ TIME = @TIME@ diff --git a/hl/fortran/test/Makefile.in b/hl/fortran/test/Makefile.in index 2322eea..21aa1ad 100644 --- a/hl/fortran/test/Makefile.in +++ b/hl/fortran/test/Makefile.in @@ -206,6 +206,7 @@ SET_MAKE = @SET_MAKE@ SHELL = /bin/sh SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ +STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ TIME = @TIME@ |