Mercurial > hg > orthanc-stone

changeset 1197:a34ba19d2060

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Alain Mazy <alain@mazy.be>
date Wed, 27 Nov 2019 17:56:48 +0100
parents a5f2a6b04a31 (current diff) a0731faeafd3 (diff)
children 922d2e61aa5d
files Applications/Samples/SingleFrameEditorApplication.h Framework/Radiography/RadiographySceneWriter.cpp
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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();
   }
 
--- 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)
         {