Remove RELEASE_NOTES.md conflict

Author: DennisHeimbigner

README.md

@@ -58,7 +58,7 @@ Copyright and licensing information can be found [here](http://www.unidata.ucar.
 To install the netCDF-C software, please see the file INSTALL in the
 netCDF-C distribution, or the (usually more up-to-date) document:
 
-* [Building NetCDF](http://www.unidata.ucar.edu/software/netcdf/docs/getting_and_building_netcdf.html)
+* [Building NetCDF](https://www.unidata.ucar.edu/software/netcdf/docs/winbin.html)
 
 ### Documentation
 A language-independent User's Guide for netCDF, and some other

RELEASE_NOTES.md

@@ -11,6 +11,7 @@ This file contains a high-level description of this package's evolution. Release
 dispatch table operations that should work for any dispatch
 table, even if they do not do anything; functions such as
 nc_inq_var_filter [https://github.com/Unidata/netcdf-c/issues/1693].
+* [Bug Fix] Fixed a scalar annotation error when scalar == 0; see [Github #1707](https://github.com/Unidata/netcdf-c/issues/1707) for more information.
 * [Bug Fix] Use proper CURLOPT values for VERIFYHOST and VERIFYPEER; the semantics for VERIFYHOST in particular changed. Documented in NUG/DAP2.md. See  [https://github.com/Unidata/netcdf-c/issues/1684].
 * [Bug Fix][cmake] Correct an issue with parallel filter test logic in CMake-based builds.
 * [Bug Fix] Now allow nc_inq_var_deflate()/nc_inq_var_szip() to be called for all formats, not just HDF5. Non-HDF5 files return NC_NOERR and report no compression in use. This reverts behavior that was changed in the 4.7.4 release. See [https://github.com/Unidata/netcdf-c/issues/1691].

libhdf5/hdf5dim.c

@@ -166,8 +166,16 @@ NC4_inq_dim(int ncid, int dimid, char *name, size_t *lenp)
                of records from all the vars that share this
                dimension. */
             *lenp = 0;
-            if ((ret = nc4_find_dim_len(dim_grp, dimid, &lenp)))
-                return ret;
+            if (dim->len == 0) {
+              if ((ret = nc4_find_dim_len(dim_grp, dimid, &lenp)))
+                 return ret;
+              if (h5->no_write == NC_TRUE) {
+                dim->len = *lenp;
+              }
+            }
+            else {
+              *lenp = dim->len;
+            }
         }
         else
         {

ncdump/vardata.c

@@ -506,12 +506,12 @@ print_rows(
             }
 	}
 	if (formatting_specs.full_data_cmnts) {
-            for (j = 0; j < marks_pending; j++) {
+      for (j = 0; j < marks_pending; j++) {
 		sbuf_cat(sb, RBRACE);
-            }
-            printf("%s", sbuf_str(sb));
-            lastdelim (0, lastrow);
-            annotate (vp, cor, d0-1);
+      }
+      printf("%s", sbuf_str(sb));
+      lastdelim (0, lastrow);
+      annotate (vp, cor, (d0 > 0 ? d0-1 : d0));
 	} else {
             for (j = 0; j < marks_pending; j++) {
 		sbuf_cat(sb, RBRACE);