diff options
| author | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2007-12-13 19:55:42 (GMT) |
|---|---|---|
| committer | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2007-12-13 19:55:42 (GMT) |
| commit | 8a5f6de9900a8844314189649d62e1ca56da05b3 (patch) | |
| tree | 76856442086427c836ce7d49a94b779bbea2b832 | |
| parent | 9ebdc0bf08a63227ab31e6f82793e8acd189806f (diff) | |
| download | hdf5-8a5f6de9900a8844314189649d62e1ca56da05b3.zip hdf5-8a5f6de9900a8844314189649d62e1ca56da05b3.tar.gz hdf5-8a5f6de9900a8844314189649d62e1ca56da05b3.tar.bz2 | |
[svn-r14342] change the implementation of H5IMmake_image_8bit to use a 2D dataset
tested: windows, linux solaris w/fortran
| -rw-r--r-- | hl/fortran/src/H5IMcc.c | 1 | ||||
| -rw-r--r-- | hl/fortran/src/H5IMcc.h | 7 | ||||
| -rw-r--r-- | hl/src/H5IM.c | 1 | ||||
| -rw-r--r-- | hl/src/H5IMprivate.h | 2 |
4 files changed, 1 insertions, 10 deletions
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/src/H5IM.c b/hl/src/H5IM.c index ac90cf2..d760675 100644 --- a/hl/src/H5IM.c +++ b/hl/src/H5IM.c @@ -49,7 +49,6 @@ herr_t H5IMmake_image_8bit( hid_t loc_id, /* Initialize the image dimensions */ dims[0] = height; dims[1] = width; - dims[2] = 1; /* Make the dataset */ if ( H5LTmake_dataset( loc_id, dset_name, IMAGE8_RANK, dims, H5T_NATIVE_UCHAR, buffer ) < 0) diff --git a/hl/src/H5IMprivate.h b/hl/src/H5IMprivate.h index 1fa364d..0cb37cc 100644 --- a/hl/src/H5IMprivate.h +++ b/hl/src/H5IMprivate.h @@ -26,7 +26,7 @@ #define IMAGE_CLASS "IMAGE" #define PALETTE_CLASS "PALETTE" #define IMAGE_VERSION "1.2" -#define IMAGE8_RANK 3 +#define IMAGE8_RANK 2 #define IMAGE24_RANK 3 |