diff options
-rw-r--r-- | detailview.c | 6 | ||||
-rw-r--r-- | geometrymanager.c | 2 | ||||
-rw-r--r-- | helpers.c | 2 | ||||
-rw-r--r-- | imagecache.c | 10 | ||||
-rw-r--r-- | imagemagickwrapper.c | 2 | ||||
-rw-r--r-- | textwindow.c | 2 |
6 files changed, 12 insertions, 12 deletions
diff --git a/detailview.c b/detailview.c index 6b7f266..d3f37c8 100644 --- a/detailview.c +++ b/detailview.c @@ -232,7 +232,7 @@ void cNopacityView::CreateFloatingTextWrapper(cTextWrapper *twNarrow, cTextWrapp std::stringstream sstrTextTall;
std::stringstream sstrTextFull;
- for (int i=0; i<flds.size(); i++) {
+ for (long unsigned int i = 0; i < flds.size(); i++) {
if (!flds[i].size()) {
//empty line
linesDrawn++;
@@ -306,7 +306,7 @@ void cNopacityView::DrawActors(std::vector<cActor> *actors) { int y = 2 * border + fontHeaderLarge->Height();
if (!Running())
return;
- cImageLoader imgLoader;
+ cImageLoader imgLoader;
int actor = 0;
for (int row = 0; row < picLines; row++) {
for (int col = 0; col < picsPerLine; col++) {
@@ -377,7 +377,7 @@ bool cNopacityView::KeyUp(void) { if (!scrollable)
return false;
int aktHeight = pixmapContent->DrawPort().Point().Y();
- int lineHeight = font->Height();
+// int lineHeight = font->Height();
if (aktHeight >= 0) {
return false;
}
diff --git a/geometrymanager.c b/geometrymanager.c index e24afe9..59fd242 100644 --- a/geometrymanager.c +++ b/geometrymanager.c @@ -122,7 +122,7 @@ void cGeometryManager::SetDisplayChannelSizes(void) { int logoWidthTotalPercent = 16; channelLogoWidthTotal = logoWidthTotalPercent * channelWidth /100; - int logoMaxWidth = logoMaxWidth = channelLogoWidthTotal - 10; + int logoMaxWidth = channelLogoWidthTotal - 10; int logoMaxHeight; if (config.GetValue("displayType") == dtGraphical) { logoMaxHeight = channelHeight - channelHeaderHeight - 2; @@ -144,7 +144,7 @@ std::vector<std::string>& splitstring::split(char delim, int rep) { if (!flds.empty()) flds.clear(); // empty vector if necessary std::string work = data(); std::string buf = ""; - int i = 0; + long unsigned int i = 0; while (i < work.length()) { if (work[i] != delim) buf += work[i]; diff --git a/imagecache.c b/imagecache.c index e7db262..f62873a 100644 --- a/imagecache.c +++ b/imagecache.c @@ -23,7 +23,7 @@ cImageCache::~cImageCache() { void cImageCache::CreateCache(void) { //Menu Icons std::vector<std::pair<std::string, cPoint> > menuIcons = GetMenuIcons(); - for (int i=0; i < menuIcons.size(); i++) { + for (long unsigned int i = 0; i < menuIcons.size(); i++) { std::string iconName = menuIcons[i].first; cPoint iconSize = menuIcons[i].second; bool success = LoadIcon(ctMenuIcon, iconName); @@ -32,7 +32,7 @@ void cImageCache::CreateCache(void) { } //Skin Icons std::vector<std::pair<std::string, sImgProperties> > skinIcons = GetSkinIcons(); - for (int i=0; i < skinIcons.size(); i++) { + for (long unsigned int i = 0; i < skinIcons.size(); i++) { std::string iconName = skinIcons[i].first; sImgProperties iconProps = skinIcons[i].second; bool success = LoadIcon(ctSkinIcon, iconName); @@ -144,7 +144,7 @@ cImage *cImageCache::GetLogo(eCacheType type, const cChannel *channel) { } else { bool success = LoadLogo(channel); if (success) { - if (config.GetValue("limitLogoCache") && (cache->size() >= config.GetValue("numLogosMax"))) { + if (config.GetValue("limitLogoCache") && (cache->size() >= (long unsigned int)config.GetValue("numLogosMax"))) { //logo cache is full, don't cache anymore cPoint logoSize = LogoSize(type); int width = logoSize.X(); @@ -239,7 +239,7 @@ std::vector<std::pair<std::string, cPoint> > cImageCache::GetMenuIcons(void) { mainMenuIcons.push_back("menuIcons/Plugins"); mainMenuIcons.push_back("menuIcons/Restart"); int mainMenuIconSize = geoManager->menuMainMenuIconSize; - for (int i=0; i<mainMenuIcons.size(); i++) { + for (long unsigned int i = 0; i < mainMenuIcons.size(); i++) { menuIcons.push_back(std::pair<std::string, cPoint>(mainMenuIcons[i], cPoint(mainMenuIconSize, mainMenuIconSize))); } @@ -284,7 +284,7 @@ std::vector<std::pair<std::string, sImgProperties> > cImageCache::GetSkinIcons(v props.width = geoManager->menuHeaderHeight-2; props.height = geoManager->menuHeaderHeight-2; props.preserveAspect = true; - for (int i=0; i<menuHeaderIcons.size(); i++) { + for (long unsigned int i = 0; i < menuHeaderIcons.size(); i++) { skinIcons.push_back(std::pair<std::string, sImgProperties>(menuHeaderIcons[i], props)); } diff --git a/imagemagickwrapper.c b/imagemagickwrapper.c index 49fa221..782a9a9 100644 --- a/imagemagickwrapper.c +++ b/imagemagickwrapper.c @@ -140,7 +140,7 @@ void cImageMagickWrapper::CreateGradient(tColor back, tColor blend, int width, i for (int x = 0; x < width; x++) { for (int y = 0; y < height; y++) { PixelPacket *pixel = pixels + y * width + x; - int opacity = (maxw / width * x + maxh - maxh / height * y) / 2; + long unsigned int opacity = (maxw / width * x + maxh - maxh / height * y) / 2; pixel->opacity = (opacity <= MaxRGB) ? opacity : MaxRGB; } } diff --git a/textwindow.c b/textwindow.c index efe5dcd..16327ea 100644 --- a/textwindow.c +++ b/textwindow.c @@ -341,7 +341,7 @@ void cNopacityTextWindow::DrawTextWrapperFloat(const char *text, int widthSmall, int y = top; int linesDrawn = 0; bool drawNarrow = true; - for (int i=0; i<flds.size(); i++) { + for (long unsigned int i = 0; i < flds.size(); i++) { if (!flds[i].size()) { //empty line linesDrawn++; |