diff options
| -rw-r--r-- | lib/base/ebase.cpp | 2 | ||||
| -rw-r--r-- | lib/base/estring.cpp | 2 | ||||
| -rw-r--r-- | lib/gdi/region.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/base/ebase.cpp b/lib/base/ebase.cpp index c84f28b8..700cce36 100644 --- a/lib/base/ebase.cpp +++ b/lib/base/ebase.cpp @@ -165,7 +165,7 @@ void eMainloop::removeSocketNotifier(eSocketNotifier *sn) return; } for (i = notifiers.begin(); i != notifiers.end(); ++i) - eDebug("fd=%d, sn=%d", i->second->getFD(), (void*)i->second); + eDebug("fd=%d, sn=%p", i->second->getFD(), (void*)i->second); eFatal("removed socket notifier which is not present, fd=%d", fd); } diff --git a/lib/base/estring.cpp b/lib/base/estring.cpp index e7dc2bec..f2ac7325 100644 --- a/lib/base/estring.cpp +++ b/lib/base/estring.cpp @@ -424,7 +424,7 @@ std::string convertDVBUTF8(const unsigned char *data, int len, int table, int ts break; } - bool useTwoCharMapping = !table || tsidonid && encodingHandler.getTransponderUseTwoCharMapping(tsidonid); + bool useTwoCharMapping = !table || (tsidonid && encodingHandler.getTransponderUseTwoCharMapping(tsidonid)); if (useTwoCharMapping && table == 5) { // i hope this dont break other transponders which realy use ISO8859-5 and two char byte mapping... // eDebug("Cyfra / Cyfrowy Polsat HACK... override given ISO8859-5 with ISO6397"); diff --git a/lib/gdi/region.cpp b/lib/gdi/region.cpp index 1208c97e..73d9ac2d 100644 --- a/lib/gdi/region.cpp +++ b/lib/gdi/region.cpp @@ -428,7 +428,7 @@ void gRegion::moveBy(ePoint offset) void gRegion::scale(int x_n, int x_d, int y_n, int y_d) { - int i; + unsigned int i; for (i=0; i<rects.size(); ++i) rects[i].scale(x_n, x_d, y_n, y_d); } |