mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2024-11-21 03:13:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update HDF4 support for recent datatype changes.

Browse Source
This commit is contained in:
Quincey Koziol 2014-02-25 21:05:19 -06:00
parent c4b3f4c191
commit fe9e0b056d
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libsrc4/nc4file.c
View File

@ -788,7 +788,6 @@ static int
get_type_info2(NC_HDF5_FILE_INFO_T *h5, hid_t datasetid,
NC_TYPE_INFO_T **type_info)
{
NC_TYPE_INFO_T *type;
htri_t is_str, equal = 0;
H5T_class_t class;
hid_t native_typeid, hdf_typeid;
@ -902,6 +901,8 @@ get_type_info2(NC_HDF5_FILE_INFO_T *h5, hid_t datasetid,
}
else
{
NC_TYPE_INFO_T *type;
/* This is a user-defined type. */
if((type = nc4_rec_find_hdf_type(h5->root_grp, native_typeid)))
*type_info = type;
@ -2276,11 +2277,9 @@ get_netcdf_type_from_hdf4(NC_HDF5_FILE_INFO_T *h5, int32 hdf4_typeid,
type_info->nc_type_class = NC_INT;
type_info->endianness = NC_ENDIAN_BIG;
type_info->nc_typeid = *xtype;
if (type_info->name)
free(type_info->name);
if (!(type_info->name = malloc((strlen(nc_type_name_g[t]) + 1) * sizeof(char))))
type_info->size = nc_type_size_g[t];
if (!(type_info->name = strdup(nc_type_name_g[t])))
return NC_ENOMEM;
strcpy(type_info->name, nc_type_name_g[t]);
}
return NC_NOERR;
@ -2416,6 +2415,9 @@ nc4_open_hdf4_file(const char *path, int mode, NC *nc)
if(dimsize) free(dimsize);
return retval;
}
/* Indicate that the variable has a pointer to the type */
var->type_info->rc++;
if ((retval = nc4_get_typelen_mem(h5, var->type_info->nc_typeid, 0, &var_type_size))) {
if(dimsize) free(dimsize);
@ -2424,7 +2426,7 @@ nc4_open_hdf4_file(const char *path, int mode, NC *nc)
var->type_info->size = var_type_size;
LOG((3, "reading HDF4 dataset %s, rank %d netCDF type %d", var->name,
rank, var->xtype));
rank, var->type_info->nc_typeid));
/* Get the fill value. */
if (!(var->fill_value = malloc(var_type_size))) {

4
nc_test4/tst_interops2.c
View File

@ -67,7 +67,7 @@ main(int argc, char **argv)
data_in[i][j] = -88;
/* Read the data through a vara_int function from the netCDF API. */
if (nc_get_vara_int(ncid, 0, nstart, ncount, data_in)) ERR;
if (nc_get_vara_int(ncid, 0, nstart, ncount, (int *)data_in)) ERR;
for (i = 0; i < LAT_LEN; i++)
for (j = 0; j < LON_LEN; j++)
if (data_in[i][j] != data_out[i][j]) ERR;
@ -78,7 +78,7 @@ main(int argc, char **argv)
data_in[i][j] = -88;
/* Read the data through a var_int function from the netCDF API. */
if (nc_get_var_int(ncid, 0, data_in)) ERR;
if (nc_get_var_int(ncid, 0, (int *)data_in)) ERR;
for (i = 0; i < LAT_LEN; i++)
for (j = 0; j < LON_LEN; j++)
if (data_in[i][j] != data_out[i][j]) ERR;