mirror of
https://github.com/Unidata/netcdf-c.git
synced 2025-02-05 16:20:10 +08:00
Merge branch 'master' into master
This commit is contained in:
commit
9f708a052f
@ -42,7 +42,7 @@ static int decodeEconst(NCD4meta* builder, NCD4node* enumtype, const char* nameo
|
|||||||
static int downConvert(union ATOMICS* converter, NCD4node* type);
|
static int downConvert(union ATOMICS* converter, NCD4node* type);
|
||||||
static void freeStringMemory(char** mem, int count);
|
static void freeStringMemory(char** mem, int count);
|
||||||
static size_t getDimrefs(NCD4node* var, int* dimids);
|
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 void reclaimNode(NCD4node* node);
|
||||||
static d4size_t getpadding(d4size_t offset, size_t alignment);
|
static d4size_t getpadding(d4size_t offset, size_t alignment);
|
||||||
static int markdapsize(NCD4meta* meta);
|
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 */
|
/* Step 3: add the fields to type */
|
||||||
for(i=0;i<nclistlength(cmpdtype->vars);i++) {
|
for(i=0;i<nclistlength(cmpdtype->vars);i++) {
|
||||||
int rank;
|
int rank;
|
||||||
size_t dimsizes[NC_MAX_VAR_DIMS];
|
int dimsizes[NC_MAX_VAR_DIMS];
|
||||||
NCD4node* field = (NCD4node*)nclistget(cmpdtype->vars,i);
|
NCD4node* field = (NCD4node*)nclistget(cmpdtype->vars,i);
|
||||||
rank = nclistlength(field->dims);
|
rank = nclistlength(field->dims);
|
||||||
if(rank == 0) { /* scalar */
|
if(rank == 0) { /* scalar */
|
||||||
@ -681,13 +681,13 @@ getDimrefs(NCD4node* var, int* dimids)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static size_t
|
static size_t
|
||||||
getDimsizes(NCD4node* var, size_t* dimsizes)
|
getDimsizes(NCD4node* var, int* dimsizes)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
int rank = nclistlength(var->dims);
|
int rank = nclistlength(var->dims);
|
||||||
for(i=0;i<rank;i++) {
|
for(i=0;i<rank;i++) {
|
||||||
NCD4node* dim = (NCD4node*)nclistget(var->dims,i);
|
NCD4node* dim = (NCD4node*)nclistget(var->dims,i);
|
||||||
dimsizes[i] = dim->dim.size;
|
dimsizes[i] = (int)dim->dim.size;
|
||||||
}
|
}
|
||||||
return rank;
|
return rank;
|
||||||
}
|
}
|
||||||
|
@ -21,10 +21,6 @@ int
|
|||||||
inRange(const double value, const nc_type xtype)
|
inRange(const double value, const nc_type xtype)
|
||||||
{
|
{
|
||||||
switch (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_CHAR: return value >= X_CHAR_MIN && value <= X_CHAR_MAX;
|
||||||
case NC_BYTE: return value >= X_BYTE_MIN && value <= X_BYTE_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;
|
case NC_SHORT: return value >= X_SHORT_MIN && value <= X_SHORT_MAX;
|
||||||
|
Loading…
Reference in New Issue
Block a user