Mercurial > hg > orthanc
diff UnitTestsSources/FromDcmtkTests.cpp @ 3951:5fe8c6d3212e transcoding
removed useless information "hasSopInstanceUidChanged"
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 19 May 2020 21:06:53 +0200 |
parents | ef696db8426f |
children | bd0af2e11325 |
line wrap: on
line diff
--- a/UnitTestsSources/FromDcmtkTests.cpp Tue May 19 20:37:00 2020 +0200 +++ b/UnitTestsSources/FromDcmtkTests.cpp Tue May 19 21:06:53 2020 +0200 @@ -1980,6 +1980,8 @@ Orthanc::SystemToolbox::ReadFile(source, "/home/jodogne/Subversion/orthanc-tests/Database/KarstenHilbertRF.dcm"); std::unique_ptr<DcmFileFormat> toto(FromDcmtkBridge::LoadFromMemoryBuffer(source.c_str(), source.size())); + const std::string sourceUid = IDicomTranscoder::GetSopInstanceUid(*toto); + DicomTransferSyntax sourceSyntax; ASSERT_TRUE(FromDcmtkBridge::LookupOrthancTransferSyntax(sourceSyntax, *toto)); @@ -1994,12 +1996,10 @@ std::string t; - bool hasSopInstanceUidChanged; - IDicomTranscoder::DicomImage source, target; source.AcquireParsed(dynamic_cast<DcmFileFormat*>(toto->clone())); - if (!transcoder.Transcode(target, hasSopInstanceUidChanged, source, s, true)) + if (!transcoder.Transcode(target, source, s, true)) { printf("**************** CANNOT: [%s] => [%s]\n", GetTransferSyntaxUid(sourceSyntax), GetTransferSyntaxUid(a)); @@ -2015,13 +2015,13 @@ a == DicomTransferSyntax_JPEGLSLossy); printf("SIZE: %lu\n", t.size()); - if (hasSopInstanceUidChanged) + if (sourceUid == IDicomTranscoder::GetSopInstanceUid(target.GetParsed())) { - ASSERT_TRUE(lossy); + ASSERT_FALSE(lossy); } else { - ASSERT_FALSE(lossy); + ASSERT_TRUE(lossy); } } }