diff options
| -rw-r--r-- | detailview.c | 4 | ||||
| -rw-r--r-- | displaychannel.c | 2 | ||||
| -rw-r--r-- | displaychannelview.c | 2 | ||||
| -rw-r--r-- | geometrymanager.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/detailview.c b/detailview.c index ad230b5..6b7f266 100644 --- a/detailview.c +++ b/detailview.c @@ -92,7 +92,7 @@ void cNopacityView::DrawHeader(void) { if (channel) {
cImage *logo = imgCache->GetLogo(ctLogo, channel);
if (logo) {
- pixmapHeaderLogo->DrawImage(cPoint(border, max((headerHeight - geoManager->channelLogoHeight - border)/2, 0)), *logo);
+ pixmapHeaderLogo->DrawImage(cPoint(border, std::max((headerHeight - geoManager->channelLogoHeight - border)/2, 0)), *logo);
xText += logoWidth + border;
}
}
@@ -191,7 +191,7 @@ void cNopacityView::DrawFloatingContent(std::string *infoText, cTvMedia *img, cT int textLinesFull = wTextFull.Lines();
int textHeight = lineHeight * (textLinesTall + textLinesFull) + 2*border;
int yText = border;
- CreateContent(max(textHeight, imgHeight + 2*border));
+ CreateContent(std::max(textHeight, imgHeight + 2*border));
for (int i=0; i < textLinesTall; i++) {
pixmapContent->DrawText(cPoint(border, yText), wTextTall.GetLine(i), Theme.Color(clrMenuFontDetailViewText), clrTransparent, font);
yText += lineHeight;
diff --git a/displaychannel.c b/displaychannel.c index ac9e179..a30e7fb 100644 --- a/displaychannel.c +++ b/displaychannel.c @@ -183,7 +183,7 @@ void cNopacityDisplayChannel::Action(void) { while (Running()) { uint64_t Now = cTimeMs::Now(); cPixmap::Lock(); - double t = min(double(Now - Start) / FadeTime, 1.0); + double t = std::min(double(Now - Start) / FadeTime, 1.0); int Alpha = t * ALPHA_OPAQUE; channelView->SetAlpha(Alpha); cPixmap::Unlock(); diff --git a/displaychannelview.c b/displaychannelview.c index c4e8ddc..a910491 100644 --- a/displaychannelview.c +++ b/displaychannelview.c @@ -627,7 +627,7 @@ void cNopacityDisplayChannelView::DrawSignalMeter(void) { signalHeight = imgSignal->Height(); int signalMeterY = geoManager->channelFooterY + (geoManager->channelFooterHeight - 2*signalHeight - 5)/2; - int labelWidth = max(fontInfoline->Width(*signalStrength), + int labelWidth = std::max(fontInfoline->Width(*signalStrength), fontInfoline->Width(*signalQuality)) + 2; signalX = geoManager->channelFooterHeight / 2 + labelWidth; pixmapSignalStrength = osd->CreatePixmap(3, diff --git a/geometrymanager.c b/geometrymanager.c index 0c0b938..e24afe9 100644 --- a/geometrymanager.c +++ b/geometrymanager.c @@ -200,7 +200,7 @@ void cGeometryManager::SetDisplayReplaySizes(void) { replayJumpHeight = replayControlsHeight; replayIconBorder = 5; - replayIconSize = min(replayControlsHeight - 2*replayIconBorder, 128); + replayIconSize = std::min(replayControlsHeight - 2*replayIconBorder, 128); replayMessageY = replayHeight - replayFooterHeight; replayMessageWidth = replayWidth * 75 / 100; |