Commit 66427b7
committed
COMP: Adopt VXL private vnl_vector ivars via protected_set_data
Switch itk::Array<T> to vnl_vector::protected_set_data and turn off
VXL_USE_HISTORICAL_PROTECTED_IVARS so ITK builds against VXL >= 7.0.0
(where vnl_vector::data and num_elmts are private).
Bumps Modules/ThirdParty/VNL/CMakeLists.txt find_package floor 3.0.0
to 4.0.0 (protected_set_data first shipped in VXL v3.3.0).1 parent a4fed47 commit 66427b7
2 files changed
Lines changed: 16 additions & 33 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
54 | 54 | | |
55 | 55 | | |
56 | 56 | | |
57 | | - | |
58 | | - | |
| 57 | + | |
59 | 58 | | |
60 | 59 | | |
61 | 60 | | |
| |||
82 | 81 | | |
83 | 82 | | |
84 | 83 | | |
85 | | - | |
| 84 | + | |
86 | 85 | | |
87 | 86 | | |
88 | 87 | | |
| |||
94 | 93 | | |
95 | 94 | | |
96 | 95 | | |
97 | | - | |
98 | | - | |
| 96 | + | |
99 | 97 | | |
100 | 98 | | |
101 | 99 | | |
| |||
107 | 105 | | |
108 | 106 | | |
109 | 107 | | |
110 | | - | |
111 | | - | |
| 108 | + | |
112 | 109 | | |
113 | 110 | | |
114 | 111 | | |
| |||
122 | 119 | | |
123 | 120 | | |
124 | 121 | | |
125 | | - | |
| 122 | + | |
126 | 123 | | |
127 | 124 | | |
128 | 125 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
8 | | - | |
9 | | - | |
10 | | - | |
11 | | - | |
| 8 | + | |
12 | 9 | | |
13 | 10 | | |
14 | 11 | | |
| |||
103 | 100 | | |
104 | 101 | | |
105 | 102 | | |
106 | | - | |
107 | | - | |
108 | | - | |
109 | | - | |
110 | | - | |
111 | | - | |
112 | | - | |
113 | | - | |
114 | | - | |
115 | | - | |
116 | | - | |
117 | | - | |
118 | | - | |
119 | | - | |
120 | | - | |
121 | | - | |
122 | | - | |
123 | | - | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
124 | 110 | | |
125 | 111 | | |
126 | | - | |
| 112 | + | |
127 | 113 | | |
128 | 114 | | |
129 | 115 | | |
| |||
205 | 191 | | |
206 | 192 | | |
207 | 193 | | |
208 | | - | |
209 | | - | |
| 194 | + | |
| 195 | + | |
210 | 196 | | |
211 | 197 | | |
212 | 198 | | |
0 commit comments