comparison OrthancFramework/UnitTestsSources/ImageProcessingTests.cpp @ 4056:55727d85f419 framework

fix for msvc2008
author s.jodogne@gmail.com
date Thu, 11 Jun 2020 13:46:57 +0200
parents 05b8fd21089c
children 0953b3dc3261
comparison
equal deleted inserted replaced
4055:9214e3a7b0a2 4056:55727d85f419
970 SetGrayscale8Pixel(image, 1, 0, 2); 970 SetGrayscale8Pixel(image, 1, 0, 2);
971 SetGrayscale8Pixel(image, 2, 0, 5); 971 SetGrayscale8Pixel(image, 2, 0, 5);
972 SetGrayscale8Pixel(image, 3, 0, 10); 972 SetGrayscale8Pixel(image, 3, 0, 10);
973 SetGrayscale8Pixel(image, 4, 0, 255); 973 SetGrayscale8Pixel(image, 4, 0, 255);
974 974
975 ImageProcessing::ShiftScale(image, -1.1, 1.5, true); 975 ImageProcessing::ShiftScale(image, -1.1f, 1.5f, true);
976 ASSERT_TRUE(TestGrayscale8Pixel(image, 0, 0, 0)); 976 ASSERT_TRUE(TestGrayscale8Pixel(image, 0, 0, 0));
977 ASSERT_TRUE(TestGrayscale8Pixel(image, 1, 0, 1)); 977 ASSERT_TRUE(TestGrayscale8Pixel(image, 1, 0, 1));
978 ASSERT_TRUE(TestGrayscale8Pixel(image, 2, 0, 6)); 978 ASSERT_TRUE(TestGrayscale8Pixel(image, 2, 0, 6));
979 ASSERT_TRUE(TestGrayscale8Pixel(image, 3, 0, 13)); 979 ASSERT_TRUE(TestGrayscale8Pixel(image, 3, 0, 13));
980 ASSERT_TRUE(TestGrayscale8Pixel(image, 4, 0, 255)); 980 ASSERT_TRUE(TestGrayscale8Pixel(image, 4, 0, 255));
988 SetGrayscale16Pixel(image, 1, 0, 2); 988 SetGrayscale16Pixel(image, 1, 0, 2);
989 SetGrayscale16Pixel(image, 2, 0, 5); 989 SetGrayscale16Pixel(image, 2, 0, 5);
990 SetGrayscale16Pixel(image, 3, 0, 10); 990 SetGrayscale16Pixel(image, 3, 0, 10);
991 SetGrayscale16Pixel(image, 4, 0, 255); 991 SetGrayscale16Pixel(image, 4, 0, 255);
992 992
993 ImageProcessing::ShiftScale(image, -1.1, 1.5, true); 993 ImageProcessing::ShiftScale(image, -1.1f, 1.5f, true);
994 ASSERT_TRUE(TestGrayscale16Pixel(image, 0, 0, 0)); 994 ASSERT_TRUE(TestGrayscale16Pixel(image, 0, 0, 0));
995 ASSERT_TRUE(TestGrayscale16Pixel(image, 1, 0, 1)); 995 ASSERT_TRUE(TestGrayscale16Pixel(image, 1, 0, 1));
996 ASSERT_TRUE(TestGrayscale16Pixel(image, 2, 0, 6)); 996 ASSERT_TRUE(TestGrayscale16Pixel(image, 2, 0, 6));
997 ASSERT_TRUE(TestGrayscale16Pixel(image, 3, 0, 13)); 997 ASSERT_TRUE(TestGrayscale16Pixel(image, 3, 0, 13));
998 ASSERT_TRUE(TestGrayscale16Pixel(image, 4, 0, 381)); 998 ASSERT_TRUE(TestGrayscale16Pixel(image, 4, 0, 381));
1006 SetSignedGrayscale16Pixel(image, 1, 0, 2); 1006 SetSignedGrayscale16Pixel(image, 1, 0, 2);
1007 SetSignedGrayscale16Pixel(image, 2, 0, 5); 1007 SetSignedGrayscale16Pixel(image, 2, 0, 5);
1008 SetSignedGrayscale16Pixel(image, 3, 0, 10); 1008 SetSignedGrayscale16Pixel(image, 3, 0, 10);
1009 SetSignedGrayscale16Pixel(image, 4, 0, 255); 1009 SetSignedGrayscale16Pixel(image, 4, 0, 255);
1010 1010
1011 ImageProcessing::ShiftScale(image, -17.1, 11.5, true); 1011 ImageProcessing::ShiftScale(image, -17.1f, 11.5f, true);
1012 ASSERT_TRUE(TestSignedGrayscale16Pixel(image, 0, 0, -197)); 1012 ASSERT_TRUE(TestSignedGrayscale16Pixel(image, 0, 0, -197));
1013 ASSERT_TRUE(TestSignedGrayscale16Pixel(image, 1, 0, -174)); 1013 ASSERT_TRUE(TestSignedGrayscale16Pixel(image, 1, 0, -174));
1014 ASSERT_TRUE(TestSignedGrayscale16Pixel(image, 2, 0, -139)); 1014 ASSERT_TRUE(TestSignedGrayscale16Pixel(image, 2, 0, -139));
1015 ASSERT_TRUE(TestSignedGrayscale16Pixel(image, 3, 0, -82)); 1015 ASSERT_TRUE(TestSignedGrayscale16Pixel(image, 3, 0, -82));
1016 ASSERT_TRUE(TestSignedGrayscale16Pixel(image, 4, 0, 2736)); 1016 ASSERT_TRUE(TestSignedGrayscale16Pixel(image, 4, 0, 2736));