# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1574860757 -3600
# Node ID 681f339d6f8561e14af7bf9de46c8f69cc7fcc75
# Parent  91d86144fb79a6c6e941072f8d65ca954feda600# Parent  c6a36ecd641da60b5a2c95cc90bd0012a84b5ed2
merge

diff -r c6a36ecd641d -r 681f339d6f85 Framework/Radiography/RadiographySceneWriter.cpp
--- a/Framework/Radiography/RadiographySceneWriter.cpp	Tue Nov 26 16:32:29 2019 +0100
+++ b/Framework/Radiography/RadiographySceneWriter.cpp	Wed Nov 27 14:19:17 2019 +0100
@@ -62,7 +62,7 @@
   {
     output["type"] = "text";
     output["text"] = layer.GetText();
-    output["fontSize"] = static_cast<uint32_t>(layer.GetFontSize());
+    output["fontSize"] = static_cast<unsigned int>(layer.GetFontSize());
     output["foreground"] = layer.GetForeground();
   }
 
diff -r c6a36ecd641d -r 681f339d6f85 Framework/Toolbox/GenericToolbox.h
--- a/Framework/Toolbox/GenericToolbox.h	Tue Nov 26 16:32:29 2019 +0100
+++ b/Framework/Toolbox/GenericToolbox.h	Wed Nov 27 14:19:17 2019 +0100
@@ -136,7 +136,7 @@
       if (*p == '.')
       {
         double f = 0.0;
-        int n = 1;
+        size_t n = 1;
         ++p;
         while (*p >= '0' && *p <= '9' && n < FRAC_FACTORS_LEN)
         {