diff options
| author | MuQun Yang <ymuqun@hdfgroup.org> | 2001-03-12 17:18:06 (GMT) |
|---|---|---|
| committer | MuQun Yang <ymuqun@hdfgroup.org> | 2001-03-12 17:18:06 (GMT) |
| commit | b793dd3de86cf160ce5ae25555e71e67b69793a8 (patch) | |
| tree | d4eb8a9330278234058eb98f09dd90d575388d17 | |
| parent | 2c4afcd66dd10628c241ea5cd5af6e2d88841b2a (diff) | |
| download | hdf5-b793dd3de86cf160ce5ae25555e71e67b69793a8.zip hdf5-b793dd3de86cf160ce5ae25555e71e67b69793a8.tar.gz hdf5-b793dd3de86cf160ce5ae25555e71e67b69793a8.tar.bz2 | |
[svn-r3607]
Purpose:
change macro RGB into HDF5_RGB since RGB is defined on windows platforms
Description:
Solution:
Platforms tested:
eirene
| -rw-r--r-- | tools/h4toh5/h4toh5pal.c | 2 | ||||
| -rw-r--r-- | tools/h4toh5/h4toh5util.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/h4toh5/h4toh5pal.c b/tools/h4toh5/h4toh5pal.c index 556ecdc..bf90acd 100644 --- a/tools/h4toh5/h4toh5pal.c +++ b/tools/h4toh5/h4toh5pal.c @@ -144,7 +144,7 @@ int Palette_h4_to_h5(int32 file_id,int32 pal_id,hid_t h5g,char*pal_name) { strcpy(palette_label,PALABEL); strcpy(palette_class,PALETTE); strcpy(palette_type,PAL_TYPE); - strcpy(palette_colormodel,RGB); + strcpy(palette_colormodel,HDF5_RGB); /* convert palette annotation into attribute of palette dataset. Since there are no routines to find the exact tag of palette object, we will check three possible object tags of palette objects, that is: diff --git a/tools/h4toh5/h4toh5util.h b/tools/h4toh5/h4toh5util.h index 7e3def7..ba2420f 100644 --- a/tools/h4toh5/h4toh5util.h +++ b/tools/h4toh5/h4toh5util.h @@ -62,7 +62,7 @@ converter.*/ #define HDF4_PALETTE_TYPE "PAL_TYPE" #define PAL_TYPE "STANDARD8" #define PAL_COLORMODEL "PAL_COLORMODEL" -#define RGB "RGB" +#define HDF5_RGB "RGB" /* 3. reserved name for HDF5 object name when meeting with name clashing. */ #define HDF4_VGROUP "HDF4_VGROUP" |