Skip to content

Commit d380e4d

Browse files
thewtexthewtex
authored
Merge pull request InsightSoftwareConsortium#5256 from seanm/minc-2025-02-24
Update MINC to 2025-02-24
2 parents 20e2f6d + 1703fc5 commit d380e4d

File tree

2 files changed

+54
-49
lines changed

2 files changed

+54
-49
lines changed

‎Modules/ThirdParty/MINC/src/libminc/CMakeLists.txt‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ IF(NOT LIBMINC_EXTERNALLY_CONFIGURED)
7070
FIND_PACKAGE(ZLIB REQUIRED)
7171
SET(HDF5_NO_FIND_PACKAGE_CONFIG_FILE ON)
7272
FIND_PACKAGE(HDF5 REQUIRED COMPONENTS C )
73-
73+
7474
IF(LIBMINC_USE_NIFTI)
7575
IF (LIBMINC_USE_SYSTEM_NIFTI)
7676
FIND_PACKAGE(NIFTI)
@@ -82,7 +82,7 @@ IF(NOT LIBMINC_EXTERNALLY_CONFIGURED)
8282
ELSE()
8383
SET(NIFTI_FOUND OFF)
8484
ENDIF()
85-
85+
8686
SET(HAVE_ZLIB ON)
8787
ELSE(NOT LIBMINC_EXTERNALLY_CONFIGURED)
8888
#TODO: set paths for HDF5 etc
@@ -132,9 +132,9 @@ CHECK_FUNCTION_EXISTS(fork HAVE_WORKING_FORK)
132132
CHECK_FUNCTION_EXISTS(vfork HAVE_WORKING_VFORK)
133133
CHECK_FUNCTION_EXISTS(fdopen HAVE_FDOPEN)
134134
CHECK_FUNCTION_EXISTS(strdup HAVE_STRDUP)
135-
CHECK_FUNCTION_EXISTS(getpwnam HAVE_GETPWNAM)
135+
CHECK_FUNCTION_EXISTS(getpwnam HAVE_GETPWNAM)
136136
CHECK_FUNCTION_EXISTS(select HAVE_SELECT)
137-
CHECK_FUNCTION_EXISTS(strerror HAVE_STRERROR)
137+
CHECK_FUNCTION_EXISTS(strerror HAVE_STRERROR)
138138
CHECK_FUNCTION_EXISTS(sysconf HAVE_SYSCONF)
139139
CHECK_FUNCTION_EXISTS(system HAVE_SYSTEM)
140140

@@ -222,7 +222,7 @@ IF(LIBMINC_MINC1_SUPPORT)
222222
ENDIF(LIBMINC_MINC1_SUPPORT)
223223

224224
IF(LIBMINC_BUILD_EZMINC)
225-
set(LIBMINC_INCLUDE_DIRS_CONFIG
225+
set(LIBMINC_INCLUDE_DIRS_CONFIG
226226
${CMAKE_CURRENT_SOURCE_DIR}/ezminc
227227
)
228228
INCLUDE_DIRECTORIES(
@@ -303,8 +303,8 @@ SET(minc1_LIB_SRCS
303303
)
304304

305305
SET(minc1_HEADERS
306-
libsrc/minc.h
307-
libsrc/voxel_loop.h
306+
libsrc/minc.h
307+
libsrc/voxel_loop.h
308308
libsrc/nd_loop.h
309309
libsrc/minc_compat.h
310310
libsrc/minc_simple.h
@@ -329,9 +329,9 @@ SET(minc2_LIB_SRCS
329329

330330
SET(minc2_HEADERS
331331
libsrc2/minc2.h
332-
libsrc2/minc2_defs.h
333-
libsrc2/minc2_structs.h
334-
libsrc2/minc2_api.h
332+
libsrc2/minc2_defs.h
333+
libsrc2/minc2_structs.h
334+
libsrc2/minc2_api.h
335335
)
336336

337337
# volume_io2
@@ -375,7 +375,7 @@ SET(volume_io_LIB_SRCS
375375
)
376376

377377
IF(LIBMINC_NIFTI_SUPPORT)
378-
SET(volume_io_LIB_SRCS
378+
SET(volume_io_LIB_SRCS
379379
${volume_io_LIB_SRCS}
380380
${LIBMINC_NIFTI_SOURCES}
381381
)
@@ -384,19 +384,19 @@ ENDIF(LIBMINC_NIFTI_SUPPORT)
384384

385385
SET(volume_io_HEADERS
386386
volume_io/Include/volume_io/alloc.h
387-
volume_io/Include/volume_io/arrays.h
388-
volume_io/Include/volume_io/basic.h
389-
volume_io/Include/volume_io/def_math.h
390-
volume_io/Include/volume_io/files.h
391-
volume_io/Include/volume_io/geom_structs.h
392-
volume_io/Include/volume_io/geometry.h
393-
volume_io/Include/volume_io/multidim.h
394-
volume_io/Include/volume_io/progress.h
395-
volume_io/Include/volume_io/string_funcs.h
396-
volume_io/Include/volume_io/system_dependent.h
397-
volume_io/Include/volume_io/transforms.h
398-
volume_io/Include/volume_io/vol_io_prototypes.h
399-
volume_io/Include/volume_io/volume.h
387+
volume_io/Include/volume_io/arrays.h
388+
volume_io/Include/volume_io/basic.h
389+
volume_io/Include/volume_io/def_math.h
390+
volume_io/Include/volume_io/files.h
391+
volume_io/Include/volume_io/geom_structs.h
392+
volume_io/Include/volume_io/geometry.h
393+
volume_io/Include/volume_io/multidim.h
394+
volume_io/Include/volume_io/progress.h
395+
volume_io/Include/volume_io/string_funcs.h
396+
volume_io/Include/volume_io/system_dependent.h
397+
volume_io/Include/volume_io/transforms.h
398+
volume_io/Include/volume_io/vol_io_prototypes.h
399+
volume_io/Include/volume_io/volume.h
400400
volume_io/Include/volume_io/volume_cache.h
401401
)
402402

@@ -410,7 +410,7 @@ ELSE(LIBMINC_BUILD_SHARED_LIBS)
410410
ENDIF(LIBMINC_BUILD_SHARED_LIBS)
411411

412412
IF(LIBMINC_NIFTI_SUPPORT)
413-
SET(NIFTI_LIBRARIES
413+
SET(NIFTI_LIBRARIES
414414
${NIFTI_LIBRARY} ${ZNZ_LIBRARY}
415415
)
416416
get_filename_component(NIFTI_LIBRARY_NAME "${NIFTI_LIBRARY}" NAME)
@@ -438,11 +438,11 @@ SET(LIBMINC_STATIC_LIBRARIES ${LIBMINC_LIBRARY_STATIC} ${HDF5_LIBRARY} ${NIFTI_L
438438
SET(LIBMINC_STATIC_LIBRARIES_CONFIG ${LIBMINC_LIBRARY_STATIC} ${HDF5_LIBRARY_NAME} ${NIFTI_LIBRARIES} ${ZLIB_LIBRARY_NAME})
439439

440440
IF(UNIX)
441-
SET(LIBMINC_LIBRARIES ${LIBMINC_LIBRARIES} m dl ${RT_LIBRARY})
442-
SET(LIBMINC_STATIC_LIBRARIES ${LIBMINC_STATIC_LIBRARIES} m dl ${RT_LIBRARY})
443-
444-
SET(LIBMINC_LIBRARIES_CONFIG ${LIBMINC_LIBRARIES_CONFIG} m dl ${RT_LIBRARY_NAME})
445-
SET(LIBMINC_STATIC_LIBRARIES_CONFIG ${LIBMINC_STATIC_LIBRARIES_CONFIG} m dl ${RT_LIBRARY_NAME})
441+
SET(LIBMINC_LIBRARIES ${LIBMINC_LIBRARIES} m ${CMAKE_DL_LIBS} ${RT_LIBRARY})
442+
SET(LIBMINC_STATIC_LIBRARIES ${LIBMINC_STATIC_LIBRARIES} m ${CMAKE_DL_LIBS} ${RT_LIBRARY})
443+
444+
SET(LIBMINC_LIBRARIES_CONFIG ${LIBMINC_LIBRARIES_CONFIG} m ${CMAKE_DL_LIBS} ${RT_LIBRARY_NAME})
445+
SET(LIBMINC_STATIC_LIBRARIES_CONFIG ${LIBMINC_STATIC_LIBRARIES_CONFIG} m ${CMAKE_DL_LIBS} ${RT_LIBRARY_NAME})
446446
ENDIF(UNIX)
447447

448448
SET(minc_LIB_SRCS ${minc2_LIB_SRCS} ${minc_common_SRCS})
@@ -482,13 +482,13 @@ ENDIF()
482482
#EXPORT(TARGETS ${LIBMINC_LIBRARY} FILE "${LIBMINC_EXPORTED_TARGETS}.cmake")
483483

484484
IF(UNIX)
485-
TARGET_LINK_LIBRARIES(${LIBMINC_LIBRARY} m dl )
485+
TARGET_LINK_LIBRARIES(${LIBMINC_LIBRARY} m ${CMAKE_DL_LIBS} )
486486

487487
#ITK: Skip static library build
488488
IF(0)
489489
IF(LIBMINC_BUILD_SHARED_LIBS)
490490
ADD_LIBRARY(${LIBMINC_LIBRARY_STATIC} STATIC ${minc_LIB_SRCS} ${minc_HEADERS} ${volume_io_LIB_SRCS} ${volume_io_HEADERS} )
491-
TARGET_LINK_LIBRARIES(${LIBMINC_LIBRARY_STATIC} ${HDF5_LIBRARY} ${NIFTI_LIBRARIES} ${ZLIB_LIBRARY} ${RT_LIBRARY} m dl )
491+
TARGET_LINK_LIBRARIES(${LIBMINC_LIBRARY_STATIC} ${HDF5_LIBRARY} ${NIFTI_LIBRARIES} ${ZLIB_LIBRARY} ${RT_LIBRARY} m ${CMAKE_DL_LIBS} )
492492
IF(LIBMINC_MINC1_SUPPORT)
493493
TARGET_LINK_LIBRARIES(${LIBMINC_LIBRARY} ${NETCDF_LIBRARY})
494494
ENDIF(LIBMINC_MINC1_SUPPORT)
@@ -497,8 +497,8 @@ IF(0)
497497
ENDIF(0)
498498
ENDIF(UNIX)
499499

500-
SET_TARGET_PROPERTIES(${LIBMINC_LIBRARY}
501-
PROPERTIES
500+
SET_TARGET_PROPERTIES(${LIBMINC_LIBRARY}
501+
PROPERTIES
502502
SOVERSION ${LIBMINC_SOVERSION})
503503

504504
IF(LIBMINC_MINC1_SUPPORT)
@@ -511,10 +511,10 @@ ENDIF(LIBMINC_MINC1_SUPPORT)
511511

512512
IF( LIBMINC_INSTALL_LIB_DIR )
513513
INSTALL(
514-
TARGETS
515-
${LIBMINC_LIBRARY}
514+
TARGETS
515+
${LIBMINC_LIBRARY}
516516
EXPORT
517-
${LIBMINC_EXPORTED_TARGETS}
517+
${LIBMINC_EXPORTED_TARGETS}
518518
LIBRARY DESTINATION ${LIBMINC_INSTALL_LIB_DIR} COMPONENT libraries
519519
ARCHIVE DESTINATION ${LIBMINC_INSTALL_LIB_DIR} COMPONENT libraries
520520
RUNTIME DESTINATION ${LIBMINC_INSTALL_LIB_DIR} COMPONENT libraries
@@ -589,9 +589,9 @@ configure_file(UseLIBMINC.cmake.in
589589
IF(LIBMINC_INSTALL_LIB_DIR AND NOT LIBMINC_INSTALL_NO_DEVELOPMENT)
590590
INSTALL(
591591
FILES
592-
${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/Use${LIBMINC_EXTERNAL_LIB_PREFIX}LIBMINC.cmake
592+
${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/Use${LIBMINC_EXTERNAL_LIB_PREFIX}LIBMINC.cmake
593593
${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${LIBMINC_EXTERNAL_LIB_PREFIX}LIBMINCConfig.cmake
594-
DESTINATION
594+
DESTINATION
595595
${LIBMINC_INSTALL_LIB_DIR}/cmake
596596
COMPONENT Development)
597597
ENDIF(LIBMINC_INSTALL_LIB_DIR AND NOT LIBMINC_INSTALL_NO_DEVELOPMENT)

‎Modules/ThirdParty/MINC/src/libminc/libcommon/ParseArgv.c‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,16 @@ ParseLong(const char *argPtr, char **endPtr)
111111
* Process an argv array according to a table of expected
112112
* command-line options. See the manual page for more details.
113113
*
114+
* argcPtr: Number of arguments in argv. Modified to hold # args left in argv
115+
* at end.
116+
*
117+
* argv: Array of arguments. Modified to hold those that couldn't be processed
118+
* here.
119+
*
120+
* argTable: Array of option descriptions
121+
*
122+
* flags: Or'ed combination of various flag bits, such as ARGV_NO_DEFAULTS.
123+
*
114124
* Results:
115125
* The return value is a Boolean value with non-zero indicating an
116126
* error.
@@ -126,14 +136,7 @@ ParseLong(const char *argPtr, char **endPtr)
126136
*/
127137

128138
int
129-
ParseArgv(argcPtr, argv, argTable, flags)
130-
int *argcPtr; /* Number of arguments in argv. Modified
131-
* to hold # args left in argv at end. */
132-
char **argv; /* Array of arguments. Modified to hold
133-
* those that couldn't be processed here. */
134-
ArgvInfo *argTable; /* Array of option descriptions */
135-
int flags; /* Or'ed combination of various flag bits,
136-
* such as ARGV_NO_DEFAULTS. */
139+
ParseArgv(int *argcPtr, char **argv, ArgvInfo *argTable, int flags)
137140
{
138141
ArgvInfo *infoPtr;
139142
/* Pointer to the current entry in the
@@ -315,7 +318,8 @@ ParseArgv(argcPtr, argv, argTable, flags)
315318
}
316319
break;
317320
case ARGV_FUNC: {
318-
int (*handlerProc)() = (int (*)())(uintptr_t)infoPtr->src;
321+
typedef int (*handlerProcType)(void*, const char*, char*);
322+
handlerProcType handlerProc = (handlerProcType)(uintptr_t)infoPtr->src;
319323

320324
if ((*handlerProc)(infoPtr->dst, infoPtr->key,
321325
argv[srcIndex])) {
@@ -325,7 +329,8 @@ ParseArgv(argcPtr, argv, argTable, flags)
325329
break;
326330
}
327331
case ARGV_GENFUNC: {
328-
int (*handlerProc)() = (int (*)())(uintptr_t)infoPtr->src;
332+
typedef int (*handlerProcType)(void*, const char*, int, char**);
333+
handlerProcType handlerProc = (handlerProcType)(uintptr_t)infoPtr->src;
329334

330335
argc = (*handlerProc)(infoPtr->dst, infoPtr->key,
331336
argc, argv+srcIndex);

0 commit comments

Comments
 (0)