diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/imagefilters.cpp | 2 | ||||
| -rw-r--r-- | src/settings.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/client/imagefilters.cpp b/src/client/imagefilters.cpp index 9c7d0035e..97ad094e5 100644 --- a/src/client/imagefilters.cpp +++ b/src/client/imagefilters.cpp @@ -102,7 +102,7 @@ void imageCleanTransparent(video::IImage *src, u32 threshold) // Then repeatedly look for transparent pixels, filling them in until // we're finished. - for (u32 iter = 0; iter < iter_max; iter++) { + for (int iter = 0; iter < iter_max; iter++) { for (u32 ctry = 0; ctry < dim.Height; ctry++) for (u32 ctrx = 0; ctrx < dim.Width; ctrx++) { diff --git a/src/settings.cpp b/src/settings.cpp index ba4629a6f..4def46112 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -49,7 +49,7 @@ SettingsHierarchy::SettingsHierarchy(Settings *fallback) Settings *SettingsHierarchy::getLayer(int layer) const { - if (layer < 0 || layer >= layers.size()) + if (layer < 0 || layer >= (int)layers.size()) throw BaseException("Invalid settings layer"); return layers[layer]; } @@ -57,7 +57,7 @@ Settings *SettingsHierarchy::getLayer(int layer) const Settings *SettingsHierarchy::getParent(int layer) const { - assert(layer >= 0 && layer < layers.size()); + assert(layer >= 0 && layer < (int)layers.size()); // iterate towards the origin (0) to find the next fallback layer for (int i = layer - 1; i >= 0; --i) { if (layers[i]) @@ -72,8 +72,8 @@ void SettingsHierarchy::onLayerCreated(int layer, Settings *obj) { if (layer < 0) throw BaseException("Invalid settings layer"); - if (layers.size() < layer+1) - layers.resize(layer+1); + if ((int)layers.size() < layer + 1) + layers.resize(layer + 1); Settings *&pos = layers[layer]; if (pos) |