Mercurial > hg > orthanc-stone

diff Framework/Fonts/GlyphTextureAlphabet.cpp @ 699:5c551f078c18 refactor-viewport-controller

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from default
author Benjamin Golinvaux <bgo@osimis.io>
date Fri, 17 May 2019 09:20:46 +0200
parents 9a474e90e832
children 769249e1f3b4
line wrap: on
line diff
--- a/Framework/Fonts/GlyphTextureAlphabet.cpp	Wed May 15 16:56:17 2019 +0200
+++ b/Framework/Fonts/GlyphTextureAlphabet.cpp	Fri May 17 09:20:46 2019 +0200
@@ -89,7 +89,7 @@
       column_(0),
       row_(0)
     {
-      int c = boost::math::iround<int>(sqrt(static_cast<float>(countGlyphs)));
+      int c = boost::math::iround<float>(sqrt(static_cast<float>(countGlyphs)));
 
       if (c <= 0)
       {
@@ -239,9 +239,9 @@
     sourceAlphabet.GetAlphabet().Apply(size);
 
     TextureGenerator generator(alphabet_,
-                               sourceAlphabet.GetAlphabet().GetSize(),
-                               size.GetMaxWidth(),
-                               size.GetMaxHeight());
+      static_cast<unsigned int>(sourceAlphabet.GetAlphabet().GetSize()),
+      size.GetMaxWidth(),
+      size.GetMaxHeight());
     sourceAlphabet.GetAlphabet().Apply(generator);
 
     texture_.reset(generator.ReleaseTexture());