# HG changeset patch # User Sebastien Jodogne # Date 1625500258 -7200 # Node ID bf852fd773b72d881a61a82291e5392cddf6da47 # Parent e17fdc43ef6ce18d99913e97ffdf88f077c3ef1c fix unit test FromDcmtkBridge.VisitorRemoveTag on DCMTK 3.6.6 diff -r e17fdc43ef6c -r bf852fd773b7 OrthancFramework/UnitTestsSources/FromDcmtkTests.cpp --- a/OrthancFramework/UnitTestsSources/FromDcmtkTests.cpp Mon Jul 05 17:03:46 2021 +0200 +++ b/OrthancFramework/UnitTestsSources/FromDcmtkTests.cpp Mon Jul 05 17:50:58 2021 +0200 @@ -61,7 +61,7 @@ #include #include #include -#include +#include #include #include @@ -2927,25 +2927,24 @@ dicom->GetDcmtkObject().getDataset()->insert(s.release()); } + DcmItem *parent = NULL; + ASSERT_TRUE(dicom->GetDcmtkObject().getDataset()->findAndGetSequenceItem(DCM_ReferencedImageSequence, parent, 0).good()); + { const float a[] = { 42, 43, 47 }; std::unique_ptr s(new DcmFloatingPointSingle(DCM_ExaminedBodyThickness)); // VisitDoubles() ASSERT_TRUE(s->putFloat32Array(a, 3).good()); - DcmItem *item = NULL; - ASSERT_TRUE(dicom->GetDcmtkObject().getDataset()->findAndGetSequenceItem(DCM_ReferencedImageSequence, item, 0).good()); - item->insert(s.release()); + parent->insert(s.release()); } { const uint16_t a[] = { 0x0008, 0x0020, 0x0008, 0x0030 }; std::unique_ptr s(new DcmAttributeTag(DCM_DimensionIndexPointer)); // VisitAttributes() ASSERT_TRUE(s->putUint16Array(a, 2).good()); - DcmItem *item = NULL; - ASSERT_TRUE(dicom->GetDcmtkObject().getDataset()->findAndGetSequenceItem(DCM_ReferencedImageSequence, item, 0).good()); - item->insert(s.release()); + parent->insert(s.release()); } - - ASSERT_TRUE(dicom->GetDcmtkObject().getDataset()->insert(new DcmByteString(DCM_PixelData)).good()); // VisitNotSupported() + + ASSERT_TRUE(dicom->GetDcmtkObject().getDataset()->insert(new DcmPixelItem(DCM_PixelData)).good()); // VisitNotSupported() } {