GDCM 2020-03-31 (1edcc6ab)

Code extracted from:

    http://git.code.sf.net/p/gdcm/gdcm.git

at commit 1edcc6abfcf70f09816b63b74efc2ad4df5853d7 (release).

Change-Id: I2b9f63284d9e0d88c744c626e59e4c0f367ce0d0

Author: GDCM Upstream

Source/DataDictionary/gdcmPrivateDefaultDicts.cxx

@@ -119,6 +119,7 @@ static const DICT_ENTRY DICOMV3DataDict [] = {
   {0x0021,0x0049,"SIEMENS MR SDS 01",VR::CS,VM::VM1,"??",false},
   {0x0021,0x0048,"SIEMENS MR SDI 02",VR::IS,VM::VM1,"??",false},
   {0x0021,0x0049,"SIEMENS MR SDI 02",VR::IS,VM::VM1,"??",false},
+  {0x0021,0x004e,"SIEMENS MR SDI 02",VR::IS,VM::VM1,"??",false},
   {0x0021,0x004f,"SIEMENS MR SDI 02",VR::LO,VM::VM1,"ImaCoilString",false},
   {0x0021,0x0050,"SIEMENS MR SDS 01",VR::US,VM::VM1,"??",false},
   {0x0021,0x0051,"SIEMENS MR SDI 02",VR::UL,VM::VM1,"?SequenceMask?",false},
@@ -132,6 +133,7 @@ static const DICT_ENTRY DICOMV3DataDict [] = {
   {0x0021,0x005a,"SIEMENS MR SDS 01",VR::CS,VM::VM1,"?Sequence Varient 1?",false},
   {0x0021,0x005b,"SIEMENS MR SDI 02",VR::FD,VM::VM3,"Image Position (Patient)",false},
   {0x0021,0x005b,"SIEMENS MR SDS 01",VR::CS,VM::VM1,"?Sequence Varient 2?",false},
+  {0x0021,0x005c,"SIEMENS MR SDS 01",VR::CS,VM::VM1,"MTR flag. MT => ON",false},
   {0x0021,0x005d,"SIEMENS MR SDS 01",VR::SL,VM::VM1,"??",false},
   {0x0021,0x005e,"SIEMENS MR SDI 02",VR::IS,VM::VM1,"?FrameIndex?",false},
   {0x0021,0x0063,"SIEMENS MR SDI 02",VR::IS,VM::VM1,"?Acquisition Number?",false},
@@ -1964,6 +1966,9 @@ static const DICT_ENTRY DICOMV3DataDict [] = {
   {0x0009,0x0092,"FDMS 1.0",VR::SH,VM::VM1,"Kanji Department Name",false },
   {0x0009,0x00f0,"FDMS 1.0",VR::CS,VM::VM1,"Blackening Process Flag",false },
   {0x0009,0x00f1,"FDMS 1.0",VR::ST,VM::VM1,"Processing Information Flag",false },
+  {0x0009,0x00f2,"FDMS 1.0",VR::CS,VM::VM1,"Normalization Flag",false },
+  {0x0009,0x00f3,"FDMS 1.0",VR::CS,VM::VM1,"Tone characteristic",false },
+  {0x0009,0x00f4,"FDMS 1.0",VR::CS,VM::VM1,"Window Value Fixed Flag",false },
   {0x0019,0x0015,"FDMS 1.0",VR::LO,VM::VM1,"Kanji Body Part for Exposure",false },
   {0x0019,0x0030,"FDMS 1.0",VR::LO,VM::VM1,"Menu Character String",false },
   {0x0019,0x0032,"FDMS 1.0",VR::LO,VM::VM1,"Kanji Menu Name",false },
@@ -2062,7 +2067,8 @@ static const DICT_ENTRY DICOMV3DataDict [] = {
   {0x50f1,0x0007,"FDMS 1.0",VR::CS,VM::VM1,"Subtraction Registration Result",false },
   {0x50f1,0x0008,"FDMS 1.0",VR::CS,VM::VM1,"Energy Subtraction Param. 2",false },
   {0x50f1,0x0009,"FDMS 1.0",VR::SL,VM::VM1,"Afin Conversion Coefficient",false },
-  {0x50f1,0x000a,"FDMS 1.0",VR::SH,VM::VM1,"FNC Parameters",false },
+  {0x50f1,0x000a,"FDMS 1.0",VR::ST,VM::VM1,"FNC Parameters",false },
+  {0x50f1,0x000b,"FDMS 1.0",VR::SS,VM::VM1,"CRF Parameters",false },
   {0x50f1,0x0010,"FDMS 1.0",VR::CS,VM::VM1,"Film Output Format",false },
   {0x50f1,0x0020,"FDMS 1.0",VR::CS,VM::VM1,"Image Processing Modification Flag",false },
   {0x0009,0x0001,"FFP DATA",VR::UN,VM::VM1,"CR Header Information",false },

Source/DataStructureAndEncodingDefinition/gdcmDataSet.txx

@@ -421,7 +421,9 @@ namespace gdcm_ns
         }
       else if( /*pe.GetLastElement().GetTag() == Tag(0xffd8,0xffe0) &&*/ de.GetTag() == Tag(0x7fe0,0x0010) && de.IsUndefinedLength() )
         {
+        // Bug_Siemens_PrivateIconNoItem.dcm
         // PET-GE-dicomwrite-PixelDataSQUN.dcm
+        // PET-GE-dicomwrite-PixelDataSQUNv2.dcm
         // some bozo crafted an undefined length Pixel Data but is actually
         // defined length. Since inside SQ/Item it should be possible to
         // compute the proper length

Source/DataStructureAndEncodingDefinition/gdcmExplicitDataElement.txx

@@ -339,7 +339,6 @@ std::istream &ExplicitDataElement::ReadValue(std::istream &is, bool readvalues)
 #ifdef GDCM_SUPPORT_BROKEN_IMPLEMENTATION
   if( SequenceOfItems *sqi = dynamic_cast<SequenceOfItems*>(&GetValue()) )
     {
-    assert( ValueField->GetLength() == ValueLengthField );
     // Recompute the total length:
     if( !ValueLengthField.IsUndefined() )
       {

Source/DataStructureAndEncodingDefinition/gdcmMediaStorage.cxx

@@ -148,6 +148,7 @@ static const char *MSStrings[] = {
   "1.2.840.10008.5.1.1.30",  // HardcopyColorImageStorage
   "1.2.840.10008.5.1.4.1.1.4.3", // EnhancedMRColorImageStorage
   "1.2.392.200036.9125.1.1.4", // FujiPrivateMammoCRImageStorage (aka FUJI MAMMO CR Storage)
+  "1.2.840.10008.5.1.4.1.1.77.1.5.2", // Ophthalmic Photography 16 Bit Image Storage
 
   nullptr
 };
@@ -323,7 +324,7 @@ static const MSModalityType MSModalityTypes[] = {
   {"ES", 2, false},// VLEndoscopicImageStorage
   {"MG", 3, false},// BreastTomosynthesisImageStorage
   {"CR", 2, false},// FujiPrivateCRImageStorage
-  {"OP", 2, false},// OphthalmicPhotography8BitImageStorage
+  {"OP", 3, false},// OphthalmicPhotography8BitImageStorage
   {"OPT", 3, false},// OphthalmicTomographyImageStorage
   {"GM", 3, false},// VLMicroscopicImageStorage
   {"PT", 3, false},//EnhancedPETImageStorage,
@@ -339,6 +340,7 @@ static const MSModalityType MSModalityTypes[] = {
   {"HC", 2, false},// HardcopyGrayscaleImageStorage
   {"MR", 3, false},// EnhancedMRColorImageStorage
   {"MG", 2, false},// FujiPrivateMammoCRImageStorage
+  {"OP", 3, false},// OphthalmicPhotography16BitImageStorage
   {nullptr, 0, false} //MS_END
 };
 

Source/DataStructureAndEncodingDefinition/gdcmMediaStorage.h

@@ -141,6 +141,7 @@ class GDCM_EXPORT MediaStorage
     HardcopyColorImageStorage,
     EnhancedMRColorImageStorage,
     FujiPrivateMammoCRImageStorage,
+    OphthalmicPhotography16BitImageStorage,
     MS_END
   } MSType; // Media Storage Type
 

Source/MediaStorageAndFileFormat/gdcmPixmapWriter.cxx

@@ -621,7 +621,10 @@ bool PixmapWriter::PrepareWrite( MediaStorage const & ref_ms )
       case 12:
       case 16:
       case 32:
-        depixdata.SetVR( VR::OW );
+        if( depixdata.GetSequenceOfFragments() )
+          depixdata.SetVR( VR::OB );
+        else
+          depixdata.SetVR( VR::OW );
         break;
       default:
         assert( 0 && "should not happen" );