Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use haxe.ds.Vector instead of Array in haxe.zip.Huffman #8495

Closed
wants to merge 1 commit into from
Closed

use haxe.ds.Vector instead of Array in haxe.zip.Huffman #8495

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions std/haxe/zip/Huffman.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,12 @@
*/
package haxe.zip;

import haxe.ds.Vector;

enum Huffman {
Found( i : Int );
NeedBit( left : Huffman, right : Huffman );
NeedBits( n : Int, table : Array<Huffman> );
NeedBits( n : Int, table : Vector<Huffman> );
}

class HuffTools {
Expand Down Expand Up @@ -53,14 +55,14 @@ class HuffTools {
default: throw "assert";
}
var size = 1 << d;
var table = new Array();
var table = new Vector(size);
for( i in 0...size )
table.push(Found(-1));
table[i] = Found(-1);
treeWalk(table,0,0,d,t);
return NeedBits(d,table);
}

function treeWalk(table,p,cd,d,t) {
function treeWalk(table:Vector<Huffman>,p,cd,d,t) {
switch( t ) {
case NeedBit(a,b):
if( d > 0 ) {
Expand All @@ -84,12 +86,12 @@ class HuffTools {
}

public function make(lengths,pos,nlengths,maxbits) {
var counts = new Array();
var tmp = new Array();
if( maxbits > 32 ) throw "Invalid huffman";
var counts = new Vector(maxbits);
var tmp = new Vector(maxbits);
for( i in 0...maxbits ) {
counts.push(0);
tmp.push(0);
counts[i] = 0;
tmp[i] = 0;
}
for( i in 0...nlengths ) {
var p = lengths[i+pos];
Expand Down