Skip to content

Commit 0568f94

Browse files
committed
COMP: Replace hdf5.h includes with itk_hdf5.h in MINC library
Fixes -Wshadow-header warnings about duplicate header candidates. The MINC library sources included <hdf5.h> directly, which could resolve to two different headers (itkhdf5/hdf5.h and itkhdf5/src/hdf5.h) causing a shadow header warning. Use ITK's itk_hdf5.h wrapper instead, which properly handles both internal and system HDF5 configurations.
1 parent a893aba commit 0568f94

13 files changed

Lines changed: 13 additions & 16 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
#endif
3939

4040
#ifdef HAVE_MINC2
41-
#include <hdf5.h>
41+
#include <itk_hdf5.h>
4242
#endif
4343

4444
#include <math.h>

Modules/ThirdParty/MINC/src/libminc/libsrc/minc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@
167167
#endif /* MNCAPI not defined */
168168

169169
#if MINC2
170-
#include <hdf5.h>
170+
#include <itk_hdf5.h>
171171
#include <netcdf.h>
172172
#include "minc_compat.h"
173173
#else

Modules/ThirdParty/MINC/src/libminc/libsrc2/convert.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* \defgroup mi2Cvt MINC 2.0 Coordinate and Voxel Conversion Functions
1111
*/
1212
#include <stdlib.h>
13-
#include <hdf5.h>
13+
#include <itk_hdf5.h>
1414
#include <math.h>
1515
#include <float.h>
1616
#include "minc2.h"

Modules/ThirdParty/MINC/src/libminc/libsrc2/datatype.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
************************************************************************/
44

55
#include <stdlib.h>
6-
#include <hdf5.h>
6+
#include <itk_hdf5.h>
77
#include "minc2.h"
88
#include "minc2_private.h"
99

Modules/ThirdParty/MINC/src/libminc/libsrc2/grpattr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Functions to manipulate attributes and groups.
77
************************************************************************/
88
#include <stdlib.h>
9-
#include <hdf5.h>
9+
#include <itk_hdf5.h>
1010

1111
#ifdef HAVE_CONFIG_H
1212
#include "config.h"

Modules/ThirdParty/MINC/src/libminc/libsrc2/label.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
************************************************************************/
1414

1515
#include <stdlib.h>
16-
#include <hdf5.h>
16+
#include <itk_hdf5.h>
1717
#include "minc2.h"
1818
#include "minc2_private.h"
1919

Modules/ThirdParty/MINC/src/libminc/libsrc2/m2util.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@
33
* \author Leila Baghdadi, Bert Vincent
44
*
55
************************************************************************/
6-
#include <hdf5.h>
7-
8-
#include <stdlib.h>
9-
#include <math.h>
6+
#include <itk_hdf5.h>
107

118
#ifdef HAVE_CONFIG_H
129
#include "config.h"

Modules/ThirdParty/MINC/src/libminc/libsrc2/minc2.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#ifndef MINC2_H
66
#define MINC2_H
77

8-
#include <hdf5.h>
8+
#include <itk_hdf5.h>
99
#include "minc2_defs.h"
1010
#include "minc2_structs.h"
1111
#include "minc2_error.h"

Modules/ThirdParty/MINC/src/libminc/libsrc2/record.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include "config.h"
77
#endif /*HAVE_CONFIG_H*/
88

9-
#include <hdf5.h>
9+
#include <itk_hdf5.h>
1010
#include "minc2.h"
1111
#include "minc2_private.h"
1212

Modules/ThirdParty/MINC/src/libminc/libsrc2/slice.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#endif /*HAVE_CONFIG_H*/
2020

2121
#include <stdlib.h>
22-
#include <hdf5.h>
22+
#include <itk_hdf5.h>
2323
#include "minc2.h"
2424
#include "minc2_private.h"
2525

0 commit comments

Comments
 (0)