# HG changeset patch # User Sebastien Jodogne # Date 1460372835 -7200 # Node ID a1c1c606ce984e51938fe2e0c71510d8d7f82da6 # Parent 5e40f88f4eba4ff3088eec23401bb0c2f665c59d fix warnings diff -r 5e40f88f4eba -r a1c1c606ce98 UnitTestsSources/FromDcmtkTests.cpp --- a/UnitTestsSources/FromDcmtkTests.cpp Mon Apr 11 12:53:42 2016 +0200 +++ b/UnitTestsSources/FromDcmtkTests.cpp Mon Apr 11 13:07:15 2016 +0200 @@ -382,12 +382,12 @@ Json::Value b; FromDcmtkBridge::ToJson(b, *element, DicomToJsonFormat_Short, DicomToJsonFlags_Default, 0, Encoding_Ascii); ASSERT_EQ(Json::arrayValue, b["0008,1110"].type()); - ASSERT_EQ(2, b["0008,1110"].size()); + ASSERT_EQ(2u, b["0008,1110"].size()); Json::Value::ArrayIndex i = (b["0008,1110"][0]["0010,0010"].asString() == "Hello") ? 0 : 1; - ASSERT_EQ(3, b["0008,1110"][i].size()); - ASSERT_EQ(2, b["0008,1110"][1 - i].size()); + ASSERT_EQ(3u, b["0008,1110"][i].size()); + ASSERT_EQ(2u, b["0008,1110"][1 - i].size()); ASSERT_EQ(b["0008,1110"][i]["0010,0010"].asString(), "Hello"); ASSERT_EQ(b["0008,1110"][i]["0010,0020"].asString(), "World"); ASSERT_EQ(b["0008,1110"][i]["0008,1030"].asString(), "Toto"); diff -r 5e40f88f4eba -r a1c1c606ce98 UnitTestsSources/ImageTests.cpp --- a/UnitTestsSources/ImageTests.cpp Mon Apr 11 12:53:42 2016 +0200 +++ b/UnitTestsSources/ImageTests.cpp Mon Apr 11 13:07:15 2016 +0200 @@ -236,12 +236,12 @@ { Orthanc::JpegReader r1, r2; r1.ReadFromFile("UnitTestsResults/hello.jpg"); - ASSERT_EQ(16, r1.GetWidth()); - ASSERT_EQ(16, r1.GetHeight()); + ASSERT_EQ(16u, r1.GetWidth()); + ASSERT_EQ(16u, r1.GetHeight()); r2.ReadFromMemory(s); - ASSERT_EQ(16, r2.GetWidth()); - ASSERT_EQ(16, r2.GetHeight()); + ASSERT_EQ(16u, r2.GetWidth()); + ASSERT_EQ(16u, r2.GetHeight()); for (unsigned int y = 0; y < r1.GetHeight(); y++) { @@ -261,7 +261,7 @@ Orthanc::Image s(Orthanc::PixelFormat_RGB24, 640, 480); memset(s.GetBuffer(), 0, s.GetPitch() * s.GetHeight()); - ASSERT_GE(1, Orthanc::Configuration::GetFontRegistry().GetSize()); + ASSERT_GE(1u, Orthanc::Configuration::GetFontRegistry().GetSize()); Orthanc::Configuration::GetFontRegistry().GetFont(0).Draw(s, "Hello world É\n\rComment ça va ?\nq", 50, 60, 255, 0, 0); Orthanc::PngWriter w; diff -r 5e40f88f4eba -r a1c1c606ce98 UnitTestsSources/VersionsTests.cpp --- a/UnitTestsSources/VersionsTests.cpp Mon Apr 11 12:53:42 2016 +0200 +++ b/UnitTestsSources/VersionsTests.cpp Mon Apr 11 13:07:15 2016 +0200 @@ -113,7 +113,7 @@ TEST(Versions, PngStatic) { - ASSERT_EQ(10512, png_access_version_number()); + ASSERT_EQ(10512u, png_access_version_number()); ASSERT_STREQ("1.5.12", PNG_LIBPNG_VER_STRING); }