comparison Framework/Fonts/GlyphTextureAlphabet.cpp @ 958:769249e1f3b4

added guards to prevent calling methods on a dead controller (see comment in diff for expl.) + build fix
author Benjamin Golinvaux <bgo@osimis.io>
date Fri, 23 Aug 2019 10:16:32 +0200
parents 9a474e90e832
children b9b5d4378874 2d8ab34c8c91
comparison
equal deleted inserted replaced
957:966c96b694f6 958:769249e1f3b4
26 26
27 #include <Core/Images/Image.h> 27 #include <Core/Images/Image.h>
28 #include <Core/Images/ImageProcessing.h> 28 #include <Core/Images/ImageProcessing.h>
29 #include <Core/OrthancException.h> 29 #include <Core/OrthancException.h>
30 30
31 #ifdef __EMSCRIPTEN__
32 /*
33 Avoid this error:
34 .../boost/math/special_functions/round.hpp:86:12: warning: implicit conversion from 'std::__2::numeric_limits<int>::type' (aka 'int') to 'float' changes value from 2147483647 to 2147483648 [-Wimplicit-int-float-conversion]
35 .../boost/math/special_functions/round.hpp:93:11: note: in instantiation of function template specialization 'boost::math::iround<float, boost::math::policies::policy<boost::math::policies::default_policy, boost::math::policies::default_policy, boost::math::policies::default_policy, boost::math::policies::default_policy, boost::math::policies::default_policy, boost::math::policies::default_policy, boost::math::policies::default_policy, boost::math::policies::default_policy, boost::math::policies::default_policy, boost::math::policies::default_policy, boost::math::policies::default_policy> >' requested here
36 .../orthanc-stone/Framework/Fonts/GlyphTextureAlphabet.cpp:92:28: note: in instantiation of function template specialization 'boost::math::iround<float>' requested here
37 */
38 #pragma GCC diagnostic ignored "-Wimplicit-int-float-conversion"
39 #endif
40
31 #include <boost/math/special_functions/round.hpp> 41 #include <boost/math/special_functions/round.hpp>
32
33 42
34 namespace OrthancStone 43 namespace OrthancStone
35 { 44 {
36 class GlyphTextureAlphabet::GlyphSizeVisitor : public GlyphAlphabet::IGlyphVisitor 45 class GlyphTextureAlphabet::GlyphSizeVisitor : public GlyphAlphabet::IGlyphVisitor
37 { 46 {