frodovdr/vdr-plugin-skindesigner
1
0
Fork 0
mirror of https://projects.vdr-developer.org/git/vdr-plugin-skindesigner.git synced 2023-10-19 17:58:31 +02:00
Code Issues Releases Wiki Activity

Fix Fehler: Aufruf des überladenen »min(int&, int&)« ist nicht eindeutig

Browse Source
This commit is contained in:
kamel5 2021-05-15 14:45:39 +02:00
parent a7fc762b3d
commit 9b63e8327f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
coreengine/functions.c
View File

@ -1332,7 +1332,7 @@ int cFuncLoop::FuncWidth(void) {
eOverflowType overflow = (eOverflowType)GetValue((int)eLoopAttribs::overflow); eOverflowType overflow = (eOverflowType)GetValue((int)eLoopAttribs::overflow);
if (overflow == eOverflowType::cut) { if (overflow == eOverflowType::cut) {
int maxItems = GetValue((int)eLoopAttribs::maxitems); int maxItems = GetValue((int)eLoopAttribs::maxitems);
numLoops = min(numLoops, maxItems); numLoops = std::min(numLoops, maxItems);
} }
if (numLoops > 0) if (numLoops > 0)
return numLoops * columnWidth; return numLoops * columnWidth;
@ -1357,7 +1357,7 @@ int cFuncLoop::FuncHeight(void) {
eOverflowType overflow = (eOverflowType)GetValue((int)eLoopAttribs::overflow); eOverflowType overflow = (eOverflowType)GetValue((int)eLoopAttribs::overflow);
if (overflow == eOverflowType::cut) { if (overflow == eOverflowType::cut) {
int maxItems = GetValue((int)eLoopAttribs::maxitems); int maxItems = GetValue((int)eLoopAttribs::maxitems);
numLoops = min(numLoops, maxItems); numLoops = std::min(numLoops, maxItems);
} else if (overflow == eOverflowType::wrap) { } else if (overflow == eOverflowType::wrap) {
int loopWidth = Width(); int loopWidth = Width();
if (loopWidth <= 0) if (loopWidth <= 0)

2
coreengine/viewelementsdisplaymenu.c
View File

@ -970,7 +970,7 @@ bool cVeDmLastrecordings::Parse(bool forced) {
int MAX_RECORDINGS = 10; int MAX_RECORDINGS = 10;
int availableRecordings = orderedRecs.size(); int availableRecordings = orderedRecs.size();
int numRecordings = min(MAX_RECORDINGS, availableRecordings); int numRecordings = std::min(MAX_RECORDINGS, availableRecordings);
if (!numRecordings) if (!numRecordings)
return true; return true;