fix size_t issues and other 64bit-highlighted warnings
simonb simonb
4 files changed,
9 insertions(+),
3 deletions(-)
M
src/FbTk/Font.cc
→
src/FbTk/Font.cc
@@ -250,7 +250,7 @@ #endif // HAVE_ICONV
} #ifdef DEBUG - cerr<<"FbTk::Font m_iconv = "<<(int)m_iconv<<endl; + cerr<<"FbTk::Font m_iconv = "<<m_iconv<<endl; #endif // DEBUG if (name != 0) {
M
src/FbTk/Text.cc
→
src/FbTk/Text.cc
@@ -32,7 +32,7 @@ namespace FbTk {
int doAlignment(int max_width, int bevel, FbTk::Justify justify, const FbTk::Font &font, const char * const text, - unsigned int textlen, unsigned int &newlen) { + size_t textlen, size_t &newlen) { if (text == 0 || textlen == 0) return 0;
M
src/FbTk/Text.hh
→
src/FbTk/Text.hh
@@ -24,6 +24,8 @@
#ifndef FBTK_TEXT_HH #define FBTK_TEXT_HH +#include <sys/types.h> + namespace FbTk { class Font;@@ -37,7 +39,7 @@ Aligns the text after max width and bevel
*/ int doAlignment(int max_width, int bevel, FbTk::Justify justify, const FbTk::Font &font, const char * const text, - unsigned int textlen, unsigned int &newlen); + size_t textlen, size_t &newlen); /** There are 3 interesting translations: