public/rtphone
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- fixed few warnings

Browse Source
This commit is contained in:
Dmytro Bogovych
2018-06-07 10:53:13 +03:00
parent 5fb8f87b11
commit b6a8312c7b
6 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/engine/audio/Audio_Null.cpp
View File

@@ -47,7 +47,7 @@ void NullTimer::run()
// Sleep for mInterval - mTail milliseconds
std::this_thread::sleep_for(std::chrono::microseconds(mInterval * 1000 - mTail));
mTail += std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::system_clock::now() - timestamp).count();
mTail += (int)std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::system_clock::now() - timestamp).count();
}
}

4
src/engine/helper/HL_String.cpp
View File

@@ -71,7 +71,7 @@ uint64_t StringHelper::toUint64(const char* s, uint64_t def, bool *isOk)
{
uint64_t result = def;
#if defined(TARGET_WIN)
if (sscanf(s, "%d", &result) != 1)
if (sscanf(s, "%I64d", &result) != 1)
#else
if (sscanf(s, "%llu", &result) != 1)
#endif
@@ -290,7 +290,7 @@ static int hex2code(char s)
static int hex2code(const char* s)
{
return hex2code(s[0]) << 4 + hex2code(s[1]);
return (hex2code(s[0]) << 4) + hex2code(s[1]);
}
std::string StringHelper::fromHex2String(const std::string& s)

2
src/engine/helper/HL_VariantMap.cpp
View File

@@ -208,6 +208,8 @@ bool Variant::operator == (const Variant& rhs) const
default:
return false;
}
return false;
}
bool Variant::operator != (const Variant& rhs) const

10
src/engine/media/MT_SevanaMos.cpp
View File

@@ -528,9 +528,9 @@ std::string SevanaPVQA::mosToColor(float mos)
float mosFraction = (mos - 1.0f) / 4.0f;
end.mBlue += (start.mBlue - end.mBlue) * mosFraction;
end.mGreen += (start.mGreen - end.mGreen) * mosFraction;
end.mRed += (start.mRed - end.mRed) * mosFraction;
end.mBlue += (uint8_t)((start.mBlue - end.mBlue) * mosFraction);
end.mGreen += (uint8_t)((start.mGreen - end.mGreen) * mosFraction);
end.mRed += (uint8_t)((start.mRed - end.mRed) * mosFraction);
return end.toHex();
}
@@ -866,7 +866,7 @@ SevanaAqua::PFaultsReport SevanaAqua::loadFaultsReport(std::istream& input)
if (parts.size() >= 3)
{
if (parts.back() == "ms.")
result->mSignalAdvancedInMilliseconds = std::atof(parts[parts.size() - 2].c_str());
result->mSignalAdvancedInMilliseconds = (float)std::atof(parts[parts.size() - 2].c_str());
}
}
else
@@ -879,7 +879,7 @@ SevanaAqua::PFaultsReport SevanaAqua::loadFaultsReport(std::istream& input)
if (parts.size() >= 3)
{
if (parts.back() == "percent.")
result->mMistimingInPercents = std::atof(parts[parts.size() - 2].c_str());
result->mMistimingInPercents = (float)std::atof(parts[parts.size() - 2].c_str());
}
}
}