diff OrthancServer/DicomInstanceToStore.cpp @ 3920:82e88ff003d7 c-get

merge default -> c-get
author Alain Mazy <alain@mazy.be>
date Tue, 12 May 2020 14:58:24 +0200
parents 7610af1532c3
children 884b55ce01f6
line wrap: on
line diff
--- a/OrthancServer/DicomInstanceToStore.cpp	Tue May 12 07:50:38 2020 +0200
+++ b/OrthancServer/DicomInstanceToStore.cpp	Tue May 12 14:58:24 2020 +0200
@@ -381,14 +381,14 @@
     }
 
 
-    bool HasPixelData()
+    ParsedDicomFile& GetParsedDicomFile()
     {
       ComputeMissingInformation();
       ParseDicomFile();
       
       if (parsed_.HasContent())
       {
-        return parsed_.GetContent().HasTag(DICOM_TAG_PIXEL_DATA);
+        return parsed_.GetContent();
       }
       else
       {
@@ -498,6 +498,11 @@
 
   bool DicomInstanceToStore::HasPixelData() const
   {
-    return const_cast<PImpl&>(*pimpl_).HasPixelData();
+    return const_cast<PImpl&>(*pimpl_).GetParsedDicomFile().HasTag(DICOM_TAG_PIXEL_DATA);
+  }
+
+  ParsedDicomFile& DicomInstanceToStore::GetParsedDicomFile() const
+  {
+    return const_cast<PImpl&>(*pimpl_).GetParsedDicomFile();
   }
 }