comparison UnitTestsSources/FromDcmtkTests.cpp @ 2140:aa4b8895cd23

reorganization
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 09 Nov 2016 16:12:47 +0100
parents 9329ba17a069
children 5a8840920121
comparison
equal deleted inserted replaced
2139:764c9157301b 2140:aa4b8895cd23
855 f.SaveToFile(PATH); 855 f.SaveToFile(PATH);
856 } 856 }
857 857
858 { 858 {
859 std::string s; 859 std::string s;
860 Orthanc::Toolbox::ReadFile(s, PATH); 860 Orthanc::SystemToolbox::ReadFile(s, PATH);
861 Orthanc::ParsedDicomFile f(s); 861 Orthanc::ParsedDicomFile f(s);
862 862
863 std::auto_ptr<Orthanc::ImageAccessor> decoded(Orthanc::DicomImageDecoder::Decode(f, 0)); 863 std::auto_ptr<Orthanc::ImageAccessor> decoded(Orthanc::DicomImageDecoder::Decode(f, 0));
864 ASSERT_EQ(256u, decoded->GetWidth()); 864 ASSERT_EQ(256u, decoded->GetWidth());
865 ASSERT_EQ(256u, decoded->GetHeight()); 865 ASSERT_EQ(256u, decoded->GetHeight());
917 f.SaveToFile(PATH); 917 f.SaveToFile(PATH);
918 } 918 }
919 919
920 { 920 {
921 std::string s; 921 std::string s;
922 Orthanc::Toolbox::ReadFile(s, PATH); 922 Orthanc::SystemToolbox::ReadFile(s, PATH);
923 Orthanc::ParsedDicomFile f(s); 923 Orthanc::ParsedDicomFile f(s);
924 924
925 std::auto_ptr<Orthanc::ImageAccessor> decoded(Orthanc::DicomImageDecoder::Decode(f, 0)); 925 std::auto_ptr<Orthanc::ImageAccessor> decoded(Orthanc::DicomImageDecoder::Decode(f, 0));
926 ASSERT_EQ(384u, decoded->GetWidth()); 926 ASSERT_EQ(384u, decoded->GetWidth());
927 ASSERT_EQ(256u, decoded->GetHeight()); 927 ASSERT_EQ(256u, decoded->GetHeight());
971 f.SaveToFile(PATH); 971 f.SaveToFile(PATH);
972 } 972 }
973 973
974 { 974 {
975 std::string s; 975 std::string s;
976 Orthanc::Toolbox::ReadFile(s, PATH); 976 Orthanc::SystemToolbox::ReadFile(s, PATH);
977 Orthanc::ParsedDicomFile f(s); 977 Orthanc::ParsedDicomFile f(s);
978 978
979 std::auto_ptr<Orthanc::ImageAccessor> decoded(Orthanc::DicomImageDecoder::Decode(f, 0)); 979 std::auto_ptr<Orthanc::ImageAccessor> decoded(Orthanc::DicomImageDecoder::Decode(f, 0));
980 ASSERT_EQ(256u, decoded->GetWidth()); 980 ASSERT_EQ(256u, decoded->GetWidth());
981 ASSERT_EQ(256u, decoded->GetHeight()); 981 ASSERT_EQ(256u, decoded->GetHeight());
1025 f.SaveToFile(PATH); 1025 f.SaveToFile(PATH);
1026 } 1026 }
1027 1027
1028 { 1028 {
1029 std::string s; 1029 std::string s;
1030 Orthanc::Toolbox::ReadFile(s, PATH); 1030 Orthanc::SystemToolbox::ReadFile(s, PATH);
1031 Orthanc::ParsedDicomFile f(s); 1031 Orthanc::ParsedDicomFile f(s);
1032 1032
1033 std::auto_ptr<Orthanc::ImageAccessor> decoded(Orthanc::DicomImageDecoder::Decode(f, 0)); 1033 std::auto_ptr<Orthanc::ImageAccessor> decoded(Orthanc::DicomImageDecoder::Decode(f, 0));
1034 ASSERT_EQ(256u, decoded->GetWidth()); 1034 ASSERT_EQ(256u, decoded->GetWidth());
1035 ASSERT_EQ(256u, decoded->GetHeight()); 1035 ASSERT_EQ(256u, decoded->GetHeight());