comparison UnitTestsSources/ImageTests.cpp @ 2140:aa4b8895cd23

reorganization
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 09 Nov 2016 16:12:47 +0100
parents 88831c3edd8f
children 5a8840920121
comparison
equal deleted inserted replaced
2139:764c9157301b 2140:aa4b8895cd23
70 accessor.AssignReadOnly(Orthanc::PixelFormat_RGB24, width, height, pitch, &image[0]); 70 accessor.AssignReadOnly(Orthanc::PixelFormat_RGB24, width, height, pitch, &image[0]);
71 71
72 w.WriteToFile("UnitTestsResults/ColorPattern.png", accessor); 72 w.WriteToFile("UnitTestsResults/ColorPattern.png", accessor);
73 73
74 std::string f, md5; 74 std::string f, md5;
75 Orthanc::Toolbox::ReadFile(f, "UnitTestsResults/ColorPattern.png"); 75 Orthanc::SystemToolbox::ReadFile(f, "UnitTestsResults/ColorPattern.png");
76 Orthanc::Toolbox::ComputeMD5(md5, f); 76 Orthanc::Toolbox::ComputeMD5(md5, f);
77 ASSERT_EQ("604e785f53c99cae6ea4584870b2c41d", md5); 77 ASSERT_EQ("604e785f53c99cae6ea4584870b2c41d", md5);
78 } 78 }
79 79
80 TEST(PngWriter, Gray8Pattern) 80 TEST(PngWriter, Gray8Pattern)
98 accessor.AssignReadOnly(Orthanc::PixelFormat_Grayscale8, width, height, pitch, &image[0]); 98 accessor.AssignReadOnly(Orthanc::PixelFormat_Grayscale8, width, height, pitch, &image[0]);
99 99
100 w.WriteToFile("UnitTestsResults/Gray8Pattern.png", accessor); 100 w.WriteToFile("UnitTestsResults/Gray8Pattern.png", accessor);
101 101
102 std::string f, md5; 102 std::string f, md5;
103 Orthanc::Toolbox::ReadFile(f, "UnitTestsResults/Gray8Pattern.png"); 103 Orthanc::SystemToolbox::ReadFile(f, "UnitTestsResults/Gray8Pattern.png");
104 Orthanc::Toolbox::ComputeMD5(md5, f); 104 Orthanc::Toolbox::ComputeMD5(md5, f);
105 ASSERT_EQ("5a9b98bea3d0a6d983980cc38bfbcdb3", md5); 105 ASSERT_EQ("5a9b98bea3d0a6d983980cc38bfbcdb3", md5);
106 } 106 }
107 107
108 TEST(PngWriter, Gray16Pattern) 108 TEST(PngWriter, Gray16Pattern)
127 Orthanc::ImageAccessor accessor; 127 Orthanc::ImageAccessor accessor;
128 accessor.AssignReadOnly(Orthanc::PixelFormat_Grayscale16, width, height, pitch, &image[0]); 128 accessor.AssignReadOnly(Orthanc::PixelFormat_Grayscale16, width, height, pitch, &image[0]);
129 w.WriteToFile("UnitTestsResults/Gray16Pattern.png", accessor); 129 w.WriteToFile("UnitTestsResults/Gray16Pattern.png", accessor);
130 130
131 std::string f, md5; 131 std::string f, md5;
132 Orthanc::Toolbox::ReadFile(f, "UnitTestsResults/Gray16Pattern.png"); 132 Orthanc::SystemToolbox::ReadFile(f, "UnitTestsResults/Gray16Pattern.png");
133 Orthanc::Toolbox::ComputeMD5(md5, f); 133 Orthanc::Toolbox::ComputeMD5(md5, f);
134 ASSERT_EQ("0785866a08bf0a02d2eeff87f658571c", md5); 134 ASSERT_EQ("0785866a08bf0a02d2eeff87f658571c", md5);
135 } 135 }
136 136
137 TEST(PngWriter, EndToEnd) 137 TEST(PngWriter, EndToEnd)
178 } 178 }
179 } 179 }
180 } 180 }
181 181
182 { 182 {
183 Orthanc::Toolbox::TemporaryFile tmp; 183 Orthanc::TemporaryFile tmp;
184 Orthanc::Toolbox::WriteFile(s, tmp.GetPath()); 184 Orthanc::SystemToolbox::WriteFile(s, tmp.GetPath());
185 185
186 Orthanc::PngReader r2; 186 Orthanc::PngReader r2;
187 r2.ReadFromFile(tmp.GetPath()); 187 r2.ReadFromFile(tmp.GetPath());
188 188
189 ASSERT_EQ(r2.GetFormat(), Orthanc::PixelFormat_Grayscale16); 189 ASSERT_EQ(r2.GetFormat(), Orthanc::PixelFormat_Grayscale16);
223 223
224 Orthanc::JpegWriter w; 224 Orthanc::JpegWriter w;
225 w.WriteToFile("UnitTestsResults/hello.jpg", img); 225 w.WriteToFile("UnitTestsResults/hello.jpg", img);
226 226
227 w.WriteToMemory(s, img); 227 w.WriteToMemory(s, img);
228 Orthanc::Toolbox::WriteFile(s, "UnitTestsResults/hello2.jpg"); 228 Orthanc::SystemToolbox::WriteFile(s, "UnitTestsResults/hello2.jpg");
229 229
230 std::string t; 230 std::string t;
231 Orthanc::Toolbox::ReadFile(t, "UnitTestsResults/hello.jpg"); 231 Orthanc::SystemToolbox::ReadFile(t, "UnitTestsResults/hello.jpg");
232 ASSERT_EQ(s.size(), t.size()); 232 ASSERT_EQ(s.size(), t.size());
233 ASSERT_EQ(0, memcmp(s.c_str(), t.c_str(), s.size())); 233 ASSERT_EQ(0, memcmp(s.c_str(), t.c_str(), s.size()));
234 } 234 }
235 235
236 { 236 {