From 2146bbb7bd21d6f1d4cd9c1c9d3171a4ab18e229 Mon Sep 17 00:00:00 2001 From: Tomoaki Teshima Date: Thu, 7 Dec 2023 21:35:44 +0900 Subject: [PATCH] fix warning in Clang 10 --- 3rdparty/carotene/src/div.cpp | 4 ++-- 3rdparty/openexr/IlmImf/ImfConvert.cpp | 2 +- 3rdparty/openjpeg/openjp2/j2k.c | 2 +- 3rdparty/openjpeg/openjp2/tcd.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/3rdparty/carotene/src/div.cpp b/3rdparty/carotene/src/div.cpp index 38892acab3..6a65ad3ce0 100644 --- a/3rdparty/carotene/src/div.cpp +++ b/3rdparty/carotene/src/div.cpp @@ -157,8 +157,8 @@ void div(const Size2D &size, if (scale == 0.0f || (std::numeric_limits::is_integer && - (scale * std::numeric_limits::max()) < 1.0f && - (scale * std::numeric_limits::max()) > -1.0f)) + (scale * static_cast(std::numeric_limits::max())) < 1.0f && + (scale * static_cast(std::numeric_limits::max())) > -1.0f)) { for (size_t y = 0; y < size.height; ++y) { diff --git a/3rdparty/openexr/IlmImf/ImfConvert.cpp b/3rdparty/openexr/IlmImf/ImfConvert.cpp index cce7163c19..62c0305935 100644 --- a/3rdparty/openexr/IlmImf/ImfConvert.cpp +++ b/3rdparty/openexr/IlmImf/ImfConvert.cpp @@ -107,7 +107,7 @@ floatToUint (float f) if (isNegative (f) || isNan (f)) return 0; - if (isInfinity (f) || f > UINT_MAX) + if (isInfinity (f) || f > (float)UINT_MAX) return UINT_MAX; return (unsigned int) f; diff --git a/3rdparty/openjpeg/openjp2/j2k.c b/3rdparty/openjpeg/openjp2/j2k.c index bcce316568..d3b2258dfc 100644 --- a/3rdparty/openjpeg/openjp2/j2k.c +++ b/3rdparty/openjpeg/openjp2/j2k.c @@ -7796,7 +7796,7 @@ OPJ_BOOL opj_j2k_setup_encoder(opj_j2k_t *p_j2k, image->comps[0].h * image->comps[0].prec) / ((double)parameters->tcp_rates[parameters->tcp_numlayers - 1] * 8 * image->comps[0].dx * image->comps[0].dy)); - if (temp_size > INT_MAX) { + if (temp_size > (OPJ_FLOAT32)INT_MAX) { parameters->max_cs_size = INT_MAX; } else { parameters->max_cs_size = (int) floor(temp_size); diff --git a/3rdparty/openjpeg/openjp2/tcd.c b/3rdparty/openjpeg/openjp2/tcd.c index 6442669d60..8f0aac0aa0 100644 --- a/3rdparty/openjpeg/openjp2/tcd.c +++ b/3rdparty/openjpeg/openjp2/tcd.c @@ -2262,7 +2262,7 @@ static OPJ_BOOL opj_tcd_dc_level_shift_decode(opj_tcd_t *p_tcd) for (j = 0; j < l_height; ++j) { for (i = 0; i < l_width; ++i) { OPJ_FLOAT32 l_value = *((OPJ_FLOAT32 *) l_current_ptr); - if (l_value > INT_MAX) { + if (l_value > (OPJ_FLOAT32)INT_MAX) { *l_current_ptr = l_max; } else if (l_value < INT_MIN) { *l_current_ptr = l_min;