Merge branch 'cdf-5-working' into cdf-5

This commit is contained in:
Ward Fisher 2015-10-27 12:32:01 -06:00
commit b7746cf89b

View File

@ -869,7 +869,7 @@ ncvarputg(
return ncvarputs(ncid, varid, start, count, stride, value);
/* else */
{
long long *imp=NULL;
ptrdiff_t *imp=NULL;
if (map != NULL) {
int ret = NC_NOERR;
/* make map[ndims-1] number of elements instead of bytes */
@ -880,7 +880,7 @@ ncvarputg(
ret = nc_inq_vartype(ncid, varid, &type);
if(ret) return ret;
el_size = nctypelen(type);
imp = (long long*) malloc(ndims * sizeof(long long));
imp = (ptrdiff_t*) malloc(ndims * sizeof(ptrdiff_t));
for (i=0; i<ndims; i++) imp[i] = map[i] / el_size;
}