Commit Graph

18 Commits

Author SHA1 Message Date
Ward Fisher
612b35a84c Merge branch 'master' into cdf-5, in preparation for merging the CDF-5 functionality into the master branch. This will be the key new feature for netcdf 4.4.0. 2015-11-05 13:40:35 -07:00
Ward Fisher
1979a1ca5f Corrected an issue on 32-bit Windows. 2015-10-27 12:31:36 -06:00
Ward Fisher
d5ce804744 The issue (at least this one) in nctest is solved. In dv2i.c, line 896 (or thereabouts), a long variable was being passed to a function expecting a ptrdiff_t. These are not compatible sizes, on Windows. 2015-10-27 12:04:03 -06:00
tbeu
e2820e4d8a Fix common typos
Detected by https://github.com/vlajos/misspell_fixer
2015-08-20 11:42:05 +02:00
dmh
859f105005 merge-squash 2015-08-15 16:26:35 -06:00
dmh
18eb1c1126 Coverity fixing 2014-08-17 12:03:23 -06:00
dmh
19d377e87a conflict resolution 2014-03-10 12:13:16 -06:00
dmh
9d5c8ba308 1. Previous ci of conversion fixes in libdispatch
was incomplete; complete the fix.
2. There is an inconsistency in the netcdfh interface
   about whether rank (# dimensions) is an int or
   size_t. I inadvertently assumed the latter and that
   breaks some API calls; so revert back.
2014-03-10 12:09:36 -06:00
Ward Fisher
513cb29ea4 The replacement of 'int' with 'size_t' caused a number of errors across multiple platforms in our CI system. The culprit is not obvious, so I am reverting the commit until we can take a closer look at the underlying issue.
Revert "1. Attempted to reduce the number of conversion errors"

This reverts commit 1b941d342d.
2014-03-10 10:04:37 -06:00
dmh
1b941d342d 1. Attempted to reduce the number of conversion errors
when -Wconversion is set. Fixed libdispatch, but
   rest of netcdf remains to be done.
2014-03-09 15:51:45 -06:00
Dennis Heimbigner
cc7cd9a142 Fix part of JIRA NCF-253.
libdispatch/dv2i.c
now heap allocates rs[NC_MAX_VARS]
instead of stack allocation.
2013-05-10 18:15:11 +00:00
Ward Fisher
91188cea7a Merging CMake branch into trunk. Changes include:
CMake related changes in CMakeLists.txt files,
cmake_config.h.in. Other changes relate to 
Windows-specific issues, and changes made
when regenerating generated source files.
2013-01-15 22:43:09 +00:00
Ward Fisher
81280c7878 Merge from latest netcdf-cmake branch.
- Fixes for Windows.
- CMake-based changes (functionality, tests).
- Smattering of coverity-informed bug-fixes.
2012-12-05 18:35:42 +00:00
Ward Fisher
43b5dcccb9 Updated nvdims to return -1 in appropriate instances, on appropriate platforms. (see notes for previous commit.) 2012-06-12 18:52:50 +00:00
Ward Fisher
aa33c3c85c o Under right circumstances, nvdims would return an uninitialized value
(on windows platforms), resulting in a downstream SIGSEGV upon memory
  allocation of 0 bytes.  Gave nvdims a default value of 1. This may not
  be the best possible fix, but in the short term it has fixed the issue.
  The problem would occur when NetCDF was compiled with NetCDF-4 support,
  on Windows, in 64-bit mode, and when nctest/nctest.exe would run.
2012-06-11 23:17:20 +00:00
Ward Fisher
f2516809c5 Corrected a typo in dv21.c, added a stanza for zlib.dll into configure.ac 2012-05-21 21:08:49 +00:00
Dennis Heimbigner
88f7950d6f fix a bunch of uninitialized variables 2012-03-16 22:29:09 +00:00
Ed Hartnett
fd4a63c4d2 changed file names to allow visual studio to cope 2011-07-14 09:50:37 +00:00