Mercurial > hg > orthanc

diff Core/DicomParsing/DcmtkTranscoder.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 31252a887f0b
line wrap: on
line diff
--- a/Core/DicomParsing/DcmtkTranscoder.cpp	Tue May 19 20:37:00 2020 +0200
+++ b/Core/DicomParsing/DcmtkTranscoder.cpp	Tue May 19 21:06:53 2020 +0200
@@ -80,8 +80,7 @@
   }
 
     
-  bool DcmtkTranscoder::InplaceTranscode(bool& hasSopInstanceUidChanged /* out */,
-                                         DicomTransferSyntax& selectedSyntax /* out */,
+  bool DcmtkTranscoder::InplaceTranscode(DicomTransferSyntax& selectedSyntax /* out */,
                                          DcmFileFormat& dicom,
                                          const std::set<DicomTransferSyntax>& allowedSyntaxes,
                                          bool allowNewSopInstanceUid) 
@@ -91,8 +90,6 @@
       throw OrthancException(ErrorCode_InternalError);
     }
 
-    hasSopInstanceUidChanged = false;
-
     DicomTransferSyntax syntax;
     if (!FromDcmtkBridge::LookupOrthancTransferSyntax(syntax, dicom))
     {
@@ -150,7 +147,6 @@
       if (FromDcmtkBridge::Transcode(dicom, DicomTransferSyntax_JPEGProcess1, &parameters))
       {
         selectedSyntax = DicomTransferSyntax_JPEGProcess1;
-        hasSopInstanceUidChanged = true;
         return true;
       }
     }
@@ -166,7 +162,6 @@
       if (FromDcmtkBridge::Transcode(dicom, DicomTransferSyntax_JPEGProcess2_4, &parameters))
       {
         selectedSyntax = DicomTransferSyntax_JPEGProcess2_4;
-        hasSopInstanceUidChanged = true;
         return true;
       }
     }
@@ -234,7 +229,6 @@
       if (FromDcmtkBridge::Transcode(dicom, DicomTransferSyntax_JPEGLSLossy, &parameters))
       {
         selectedSyntax = DicomTransferSyntax_JPEGLSLossy;
-        hasSopInstanceUidChanged = true;
         return true;
       }
     }
@@ -277,7 +271,6 @@
 
 
   bool DcmtkTranscoder::Transcode(DicomImage& target,
-                                  bool& hasSopInstanceUidChanged /* out */,
                                   DicomImage& source /* in, "GetParsed()" possibly modified */,
                                   const std::set<DicomTransferSyntax>& allowedSyntaxes,
                                   bool allowNewSopInstanceUid)
@@ -303,7 +296,7 @@
       target.AcquireBuffer(source);
       return true;
     }
-    else if (InplaceTranscode(hasSopInstanceUidChanged, targetSyntax, source.GetParsed(),
+    else if (InplaceTranscode(targetSyntax, source.GetParsed(),
                               allowedSyntaxes, allowNewSopInstanceUid))
     {   
       // Sanity check
@@ -317,7 +310,7 @@
         
 #if !defined(NDEBUG)
         // Only run the sanity check in debug mode
-        CheckTranscoding(target, hasSopInstanceUidChanged, sourceSyntax, sourceSopInstanceUid,
+        CheckTranscoding(target, sourceSyntax, sourceSopInstanceUid,
                          allowedSyntaxes, allowNewSopInstanceUid);
 #endif