Commit 874a06bd authored by Michael Niedermayer's avatar Michael Niedermayer

j2k: cosmetics from jpeg2000

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 6e16321d
This diff is collapsed.
...@@ -96,11 +96,11 @@ static int getsigctxno(int flag, int bandno) ...@@ -96,11 +96,11 @@ static int getsigctxno(int flag, int bandno)
((flag & JPEG2000_T1_SIG_SE) ? 1 : 0) + ((flag & JPEG2000_T1_SIG_SE) ? 1 : 0) +
((flag & JPEG2000_T1_SIG_SW) ? 1 : 0); ((flag & JPEG2000_T1_SIG_SW) ? 1 : 0);
if (bandno < 3){ if (bandno < 3) {
if (bandno == 1) if (bandno == 1)
FFSWAP(int, h, v); FFSWAP(int, h, v);
if (h == 2) return 8; if (h == 2) return 8;
if (h == 1){ if (h == 1) {
if (v >= 1) return 7; if (v >= 1) return 7;
if (d >= 1) return 6; if (d >= 1) return 6;
return 5; return 5;
...@@ -111,11 +111,11 @@ static int getsigctxno(int flag, int bandno) ...@@ -111,11 +111,11 @@ static int getsigctxno(int flag, int bandno)
if (d == 1) return 1; if (d == 1) return 1;
} else{ } else{
if (d >= 3) return 8; if (d >= 3) return 8;
if (d == 2){ if (d == 2) {
if (h+v >= 1) return 7; if (h+v >= 1) return 7;
return 6; return 6;
} }
if (d == 1){ if (d == 1) {
if (h+v >= 2) return 5; if (h+v >= 2) return 5;
if (h+v == 1) return 4; if (h+v == 1) return 4;
return 3; return 3;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment