fix warning in Clang 10

pull/24664/head
Tomoaki Teshima 11 months ago
parent a2edf4d929
commit 2146bbb7bd
  1. 4
      3rdparty/carotene/src/div.cpp
  2. 2
      3rdparty/openexr/IlmImf/ImfConvert.cpp
  3. 2
      3rdparty/openjpeg/openjp2/j2k.c
  4. 2
      3rdparty/openjpeg/openjp2/tcd.c

@ -157,8 +157,8 @@ void div(const Size2D &size,
if (scale == 0.0f ||
(std::numeric_limits<T>::is_integer &&
(scale * std::numeric_limits<T>::max()) < 1.0f &&
(scale * std::numeric_limits<T>::max()) > -1.0f))
(scale * static_cast<float>(std::numeric_limits<T>::max())) < 1.0f &&
(scale * static_cast<float>(std::numeric_limits<T>::max())) > -1.0f))
{
for (size_t y = 0; y < size.height; ++y)
{

@ -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;

@ -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);

@ -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;

Loading…
Cancel
Save