Mercurial > hg > orthanc

comparison Core/DicomParsing/ParsedDicomFile.cpp @ 3948:3d2fc1b5cc8c transcoding

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ResourceModificationJob: Fix the SOP instance UID to preserve references
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 19 May 2020 17:23:30 +0200
parents aae045f802f4
children 884b55ce01f6
comparison
equal deleted inserted replaced
3947:cf6eb4fc6841 3948:3d2fc1b5cc8c
1653 } 1653 }
1654 1654
1655 1655
1656 bool ParsedDicomFile::LookupTransferSyntax(std::string& result) 1656 bool ParsedDicomFile::LookupTransferSyntax(std::string& result)
1657 { 1657 {
1658 #if 0
1659 // This was the implementation in Orthanc <= 1.6.1
1660
1658 // TODO - Shouldn't "dataset.getCurrentXfer()" be used instead of 1661 // TODO - Shouldn't "dataset.getCurrentXfer()" be used instead of
1659 // using the meta header? 1662 // using the meta header?
1660 const char* value = NULL; 1663 const char* value = NULL;
1661 1664
1662 if (GetDcmtkObject().getMetaInfo() != NULL && 1665 if (GetDcmtkObject().getMetaInfo() != NULL &&
1668 } 1671 }
1669 else 1672 else
1670 { 1673 {
1671 return false; 1674 return false;
1672 } 1675 }
1676 #else
1677 DicomTransferSyntax s;
1678 if (FromDcmtkBridge::LookupOrthancTransferSyntax(s, GetDcmtkObject()))
1679 {
1680 result.assign(GetTransferSyntaxUid(s));
1681 return true;
1682 }
1683 else
1684 {
1685 return false;
1686 }
1687 #endif
1673 } 1688 }
1674 1689
1675 1690
1676 bool ParsedDicomFile::LookupPhotometricInterpretation(PhotometricInterpretation& result) const 1691 bool ParsedDicomFile::LookupPhotometricInterpretation(PhotometricInterpretation& result) const
1677 { 1692 {