mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2025-03-07 17:08:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dap2cvt.dmh

Browse Source
This commit is contained in:
Ward Fisher 2017-10-24 17:15:48 -06:00 committed by GitHub
commit 47a2b4a714
4 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
RELEASE_NOTES.md
View File

@ -5,6 +5,11 @@ Release Notes {#RELEASE_NOTES}
This file contains a high-level description of this package's evolution. Releases are in reverse chronological order (most recent first). Note that, as of netcdf 4.2, the `netcdf-c++` and `netcdf-fortran` libraries have been separated into their own libraries.
## 4.5.1 - TBD
* Corrected a memory overflow in `tst_h_dimscales`, see [Github #511](https://github.com/Unidata/netcdf-c/issues/511), [Github #505](https://github.com/Unidata/netcdf-c/issues/505), [Github #363](https://github.com/Unidata/netcdf-c/issues/363) and [Github #244](https://github.com/Unidata/netcdf-c/issues/244) for more information.
## 4.5.0 - October 20, 2017
* Corrected an issue which could potential result in a hang while using parallel file I/O. See [Github #449](https://github.com/Unidata/netcdf-c/pull/449) for more information.

8
h5_test/tst_h_dimscales.c
View File

@ -85,7 +85,7 @@ rec_scan_group(hid_t grpid)
}
else
{
int visitor_data = 0;
hid_t visitor_data = 0;
/* Here's how to get the number of scales attached
* to the dataset's dimension 0. */
@ -379,7 +379,7 @@ main()
if ((grpid = H5Gopen(fileid, GRP_NAME)) < 0) ERR;
/* Loop through datasets to find variables. */
if (H5Gget_num_objs(grpid, &num_obj) < 0) ERR;
if (H5Gget_num_objs(grpid, (hsize_t *)&num_obj) < 0) ERR;
for (i=0; i<num_obj; i++)
{
/* Get the type (i.e. group, dataset, etc.), and the name of
@ -426,7 +426,7 @@ main()
else
{
char label[STR_LEN+1];
int visitor_data = 0;
hid_t visitor_data = 0;
/* Here's how to get the number of scales attached
* to the dataset's dimension 0. */
@ -617,7 +617,7 @@ main()
else
{
char label[STR_LEN+1];
int visitor_data = 0;
hid_t visitor_data = 0;
/* SHould have these dimensions... */
if (dims[TIME_DIM] != 0 || dims[LAT_DIM] != LAT_LEN ||

8
libdap4/d4meta.c
View File

@ -42,7 +42,7 @@ static int decodeEconst(NCD4meta* builder, NCD4node* enumtype, const char* nameo
static int downConvert(union ATOMICS* converter, NCD4node* type);
static void freeStringMemory(char** mem, int count);
static size_t getDimrefs(NCD4node* var, int* dimids);
static size_t getDimsizes(NCD4node* var, size_t* dimsizes);
static size_t getDimsizes(NCD4node* var, int* dimsizes);
static void reclaimNode(NCD4node* node);
static d4size_t getpadding(d4size_t offset, size_t alignment);
static int markdapsize(NCD4meta* meta);
@ -523,7 +523,7 @@ buildCompound(NCD4meta* builder, NCD4node* cmpdtype, NCD4node* group, char* name
/* Step 3: add the fields to type */
for(i=0;i<nclistlength(cmpdtype->vars);i++) {
int rank;
size_t dimsizes[NC_MAX_VAR_DIMS];
int dimsizes[NC_MAX_VAR_DIMS];
NCD4node* field = (NCD4node*)nclistget(cmpdtype->vars,i);
rank = nclistlength(field->dims);
if(rank == 0) { /* scalar */
@ -681,13 +681,13 @@ getDimrefs(NCD4node* var, int* dimids)
}
static size_t
getDimsizes(NCD4node* var, size_t* dimsizes)
getDimsizes(NCD4node* var, int* dimsizes)
{
int i;
int rank = nclistlength(var->dims);
for(i=0;i<rank;i++) {
NCD4node* dim = (NCD4node*)nclistget(var->dims,i);
dimsizes[i] = dim->dim.size;
dimsizes[i] = (int)dim->dim.size;
}
return rank;
}

4
nc_test/util.c
View File

@ -21,10 +21,6 @@ int
inRange(const double value, const nc_type xtype)
{
switch (xtype) {
double min = 0.0;
double max = 0.0;
case NC_CHAR: return value >= X_CHAR_MIN && value <= X_CHAR_MAX;
case NC_BYTE: return value >= X_BYTE_MIN && value <= X_BYTE_MAX;
case NC_SHORT: return value >= X_SHORT_MIN && value <= X_SHORT_MAX;