Mercurial > hg > orthanc-stone

changeset 1192:91d86144fb79

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix build
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 27 Nov 2019 14:16:20 +0100
parents f417a0ae282b
children 681f339d6f85
files Framework/Radiography/RadiographySceneWriter.cpp Framework/Radiography/RadiographyTextLayer.h Framework/Toolbox/GenericToolbox.h
diffstat 3 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/Framework/Radiography/RadiographySceneWriter.cpp	Tue Nov 26 15:27:48 2019 +0100
+++ b/Framework/Radiography/RadiographySceneWriter.cpp	Wed Nov 27 14:16:20 2019 +0100
@@ -62,7 +62,7 @@
   {
     output["type"] = "text";
     output["text"] = layer.GetText();
-    output["fontSize"] = layer.GetFontSize();
+    output["fontSize"] = static_cast<unsigned int>(layer.GetFontSize());
     output["foreground"] = layer.GetForeground();
   }
 
--- a/Framework/Radiography/RadiographyTextLayer.h	Tue Nov 26 15:27:48 2019 +0100
+++ b/Framework/Radiography/RadiographyTextLayer.h	Wed Nov 27 14:16:20 2019 +0100
@@ -49,12 +49,12 @@
       return text_;
     }
 
-    const size_t& GetFontSize() const
+    size_t GetFontSize() const
     {
       return fontSize_;
     }
 
-    const size_t& GetForeground() const
+    uint8_t GetForeground() const
     {
       return foreground_;
     }
--- a/Framework/Toolbox/GenericToolbox.h	Tue Nov 26 15:27:48 2019 +0100
+++ b/Framework/Toolbox/GenericToolbox.h	Wed Nov 27 14:16:20 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)
         {