Pierre Gruet pushed to branch master at Debian Med / sight
Commits: 8c8222af by Pierre Gruet at 2021-12-15T22:56:55+01:00 Calling OFListIterator(T) instead of OFIterator<T> - - - - - ec31a945 by Pierre Gruet at 2021-12-15T23:07:14+01:00 Forwarding latest patch - - - - - 983e0455 by Pierre Gruet at 2021-12-16T07:52:13+01:00 Upload to unstable - - - - - 3 changed files: - debian/changelog - + debian/patches/call_OFListIterator_instead_of_OFIterator.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +sight (21.0.0-3) unstable; urgency=medium + + * Team upload + * Calling OFListIterator(T) instead of OFIterator<T> (Closes: #1001681) + + -- Pierre Gruet <[email protected]> Wed, 15 Dec 2021 23:03:15 +0100 + sight (21.0.0-2) unstable; urgency=medium * d/p/: Add patch to remove a service that does not build on i386 ===================================== debian/patches/call_OFListIterator_instead_of_OFIterator.patch ===================================== @@ -0,0 +1,40 @@ +Description: calling OFListIterator instead of OFIterator + This is explained in the header file + /usr/include/dcmtk/ofstd/oflist.h + shipped by libdcmtk-dev. +Author: Pierre Gruet <[email protected]> +Bug-Debian: https://bugs.debian.org/1001681 +Forwarded: https://github.com/IRCAD/sight/issues/6 +Last-Update: 2021-12-14 + +--- a/libs/io/dimse/SeriesEnquirer.cpp ++++ b/libs/io/dimse/SeriesEnquirer.cpp +@@ -745,7 +745,7 @@ + dataset.putAndInsertOFStringArray(DCM_InstanceNumber, ss.str().c_str()); + + OFList<QRResponse*> responses = this->sendFindRequest(dataset); +- OFIterator<QRResponse*> it = responses.begin(); ++ OFListIterator(QRResponse*) it = responses.begin(); + std::string sopInstanceUID = ""; + if(it != responses.end() && (*it)->m_dataset) + { +--- a/libs/io/dimse/helper/Series.cpp ++++ b/libs/io/dimse/helper/Series.cpp +@@ -58,7 +58,7 @@ + { + DicomSeriesContainer seriesContainer; + +- OFIterator<QRResponse*> it; ++ OFListIterator(QRResponse*) it; + OFCondition result; + + // Every while loop run will get all image for a specific study +@@ -219,7 +219,7 @@ + { + InstanceUIDContainer instanceUIDContainer; + +- OFIterator<QRResponse*> it; ++ OFListIterator(QRResponse*) it; + DcmDataset dataset; + OFCondition result; + // Every while loop run will get all image for a specific study ===================================== debian/patches/series ===================================== @@ -2,3 +2,4 @@ skip-samples-build.patch add_missing_includes.patch fix-dynamic-load.patch fix-itk-build.patch +call_OFListIterator_instead_of_OFIterator.patch View it on GitLab: https://salsa.debian.org/med-team/sight/-/compare/1ab3e149712826e4384906292c655e89aef389fc...983e045542cabf2de43cff9b9008f80dd7487866 -- View it on GitLab: https://salsa.debian.org/med-team/sight/-/compare/1ab3e149712826e4384906292c655e89aef389fc...983e045542cabf2de43cff9b9008f80dd7487866 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
