mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-02 01:30:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix compiler warnings

Browse Source
This commit is contained in:
Emil Axelsson
2018-08-31 14:30:35 +02:00
parent 9f1c4e847d
commit 518b43db02
10 changed files with 11 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/rendering/transferfunction.cpp
View File

@@ -189,7 +189,7 @@ void TransferFunction::setTextureFromTxt(std::shared_ptr<ghoul::opengl::Texture>
const float dist = fpos - prevKey->position;
const float weight = dist / (currentKey->position - prevKey->position);
for (size_t channel = 0; channel < 4; ++channel) {
for (int channel = 0; channel < 4; ++channel) {
const size_t position = 4 * i + channel;
// Interpolate linearly between prev and next mapping key
float value = (prevKey->color[channel] * (1.f - weight) +
@@ -229,14 +229,11 @@ glm::vec4 TransferFunction::sample(size_t offset) {
const int nPixels = _texture->width();
// Clamp to range.
if (offset >= nPixels) {
if (offset >= static_cast<size_t>(nPixels)) {
offset = nPixels - 1;
}
if (offset < 0) {
offset = 0;
}
return _texture->texelAsFloat(offset);
return _texture->texelAsFloat(static_cast<unsigned int>(offset));
}
size_t TransferFunction::width() {