# HG changeset patch # User Sebastien Jodogne # Date 1550518941 -3600 # Node ID 6f9398eb902dc43851a648331d7c3a6ae2786f59 # Parent 6f652c7bfc85b042b27d96b77cdf99fabf8098fc unit test Toolbox.SubstituteVariables diff -r 6f652c7bfc85 -r 6f9398eb902d Core/Images/ImageProcessing.cpp --- a/Core/Images/ImageProcessing.cpp Mon Feb 18 18:43:40 2019 +0100 +++ b/Core/Images/ImageProcessing.cpp Mon Feb 18 20:42:21 2019 +0100 @@ -1422,7 +1422,7 @@ nodes = 0; j = static_cast(cpSize) - 1; - for (i = 0; i < cpSize; i++) + for (i = 0; i < static_cast(cpSize); i++) { if ((cpy[i] < y && cpy[j] >= y) || (cpy[j] < y && cpy[i] >= y)) { diff -r 6f652c7bfc85 -r 6f9398eb902d UnitTestsSources/UnitTestsMain.cpp --- a/UnitTestsSources/UnitTestsMain.cpp Mon Feb 18 18:43:40 2019 +0100 +++ b/UnitTestsSources/UnitTestsMain.cpp Mon Feb 18 20:42:21 2019 +0100 @@ -1235,9 +1235,11 @@ // The "PATH" environment variable should always be available on // machines running the unit tests - ASSERT_TRUE(env.find("PATH") != env.end()); + ASSERT_TRUE(env.find("PATH") != env.end() /* Case used by UNIX */ || + env.find("Path") != env.end() /* Case used by Windows */); - ASSERT_EQ("A" + env["PATH"] + "B", + env["PATH"] = "hello"; + ASSERT_EQ("AhelloB", Toolbox::SubstituteVariables("A${PATH}B", env)); }