# HG changeset patch
# User Alain Mazy <alain@mazy.be>
# Date 1574873808 -3600
# Node ID a34ba19d2060382ab47db0df860ebf62b8c8f7b5
# Parent  a5f2a6b04a31eac2ddc92a8eb61b0bad50d0a17b# Parent  a0731faeafd372e48821c85009ef64f2ffe862bf
merge

diff -r a5f2a6b04a31 -r a34ba19d2060 Applications/Samples/SingleFrameEditorApplication.h
diff -r a5f2a6b04a31 -r a34ba19d2060 Framework/Radiography/RadiographySceneWriter.cpp
--- a/Framework/Radiography/RadiographySceneWriter.cpp	Wed Nov 27 17:51:33 2019 +0100
+++ b/Framework/Radiography/RadiographySceneWriter.cpp	Wed Nov 27 17:56:48 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 a5f2a6b04a31 -r a34ba19d2060 Framework/Toolbox/GenericToolbox.h
--- a/Framework/Toolbox/GenericToolbox.h	Wed Nov 27 17:51:33 2019 +0100
+++ b/Framework/Toolbox/GenericToolbox.h	Wed Nov 27 17:56:48 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)
         {