Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix implicit floating bool conversion #752

Merged
merged 4 commits into from
Apr 28, 2016
Merged

Fix implicit floating bool conversion #752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
01d3c4d
Fix implicit conversion turns floating-point number into boolean: 'do…
julienmalik Apr 25, 2016
4dc50f5
Fix warning : implicit conversion turns floating-point number into bo…
julienmalik Apr 25, 2016
7fbf188
Fix warning : implicit conversion turns floating-point number into bo…
julienmalik Apr 25, 2016
e2d399f
Compare floats to floats
julienmalik Apr 25, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/bin/jp2/index.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ int write_index_file(opj_codestream_info_t *cstr_info, char *index) {
return 1;
}

if (cstr_info->tile[0].distotile)
if (cstr_info->tile[0].distotile > 0.0)
disto_on = 1;
else
disto_on = 0;
Expand Down
22 changes: 11 additions & 11 deletions src/lib/openjp2/j2k.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4706,7 +4706,7 @@ static OPJ_BOOL opj_j2k_update_rates( opj_j2k_t *p_j2k,
l_rates = l_tcp->rates;

/* Modification of the RATE >> */
if (*l_rates) {
if (*l_rates > 0.0f) {
*l_rates = (( (OPJ_FLOAT32) (l_size_pixel * (OPJ_UINT32)(l_x1 - l_x0) * (OPJ_UINT32)(l_y1 - l_y0)))
/
((*l_rates) * (OPJ_FLOAT32)l_bits_empty)
Expand All @@ -4718,7 +4718,7 @@ static OPJ_BOOL opj_j2k_update_rates( opj_j2k_t *p_j2k,
++l_rates;

for (k = 1; k < l_tcp->numlayers; ++k) {
if (*l_rates) {
if (*l_rates > 0.0f) {
*l_rates = (( (OPJ_FLOAT32) (l_size_pixel * (OPJ_UINT32)(l_x1 - l_x0) * (OPJ_UINT32)(l_y1 - l_y0)))
/
((*l_rates) * (OPJ_FLOAT32)l_bits_empty)
Expand All @@ -4741,11 +4741,11 @@ static OPJ_BOOL opj_j2k_update_rates( opj_j2k_t *p_j2k,
for (j=0;j<l_cp->tw;++j) {
l_rates = l_tcp->rates;

if (*l_rates) {
if (*l_rates > 0.0f) {
*l_rates -= l_sot_remove;

if (*l_rates < 30) {
*l_rates = 30;
if (*l_rates < 30.0f) {
*l_rates = 30.0f;
}
}

Expand All @@ -4755,22 +4755,22 @@ static OPJ_BOOL opj_j2k_update_rates( opj_j2k_t *p_j2k,

for (k = 1; k < l_last_res; ++k) {

if (*l_rates) {
if (*l_rates > 0.0f) {
*l_rates -= l_sot_remove;

if (*l_rates < *(l_rates - 1) + 10) {
*l_rates = (*(l_rates - 1)) + 20;
if (*l_rates < *(l_rates - 1) + 10.0f) {
*l_rates = (*(l_rates - 1)) + 20.0f;
}
}

++l_rates;
}

if (*l_rates) {
if (*l_rates > 0.0f) {
*l_rates -= (l_sot_remove + 2.f);

if (*l_rates < *(l_rates - 1) + 10) {
*l_rates = (*(l_rates - 1)) + 20;
if (*l_rates < *(l_rates - 1) + 10.0f) {
*l_rates = (*(l_rates - 1)) + 20.0f;
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/lib/openjp2/tcd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,7 @@ OPJ_BOOL opj_tcd_rateallocate( opj_tcd_t *tcd,
OPJ_FLOAT64 lo = min;
OPJ_FLOAT64 hi = max;
OPJ_BOOL success = OPJ_FALSE;
OPJ_UINT32 maxlen = tcd_tcp->rates[layno] ? opj_uint_min(((OPJ_UINT32) ceil(tcd_tcp->rates[layno])), len) : len;
OPJ_UINT32 maxlen = tcd_tcp->rates[layno] > 0.0f ? opj_uint_min(((OPJ_UINT32) ceil(tcd_tcp->rates[layno])), len) : len;
OPJ_FLOAT64 goodthresh = 0;
OPJ_FLOAT64 stable_thresh = 0;
OPJ_UINT32 i;
Expand All @@ -500,7 +500,7 @@ OPJ_BOOL opj_tcd_rateallocate( opj_tcd_t *tcd,
-r xx,yy,zz,0 (disto_alloc == 1 and rates == 0)
-q xx,yy,zz,0 (fixed_quality == 1 and distoratio == 0)
==> possible to have some lossy layers and the last layer for sure lossless */
if ( ((cp->m_specific_param.m_enc.m_disto_alloc==1) && (tcd_tcp->rates[layno]>0)) || ((cp->m_specific_param.m_enc.m_fixed_quality==1) && (tcd_tcp->distoratio[layno]>0))) {
if ( ((cp->m_specific_param.m_enc.m_disto_alloc==1) && (tcd_tcp->rates[layno]>0.0f)) || ((cp->m_specific_param.m_enc.m_fixed_quality==1) && (tcd_tcp->distoratio[layno]>0.0))) {
opj_t2_t*t2 = opj_t2_create(tcd->image, cp);
OPJ_FLOAT64 thresh = 0;

Expand Down