Mercurial > hg > orthanc

diff Core/DicomParsing/IDicomTranscoder.cpp @ 3951:5fe8c6d3212e transcoding

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removed useless information "hasSopInstanceUidChanged"
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 19 May 2020 21:06:53 +0200
parents 1f33ed7f82e6
children
line wrap: on
line diff
--- a/Core/DicomParsing/IDicomTranscoder.cpp	Tue May 19 20:37:00 2020 +0200
+++ b/Core/DicomParsing/IDicomTranscoder.cpp	Tue May 19 21:06:53 2020 +0200
@@ -101,7 +101,6 @@
 
 
   void IDicomTranscoder::CheckTranscoding(IDicomTranscoder::DicomImage& transcoded,
-                                          bool hasSopInstanceUidChanged,
                                           DicomTransferSyntax sourceSyntax,
                                           const std::string& sourceSopInstanceUid,
                                           const std::set<DicomTransferSyntax>& allowedSyntaxes,
@@ -116,16 +115,6 @@
 
     std::string targetSopInstanceUid = GetSopInstanceUid(parsed);
 
-    if (hasSopInstanceUidChanged && (targetSopInstanceUid == sourceSopInstanceUid))
-    {
-      throw OrthancException(ErrorCode_InternalError);
-    }
-
-    if (!hasSopInstanceUidChanged && (targetSopInstanceUid != sourceSopInstanceUid))
-    {
-      throw OrthancException(ErrorCode_InternalError);
-    }
-
     if (parsed.getDataset()->tagExists(DCM_PixelData))
     {
       if (!allowNewSopInstanceUid && (targetSopInstanceUid != sourceSopInstanceUid))
@@ -135,8 +124,7 @@
     }
     else
     {
-      if (hasSopInstanceUidChanged ||
-          targetSopInstanceUid != sourceSopInstanceUid)
+      if (targetSopInstanceUid != sourceSopInstanceUid)
       {
         throw OrthancException(ErrorCode_InternalError,
                                "No pixel data: Transcoding must not change the SOP instance UID");
@@ -152,8 +140,7 @@
     if (allowedSyntaxes.find(sourceSyntax) != allowedSyntaxes.end())
     {
       // No transcoding should have happened
-      if (targetSopInstanceUid != sourceSopInstanceUid ||
-          hasSopInstanceUidChanged)
+      if (targetSopInstanceUid != sourceSopInstanceUid)
       {
         throw OrthancException(ErrorCode_InternalError);
       }