In t1.c, small change to avoid calling twice t1_getwmsedec()

Patch from Callum Lewick. Basic gcc optimization flags in cmake and makefile match.
This commit is contained in:
Francois-Olivier Devaux
2007-11-08 14:26:03 +00:00
parent b93c12564d
commit c38de0728d
4 changed files with 13 additions and 3 deletions

View File

@@ -809,6 +809,7 @@ static void t1_encode_cblk(
int nmsedec = 0;
double cumwmsedec = 0.0;
char type = T1_TYPE_MQ;
double tempwmsedec;
opj_mqc_t *mqc = t1->mqc; /* MQC component */
@@ -851,8 +852,9 @@ static void t1_encode_cblk(
}
/* fixed_quality */
cumwmsedec += t1_getwmsedec(nmsedec, compno, level, orient, bpno, qmfbid, stepsize, numcomps);
tile->distotile += t1_getwmsedec(nmsedec, compno, level, orient, bpno, qmfbid, stepsize, numcomps);
tempwmsedec = t1_getwmsedec(nmsedec, compno, level, orient, bpno, qmfbid, stepsize, numcomps);
cumwmsedec += tempwmsedec;
tile->distotile += tempwmsedec;
/* Code switch "RESTART" (i.e. TERMALL) */
if ((cblksty & J2K_CCP_CBLKSTY_TERMALL) && !((passtype == 2) && (bpno - 1 < 0))) {