diff options
| author | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-10-05 09:10:15 +0000 |
|---|---|---|
| committer | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-10-05 09:10:15 +0000 |
| commit | 4b140e060bf1a5cd1cc048014bc9e512930e2a8d (patch) | |
| tree | baea5014da506bb54fb54645bf4f3feb7aa73a60 /src/lib/openjp2/mct.c | |
| parent | 1fefa033296ef0c3eb7e4146b280fef79c488faa (diff) | |
[trunk] rename int.h to opj_intmath.h and rename all its functions with opj_ prefix
Diffstat (limited to 'src/lib/openjp2/mct.c')
| -rw-r--r-- | src/lib/openjp2/mct.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/openjp2/mct.c b/src/lib/openjp2/mct.c index 75066c9f..59664241 100644 --- a/src/lib/openjp2/mct.c +++ b/src/lib/openjp2/mct.c @@ -122,9 +122,9 @@ void opj_mct_encode_real( OPJ_INT32 r = c0[i]; OPJ_INT32 g = c1[i]; OPJ_INT32 b = c2[i]; - OPJ_INT32 y = fix_mul(r, 2449) + fix_mul(g, 4809) + fix_mul(b, 934); - OPJ_INT32 u = -fix_mul(r, 1382) - fix_mul(g, 2714) + fix_mul(b, 4096); - OPJ_INT32 v = fix_mul(r, 4096) - fix_mul(g, 3430) - fix_mul(b, 666); + OPJ_INT32 y = opj_int_fix_mul(r, 2449) + opj_int_fix_mul(g, 4809) + opj_int_fix_mul(b, 934); + OPJ_INT32 u = -opj_int_fix_mul(r, 1382) - opj_int_fix_mul(g, 2714) + opj_int_fix_mul(b, 4096); + OPJ_INT32 v = opj_int_fix_mul(r, 4096) - opj_int_fix_mul(g, 3430) - opj_int_fix_mul(b, 666); c0[i] = y; c1[i] = u; c2[i] = v; @@ -238,7 +238,7 @@ opj_bool opj_mct_encode_custom( for (j=0;j<pNbComp;++j) { *(lData[j]) = 0; for (k=0;k<pNbComp;++k) { - *(lData[j]) += fix_mul(*lMctPtr, lCurrentData[k]); + *(lData[j]) += opj_int_fix_mul(*lMctPtr, lCurrentData[k]); ++lMctPtr; } |