Mercurial > hg > orthanc

comparison OrthancFramework/Sources/DicomParsing/ParsedDicomFile.cpp @ 4781:235d3a9f8dec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 30 Aug 2021 18:16:53 +0200
parents 3b78ba359db3
children 7053502fbf97
comparison
equal deleted inserted replaced
4780:ebb801d44e06 4781:235d3a9f8dec
1859 } 1859 }
1860 else if (dataset.findAndGetString(DCM_RescaleIntercept, intercept).good() && 1860 else if (dataset.findAndGetString(DCM_RescaleIntercept, intercept).good() &&
1861 dataset.findAndGetString(DCM_RescaleSlope, slope).good() && 1861 dataset.findAndGetString(DCM_RescaleSlope, slope).good() &&
1862 intercept != NULL && 1862 intercept != NULL &&
1863 slope != NULL && 1863 slope != NULL &&
1864 SerializationToolbox::ParseFirstDouble(rescaleIntercept, intercept) && 1864 SerializationToolbox::ParseDouble(rescaleIntercept, intercept) &&
1865 SerializationToolbox::ParseFirstDouble(rescaleSlope, slope)) 1865 SerializationToolbox::ParseDouble(rescaleSlope, slope))
1866 { 1866 {
1867 return; // OK 1867 return; // OK
1868 } 1868 }
1869 else if (dataset.findAndGetSequenceItem(DCM_PerFrameFunctionalGroupsSequence, item1, frame).good() && 1869 else if (dataset.findAndGetSequenceItem(DCM_PerFrameFunctionalGroupsSequence, item1, frame).good() &&
1870 item1 != NULL && 1870 item1 != NULL &&
1872 item2 != NULL && 1872 item2 != NULL &&
1873 item2->findAndGetString(DCM_RescaleIntercept, intercept).good() && 1873 item2->findAndGetString(DCM_RescaleIntercept, intercept).good() &&
1874 item2->findAndGetString(DCM_RescaleSlope, slope).good() && 1874 item2->findAndGetString(DCM_RescaleSlope, slope).good() &&
1875 intercept != NULL && 1875 intercept != NULL &&
1876 slope != NULL && 1876 slope != NULL &&
1877 SerializationToolbox::ParseFirstDouble(rescaleIntercept, intercept) && 1877 SerializationToolbox::ParseDouble(rescaleIntercept, intercept) &&
1878 SerializationToolbox::ParseFirstDouble(rescaleSlope, slope)) 1878 SerializationToolbox::ParseDouble(rescaleSlope, slope))
1879 { 1879 {
1880 // New in Orthanc 1.9.7, to deal with Philips multiframe images 1880 // New in Orthanc 1.9.7, to deal with Philips multiframe images
1881 // (cf. private mail from Tomas Kenda on 2021-08-17) 1881 // (cf. private mail from Tomas Kenda on 2021-08-17)
1882 return; // OK 1882 return; // OK
1883 } 1883 }