From: Ricardo Markiewicz <gazer.arg@gmail.com>
Date: Mon, 21 Jun 2004 23:36:05 +0000 (+0000)
Subject:  idem anterior
X-Git-Tag: svn_import~93
X-Git-Url: https://git.llucax.com/z.facultad/75.06/jacu.git/commitdiff_plain/3b6ca5c121131942b4a57d4d4c5c594bf8045c95

 idem anterior
---

diff --git a/src/jacu.c b/src/jacu.c
index fe94998..e870c99 100644
--- a/src/jacu.c
+++ b/src/jacu.c
@@ -64,12 +64,12 @@ int main(int argc, char* argv[])
 		/* Comprimo */
 		/* No me gusta el tmpfile ... es para probar como anda todo junto */
 		FILE *fp, *fp_out;
-		unsigned long int i, j, total, k;
+		Uint32 i, j, total, k;
 		char *mtf;
 		char *salida, *data, c;
 		data = malloc(sizeof(char)*pagesize);
 		/* Reservo lugar tambien para guardar el k y el tamaño  */
-		salida = malloc(sizeof(char)*(pagesize)+sizeof(unsigned long int)*2);
+		salida = malloc(sizeof(char)*(pagesize)+sizeof(Uint32)*2);
 		bs = bs_create(pagesize);
 
 		fp = fopen(argv[optind], "rb");
@@ -89,7 +89,7 @@ int main(int argc, char* argv[])
 			bs_solve(data, salida, bs, &k, i);
 
 			/* Le aplico el MTF, salteo el tamaño del bloque para que no se pierda. */
-			mtf = jacu_mtf(salida+sizeof(unsigned long int), i+sizeof(unsigned long int));
+			mtf = jacu_mtf(salida+sizeof(Uint32), i+sizeof(Uint32));
 
 			/* Si me lo piden, aplico ZG. */
 			if (zflag)
@@ -129,9 +129,9 @@ int main(int argc, char* argv[])
 		/* Descomprimo */
 		FILE *fp_out;
 		VFILE *fp_in;
-		unsigned long int block_size, k;
+		Uint32 block_size, k;
 		char *block, *mtf, *orig;
-		int *pos;
+		char *z;
 
 		shuff_decode_file(argv[optind], "tmp.comp"); /*argv[optind+1]);*/
 		fp_in = vfopen("tmp.comp", "r", 0);
@@ -139,17 +139,17 @@ int main(int argc, char* argv[])
 
 		while (!vfeof(fp_in)) {
 			block_size = 0;
-			vfread(&block_size, sizeof(unsigned long int), 1, fp_in);
+			vfread(&block_size, sizeof(Uint32), 1, fp_in);
 			if (block_size > 0) {
-				block = malloc((block_size+sizeof(unsigned long int))*sizeof(char));
+				block = malloc((block_size+sizeof(Uint32))*sizeof(char));
 				orig = malloc(block_size*sizeof(char));
 				vfread(block, block_size, sizeof(char), fp_in);
 
-				mtf = jacu_mtf_inv(block, /*XXX NO LO TENGO XXX */pos, block_size);
+				mtf = jacu_mtf_inv(z, block, block_size);
 
-				memcpy(&k, block, sizeof(unsigned long int));
+				memcpy(&k, block, sizeof(Uint32));
 
-				bs_restore(orig, block+sizeof(unsigned long int), k, block_size);
+				bs_restore(orig, block+sizeof(Uint32), k, block_size);
 
 				fwrite(orig, block_size, sizeof(char), fp_out);
 				free(block);