merged changes from master branch

This commit is contained in:
Edward Hartnett 2020-02-11 04:49:05 -07:00
commit 60ae773eb5
3 changed files with 6 additions and 6 deletions

View File

@ -13,6 +13,7 @@ This file contains a high-level description of this package's evolution. Release
* [Enhancement] Enable use of compact storage option for small vars in netCDF/HDF5 files. See [https://github.com/Unidata/netcdf-c/issues/1570].
* [Enhancement] Updated benchmarking program bm_file.c to better handle very large files. See [https://github.com/Unidata/netcdf-c/issues/1555].
* [Enhancement] Added version number to dispatch table, and now check version with nc_def_user_format(). See [https://github.com/Unidata/netcdf-c/issues/1599].
* [Enhancement] Increased size of maximum allowed name in HDF4 files to NC_MAX_NAME. See [https://github.com/Unidata/netcdf-c/issues/1631].
## 4.7.3 - November 20, 2019

View File

@ -14,10 +14,6 @@
#include "config.h"
#include "ncdispatch.h"
/** This is the max size of an SD dataset name in HDF4 (from HDF4
* documentation).*/
#define NC_MAX_HDF4_NAME 64
/** This is the max number of dimensions for a HDF4 SD dataset (from
* HDF4 documentation). */
#define NC_MAX_HDF4_DIMS 32

View File

@ -276,8 +276,11 @@ NOTE: The NC_MAX_DIMS, NC_MAX_ATTRS, and NC_MAX_VARS limits
#define NC_MAX_VAR_DIMS 1024 /**< max per variable dimensions */
/**@}*/
/** This is the max size of an SD dataset name in HDF4 (from HDF4 documentation).*/
#define NC_MAX_HDF4_NAME 64
/** The max size of an SD dataset name in HDF4 (from HDF4
* documentation) is 64. But in in the wild we have encountered longer
* names. As long as the HDF4 name is not greater than NC_MAX_NAME,
* our code will be OK. */
#define NC_MAX_HDF4_NAME NC_MAX_NAME
/** In HDF5 files you can set the endianness of variables with
nc_def_var_endian(). This define is used there. */