diff options
| author | Christian Hesse <mail@eworm.de> | 2019-08-06 11:58:30 (GMT) |
|---|---|---|
| committer | Christian Hesse <mail@eworm.de> | 2019-08-06 12:03:30 (GMT) |
| commit | 53fa0d6aaca3eb8a1fe8011e0e3d53cb85e1a772 (patch) | |
| tree | dad4d7fd38ece2dab8bee57e09c75c2111981310 | |
| parent | 02cc0c6fc1d02fa6daa72056d36021eedc33ffac (diff) | |
| download | fluxbox-53fa0d6aaca3eb8a1fe8011e0e3d53cb85e1a772.zip fluxbox-53fa0d6aaca3eb8a1fe8011e0e3d53cb85e1a772.tar.bz2 | |
explicitly expect unsigned int
This fixes:
src/FbTk/XftFontImp.cc: In member function ‘virtual bool FbTk::XftFontImp::load(const string&)’:
src/FbTk/XftFontImp.cc:81:53: error: no matching function for call to ‘max(unsigned int, int)’
| -rw-r--r-- | src/FbTk/XftFontImp.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/FbTk/XftFontImp.cc b/src/FbTk/XftFontImp.cc index 9c09a5c..7f1fb62 100644 --- a/src/FbTk/XftFontImp.cc +++ b/src/FbTk/XftFontImp.cc | |||
| @@ -78,7 +78,7 @@ bool XftFontImp::load(const std::string &name) { | |||
| 78 | // overflow'). to prevent something like this we detect the maximium | 78 | // overflow'). to prevent something like this we detect the maximium |
| 79 | // number of glyphs by calculating the amount of 'WW' (pretending a 'wide' | 79 | // number of glyphs by calculating the amount of 'WW' (pretending a 'wide' |
| 80 | // glyph) fitting into 32k pixels | 80 | // glyph) fitting into 32k pixels |
| 81 | unsigned int tw = std::max(textWidth("WW", 2), 1); | 81 | unsigned int tw = std::max<unsigned int>(textWidth("WW", 2), 1); |
| 82 | m_maxlength = 0x8000 / tw; | 82 | m_maxlength = 0x8000 / tw; |
| 83 | 83 | ||
| 84 | return true; | 84 | return true; |