diff options
Diffstat (limited to 'org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/unpack')
-rw-r--r--[-rwxr-xr-x] | org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/unpack/ComprDataIO.java | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/unpack/Unpack.java | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/unpack/Unpack15.java | 36 | ||||
-rw-r--r--[-rwxr-xr-x] | org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/unpack/Unpack20.java | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/unpack/ppm/ModelPPM.java | 2 | ||||
-rw-r--r--[-rwxr-xr-x] | org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/unpack/ppm/RangeCoder.java | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/unpack/vm/RarVM.java | 6 |
7 files changed, 22 insertions, 22 deletions
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/unpack/ComprDataIO.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/unpack/ComprDataIO.java index 4e0d50f..4e0d50f 100755..100644 --- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/unpack/ComprDataIO.java +++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/unpack/ComprDataIO.java diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/unpack/Unpack.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/unpack/Unpack.java index 5cf3438..5cf3438 100755..100644 --- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/unpack/Unpack.java +++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/unpack/Unpack.java diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/unpack/Unpack15.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/unpack/Unpack15.java index 2a7695d..d9a0fbf 100755..100644 --- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/unpack/Unpack15.java +++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/unpack/Unpack15.java @@ -34,35 +34,35 @@ public abstract class Unpack15 extends BitInput { private static final int STARTHF2 = 5; private static final int STARTHF3 = 6; private static final int STARTHF4 = 8; - static int ShortLen1[] = {1, 3, 4, 4, 5, 6, 7, 8, 8, 4, 4, 5, 6, 6, 4, 0}; - static int ShortXor1[] = {0, 0xa0, 0xd0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, + static int[] ShortLen1 = {1, 3, 4, 4, 5, 6, 7, 8, 8, 4, 4, 5, 6, 6, 4, 0}; + static int[] ShortXor1 = {0, 0xa0, 0xd0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff, 0xc0, 0x80, 0x90, 0x98, 0x9c, 0xb0}; - static int ShortLen2[] = {2, 3, 3, 3, 4, 4, 5, 6, 6, 4, 4, 5, 6, 6, 4, 0}; - static int ShortXor2[] = {0, 0x40, 0x60, 0xa0, 0xd0, 0xe0, 0xf0, 0xf8, + static int[] ShortLen2 = {2, 3, 3, 3, 4, 4, 5, 6, 6, 4, 4, 5, 6, 6, 4, 0}; + static int[] ShortXor2 = {0, 0x40, 0x60, 0xa0, 0xd0, 0xe0, 0xf0, 0xf8, 0xfc, 0xc0, 0x80, 0x90, 0x98, 0x9c, 0xb0}; - private static int DecL1[] = {0x8000, 0xa000, 0xc000, 0xd000, 0xe000, + private static int[] DecL1 = {0x8000, 0xa000, 0xc000, 0xd000, 0xe000, 0xea00, 0xee00, 0xf000, 0xf200, 0xf200, 0xffff}; - private static int PosL1[] = {0, 0, 0, 2, 3, 5, 7, 11, 16, 20, 24, 32, 32}; - private static int DecL2[] = {0xa000, 0xc000, 0xd000, 0xe000, 0xea00, + private static int[] PosL1 = {0, 0, 0, 2, 3, 5, 7, 11, 16, 20, 24, 32, 32}; + private static int[] DecL2 = {0xa000, 0xc000, 0xd000, 0xe000, 0xea00, 0xee00, 0xf000, 0xf200, 0xf240, 0xffff}; - private static int PosL2[] = {0, 0, 0, 0, 5, 7, 9, 13, 18, 22, 26, 34, 36}; - private static int DecHf0[] = {0x8000, 0xc000, 0xe000, 0xf200, 0xf200, + private static int[] PosL2 = {0, 0, 0, 0, 5, 7, 9, 13, 18, 22, 26, 34, 36}; + private static int[] DecHf0 = {0x8000, 0xc000, 0xe000, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xffff}; - private static int PosHf0[] = {0, 0, 0, 0, 0, 8, 16, 24, 33, 33, 33, 33, + private static int[] PosHf0 = {0, 0, 0, 0, 0, 8, 16, 24, 33, 33, 33, 33, 33}; - private static int DecHf1[] = {0x2000, 0xc000, 0xe000, 0xf000, 0xf200, + private static int[] DecHf1 = {0x2000, 0xc000, 0xe000, 0xf000, 0xf200, 0xf200, 0xf7e0, 0xffff}; - private static int PosHf1[] = {0, 0, 0, 0, 0, 0, 4, 44, 60, 76, 80, 80, + private static int[] PosHf1 = {0, 0, 0, 0, 0, 0, 4, 44, 60, 76, 80, 80, 127}; - private static int DecHf2[] = {0x1000, 0x2400, 0x8000, 0xc000, 0xfa00, + private static int[] DecHf2 = {0x1000, 0x2400, 0x8000, 0xc000, 0xfa00, 0xffff, 0xffff, 0xffff}; - private static int PosHf2[] = {0, 0, 0, 0, 0, 0, 2, 7, 53, 117, 233, 0, 0}; - private static int DecHf3[] = {0x800, 0x2400, 0xee00, 0xfe80, 0xffff, + private static int[] PosHf2 = {0, 0, 0, 0, 0, 0, 2, 7, 53, 117, 233, 0, 0}; + private static int[] DecHf3 = {0x800, 0x2400, 0xee00, 0xfe80, 0xffff, 0xffff, 0xffff}; - private static int PosHf3[] = {0, 0, 0, 0, 0, 0, 0, 2, 16, 218, 251, 0, 0}; - private static int DecHf4[] = {0xff00, 0xffff, 0xffff, 0xffff, 0xffff, + private static int[] PosHf3 = {0, 0, 0, 0, 0, 0, 0, 2, 16, 218, 251, 0, 0}; + private static int[] DecHf4 = {0xff00, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff}; - private static int PosHf4[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 0, 0, 0}; + private static int[] PosHf4 = {0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 0, 0, 0}; protected int readBorder; protected boolean suspended; protected boolean unpAllBuf; diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/unpack/Unpack20.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/unpack/Unpack20.java index 971a437..971a437 100755..100644 --- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/unpack/Unpack20.java +++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/unpack/Unpack20.java diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/unpack/ppm/ModelPPM.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/unpack/ppm/ModelPPM.java index d627faf..6105320 100755..100644 --- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/unpack/ppm/ModelPPM.java +++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/unpack/ppm/ModelPPM.java @@ -38,7 +38,7 @@ public class ModelPPM { public static final int BIN_SCALE = 1 << TOT_BITS; public static final int MAX_FREQ = 124; - private static int InitBinEsc[] = {0x3CDD, 0x1F3F, 0x59BF, 0x48F3, + private static int[] InitBinEsc = {0x3CDD, 0x1F3F, 0x59BF, 0x48F3, 0x64A1, 0x5ABC, 0x6632, 0x6051}; // Temp fields private final State tempState1 = new State(null); diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/unpack/ppm/RangeCoder.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/unpack/ppm/RangeCoder.java index 57b0013..57b0013 100755..100644 --- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/unpack/ppm/RangeCoder.java +++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/unpack/ppm/RangeCoder.java diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/unpack/vm/RarVM.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/unpack/vm/RarVM.java index 56a3ccb..84bdb7b 100755..100644 --- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/unpack/vm/RarVM.java +++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/unpack/vm/RarVM.java @@ -888,7 +888,7 @@ public class RarVM extends BitInput { } private VMStandardFilters IsStandardFilter(byte[] code, int codeSize) { - VMStandardFilterSignature stdList[] = { + VMStandardFilterSignature[] stdList = { new VMStandardFilterSignature(53, 0xad576887, VMStandardFilters.VMSF_E8), new VMStandardFilterSignature(57, 0x3cd7e57e, VMStandardFilters.VMSF_E8E9), new VMStandardFilterSignature(120, 0x3769893f, VMStandardFilters.VMSF_ITANIUM), @@ -959,7 +959,7 @@ public class RarVM extends BitInput { break; } int curPos = 0; - final byte Masks[] = {4, 4, 6, 6, 0, 0, 7, 7, 4, 4, 0, 0, 4, 4, 0, 0}; + final byte[] Masks = {4, 4, 6, 6, 0, 0, 7, 7, 4, 4, 0, 0, 4, 4, 0, 0}; fileOffset >>>= 4; while (curPos < dataSize - 21) { @@ -1065,7 +1065,7 @@ public class RarVM extends BitInput { for (int curChannel = 0; curChannel < channels; curChannel++) { long prevByte = 0; long prevDelta = 0; - long Dif[] = new long[7]; + long[] Dif = new long[7]; int D1 = 0, D2 = 0, D3; int K1 = 0, K2 = 0, K3 = 0; |