diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-09-01 21:52:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-01 21:52:55 +0200 |
| commit | dac150108ab3c1f41d5fd86cc6853f883064caaf (patch) | |
| tree | 09195c9dd5e0d651e96b7d26f26985ab5ff6f871 /modules/etc/image_etc.cpp | |
| parent | 69ac4cbb3764a454194e27a7afe71d98af65c32c (diff) | |
| parent | f9467ec1ea6c0dac2ea513b7dfe58d0349788e02 (diff) | |
Merge pull request #10846 from hpvb/fix-sign-compare
Fix signed and unsigned comparisons
Diffstat (limited to 'modules/etc/image_etc.cpp')
| -rw-r--r-- | modules/etc/image_etc.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/etc/image_etc.cpp b/modules/etc/image_etc.cpp index 9a15beb6eb..e86fd06d81 100644 --- a/modules/etc/image_etc.cpp +++ b/modules/etc/image_etc.cpp @@ -117,7 +117,7 @@ static void _compress_etc(Image *p_img, float p_lossy_quality, bool force_etc1_f return; } - int imgw = p_img->get_width(), imgh = p_img->get_height(); + uint32_t imgw = p_img->get_width(), imgh = p_img->get_height(); ERR_FAIL_COND(next_power_of_2(imgw) != imgw || next_power_of_2(imgh) != imgh); Image::Format etc_format = force_etc1_format ? Image::FORMAT_ETC : _get_etc2_mode(detected_channels); |