[med-svn] [Git][med-team/gdcm][upstream] New upstream version 3.0.21

[Mathieu Malaterre (@malat)]

Mathieu Malaterre pushed to branch upstream at Debian Med / gdcm


Commits:
a47b3374 by Mathieu Malaterre at 2023-01-29T13:04:17+01:00
New upstream version 3.0.21
- - - - -


3 changed files:

- .github/workflows/c-cpp.yml
- CMakeLists.txt
- Source/MediaStorageAndFileFormat/gdcmImageHelper.cxx


Changes:

=====================================
.github/workflows/c-cpp.yml
=====================================
@@ -19,7 +19,7 @@ jobs:
         submodules: true
         fetch-depth: 2
     - name: configure
-      run: cmake -DGDCM_BUILD_DOCBOOK_MANPAGES:BOOL=OFF -DCMAKE_BUILD_TYPE:STRING=None -B build
+      run: cmake -DGDCM_BUILD_SHARED_LIBS=ON -DGDCM_BUILD_DOCBOOK_MANPAGES:BOOL=OFF -DCMAKE_BUILD_TYPE:STRING=None -B build
     - name: make
       run: cmake --build build
     - name: make check


=====================================
CMakeLists.txt
=====================================
@@ -17,7 +17,7 @@ endif()
 #----------------------------------------------------------------------------
 
 project(GDCM
-  VERSION 3.0.20
+  VERSION 3.0.21
   LANGUAGES CXX C
 )
 ## NOTE: the "DESCRIPTION" feature of project() was introduced in cmake 3.10.0


=====================================
Source/MediaStorageAndFileFormat/gdcmImageHelper.cxx
=====================================
@@ -1174,7 +1174,7 @@ std::vector<double> ImageHelper::GetRescaleInterceptSlopeValue(File const & f)
         interceptslope[1] = el_rs.GetValue();
         if( interceptslope[1] == 0 )
           interceptslope[1] = 1;
-        gdcmWarningMacro( "PMS Modality LUT loaded for MR Image Storage: [" << interceptslope[0] << "," << interceptslope[1] << "]" );
+        gdcmDebugMacro( "PMS Modality LUT loaded for MR Image Storage: [" << interceptslope[0] << "," << interceptslope[1] << "]" );
       }
       }
     else
@@ -1182,8 +1182,13 @@ std::vector<double> ImageHelper::GetRescaleInterceptSlopeValue(File const & f)
       std::vector<double> dummy(2);
       if( GetRescaleInterceptSlopeValueFromDataSet(ds, dummy) )
         {
-        // for everyone else, read your DCS, and set: ForceRescaleInterceptSlope = true if needed
-        gdcmDebugMacro( "Modality LUT unused for MR Image Storage: [" << dummy[0] << "," << dummy[1] << "]" );
+        if(dummy[0] != 0 || dummy[1] != 1) {
+        // SIEMENS is sending MFSPLIT with Modality LUT
+	// Case is: MAGNETOM Prisma / syngo MR XA30A with MFSPLIT
+        interceptslope[0] = dummy[0];
+        interceptslope[1] = dummy[1];
+        gdcmWarningMacro( "Forcing Modality LUT used for MR Image Storage: [" << dummy[0] << "," << dummy[1] << "]" );
+        }
         }
       }
 #endif
@@ -2477,7 +2482,7 @@ bool ImageHelper::GetRealWorldValueMappingContent(File const & f, RealWorldValue
   ms.SetFromFile(f);
   const DataSet& ds = f.GetDataSet();
 
-  if( ms == MediaStorage::MRImageStorage )
+  if( ms == MediaStorage::MRImageStorage || ms == MediaStorage::NuclearMedicineImageStorage )
   {
 	  const Tag trwvms(0x0040,0x9096); // Real World Value Mapping Sequence
 	  if( ds.FindDataElement( trwvms ) )



View it on GitLab: https://salsa.debian.org/med-team/gdcm/-/commit/a47b33746368cf8beb19eca279532eac4cfc442b

-- 
View it on GitLab: https://salsa.debian.org/med-team/gdcm/-/commit/a47b33746368cf8beb19eca279532eac4cfc442b
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20230129/e3436f96/attachment-0001.htm>