Merge pull request #3705 from seanm/libminc-2022-10-26

InsightSoftwareConsortium · Nov 1, 2022 · 0c178ce · 0c178ce
2 parents 9214ea0 + cb920a9
commit 0c178ce
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/Modules/ThirdParty/MINC/UpdateFromUpstream.sh b/Modules/ThirdParty/MINC/UpdateFromUpstream.sh
@@ -91,8 +91,7 @@ readonly paths="
 extract_source () {
     git_archive
     pushd "${extractdir}/${name}-reduced"
-	git update-index --chmod=+x 'src/libminc/libsrc/Make.com'
-    # chmod u-x volume_io/Geometry/tensors.c
+    git update-index --chmod=+x 'src/libminc/libsrc/Make.com'
     popd
 }
 

diff --git a/Modules/ThirdParty/MINC/src/libminc/AUTHORS b/Modules/ThirdParty/MINC/src/libminc/AUTHORS
@@ -2,7 +2,7 @@ Peter Neelin designed, coded, and maintained MINC (1992-2002).
 David MacDonald designed, coded, and maintained VolumeIO (1991-1998).
 
 Current maintenance is done on the minc-development mailing list.
-  http://www.bic.mni.mcgill.ca/mailman/listinfo/minc-development
+  https://mailman.bic.mni.mcgill.ca/mailman/listinfo/minc-development
 
 MINC Contributors (in alphabetical order)
 

diff --git a/Modules/ThirdParty/MINC/src/libminc/README b/Modules/ThirdParty/MINC/src/libminc/README
@@ -17,7 +17,7 @@ Minc tools are hosted in https://github.com/BIC-MNI/minc-tools
 Additional tools are available from the Montreal Neurological
 Institute (MNI).
 
-    http://packages.bic.mni.mcgill.ca/tgz
+    https://packages.bic.mni.mcgill.ca/tgz
 
 
 SUPPORT FOR HDF5 "MINC 2.0" FORMAT FILES
@@ -26,7 +26,7 @@ SUPPORT FOR HDF5 "MINC 2.0" FORMAT FILES
 This change requires that HDF5 must be installed before MINC can be
 built. You can obtain HDF5 from, current version is 1.8.11:
 
-   http://www.hdfgroup.org/
+   https://www.hdfgroup.org/
 
 You should NOT need to become an HDF5 expert to use MINC 2.0.
 However, two tools included with HDF5 may prove useful, "h5dump" and
@@ -106,4 +106,4 @@ MINC_PREFER_V2_API = {1,0}
 DOCUMENTATION
 -------------
 
-http://en.wikibooks.org/wiki/MINC
+https://en.wikibooks.org/wiki/MINC
diff --git a/Modules/ThirdParty/MINC/src/libminc/README.release b/Modules/ThirdParty/MINC/src/libminc/README.release
@@ -1,7 +1,7 @@
 
 # how to use git and the master and develop branches
 
-http://nvie.com/posts/a-successful-git-branching-model/
+https://nvie.com/posts/a-successful-git-branching-model/
 
 
 # libtool and libraries

diff --git a/Modules/ThirdParty/MINC/src/libminc/libsrc2/volume.c b/Modules/ThirdParty/MINC/src/libminc/libsrc2/volume.c
@@ -1447,7 +1447,9 @@ int miopen_volume(const char *filename, int mode, mihandle_t *volume)
     }
     /* Get dimension variable attributes for each dimension */
     _miget_file_dimension(handle, p1, &handle->dim_handles[i]);
-    p1 = p2 + 1;
+    if (p2 != NULL) {
+      p1 = p2 + 1;
+    }
   }
 
   if( miset_volume_world_indices(handle) < 0 ) {