Mercurial > hg > orthanc

changeset 1970:a1c1c606ce98

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix warnings
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 11 Apr 2016 13:07:15 +0200
parents 5e40f88f4eba
children 869a87c08673
files UnitTestsSources/FromDcmtkTests.cpp UnitTestsSources/ImageTests.cpp UnitTestsSources/VersionsTests.cpp
diffstat 3 files changed, 9 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- 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");
--- 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;
--- 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);
 }