dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

12 bytes saved, bunch to go

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1279 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
justin1014 2002-10-02 17:54:57 +00:00
parent e3712215a9
commit 0f2389e486
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Source/zlib/INFTREES.C
View file

@ -139,25 +139,23 @@ uInt *hn) /* working area: values in order of bit length */
a = c[k]; a = c[k];
while (a--) while (a--)
{ {
int nextw=w;
/* here i is the Huffman code of length k bits for value *p */ /* here i is the Huffman code of length k bits for value *p */
/* make tables up to required level */ /* make tables up to required level */
while (k > w + l) while (k > (nextw=w + l))
{ {
h++; h++;
w += l; /* previous table always l bits */
/* compute minimum size table less than or equal to l bits */ /* compute minimum size table less than or equal to l bits */
z = g - w; z = g - nextw;
z = z > (uInt)l ? l : z; /* table size upper limit */ z = z > (uInt)l ? l : z; /* table size upper limit */
if ((f = 1 << (j = k - w)) > a + 1) /* try a k-w bit table */ if ((f = 1 << (j = k - nextw)) > a + 1) /* try a k-w bit table */
{ /* too few codes for k-w bit table */ { /* too few codes for k-w bit table */
f -= a + 1; /* deduct codes from patterns left */ f -= a + 1; /* deduct codes from patterns left */
xp = c + k; xp = c + k;
if (j < z) if (j < z)
while (++j < z) /* try smaller tables up to z bits */ while (++j < z && (f <<= 1) > *++xp) /* try smaller tables up to z bits */
{ {
if ((f <<= 1) <= *++xp)
break; /* enough codes to use up j bits */
f -= *xp; /* else deduct codes from patterns */ f -= *xp; /* else deduct codes from patterns */
} }
} }
@ -175,12 +173,13 @@ uInt *hn) /* working area: values in order of bit length */
x[h] = i; /* save pattern for backing up */ x[h] = i; /* save pattern for backing up */
r.bits = (Byte)l; /* bits to dump before this table */ r.bits = (Byte)l; /* bits to dump before this table */
r.exop = (Byte)j; /* bits in this table */ r.exop = (Byte)j; /* bits in this table */
j = i >> (w - l); j = i >> w;
r.base = (uInt)(q - u[h-1] - j); /* offset to this table */ r.base = (uInt)(q - u[h-1] - j); /* offset to this table */
u[h-1][j] = r; /* connect to last table */ u[h-1][j] = r; /* connect to last table */
} }
else else
*t = q; /* first table is returned result */ *t = q; /* first table is returned result */
w=nextw; /* previous table always l bits */
} }
/* set up table entry in r */ /* set up table entry in r */