Update upstream source from tag 'upstream/3.0.21'
Update to upstream version '3.0.21'
with Debian dir d15e1cf00da90788ee76970040e33e56b0b0566c
Mathieu Malaterre
1 year, 3 months ago
| 18 | 18 |
submodules: true
|
| 19 | 19 |
fetch-depth: 2
|
| 20 | 20 |
- name: configure
|
| 21 | |
run: cmake -DGDCM_BUILD_DOCBOOK_MANPAGES:BOOL=OFF -DCMAKE_BUILD_TYPE:STRING=None -B build
|
|
21 |
run: cmake -DGDCM_BUILD_SHARED_LIBS=ON -DGDCM_BUILD_DOCBOOK_MANPAGES:BOOL=OFF -DCMAKE_BUILD_TYPE:STRING=None -B build
|
| 22 | 22 |
- name: make
|
| 23 | 23 |
run: cmake --build build
|
| 24 | 24 |
- name: make check
|
| 16 | 16 |
#----------------------------------------------------------------------------
|
| 17 | 17 |
|
| 18 | 18 |
project(GDCM
|
| 19 | |
VERSION 3.0.20
|
|
19 |
VERSION 3.0.21
|
| 20 | 20 |
LANGUAGES CXX C
|
| 21 | 21 |
)
|
| 22 | 22 |
## NOTE: the "DESCRIPTION" feature of project() was introduced in cmake 3.10.0
|
| 1173 | 1173 |
interceptslope[1] = el_rs.GetValue();
|
| 1174 | 1174 |
if( interceptslope[1] == 0 )
|
| 1175 | 1175 |
interceptslope[1] = 1;
|
| 1176 | |
gdcmWarningMacro( "PMS Modality LUT loaded for MR Image Storage: [" << interceptslope[0] << "," << interceptslope[1] << "]" );
|
|
1176 |
gdcmDebugMacro( "PMS Modality LUT loaded for MR Image Storage: [" << interceptslope[0] << "," << interceptslope[1] << "]" );
|
| 1177 | 1177 |
}
|
| 1178 | 1178 |
}
|
| 1179 | 1179 |
else
|
|
| 1181 | 1181 |
std::vector<double> dummy(2);
|
| 1182 | 1182 |
if( GetRescaleInterceptSlopeValueFromDataSet(ds, dummy) )
|
| 1183 | 1183 |
{
|
| 1184 | |
// for everyone else, read your DCS, and set: ForceRescaleInterceptSlope = true if needed
|
| 1185 | |
gdcmDebugMacro( "Modality LUT unused for MR Image Storage: [" << dummy[0] << "," << dummy[1] << "]" );
|
|
1184 |
if(dummy[0] != 0 || dummy[1] != 1) {
|
|
1185 |
// SIEMENS is sending MFSPLIT with Modality LUT
|
|
1186 |
// Case is: MAGNETOM Prisma / syngo MR XA30A with MFSPLIT
|
|
1187 |
interceptslope[0] = dummy[0];
|
|
1188 |
interceptslope[1] = dummy[1];
|
|
1189 |
gdcmWarningMacro( "Forcing Modality LUT used for MR Image Storage: [" << dummy[0] << "," << dummy[1] << "]" );
|
|
1190 |
}
|
| 1186 | 1191 |
}
|
| 1187 | 1192 |
}
|
| 1188 | 1193 |
#endif
|
|
| 2476 | 2481 |
ms.SetFromFile(f);
|
| 2477 | 2482 |
const DataSet& ds = f.GetDataSet();
|
| 2478 | 2483 |
|
| 2479 | |
if( ms == MediaStorage::MRImageStorage )
|
|
2484 |
if( ms == MediaStorage::MRImageStorage || ms == MediaStorage::NuclearMedicineImageStorage )
|
| 2480 | 2485 |
{
|
| 2481 | 2486 |
const Tag trwvms(0x0040,0x9096); // Real World Value Mapping Sequence
|
| 2482 | 2487 |
if( ds.FindDataElement( trwvms ) )
|