idem anterior

diff --git a/src/jacu.c b/src/jacu.c
index fe9499847316777a43d5c07aa4a54eac905536b0..e870c999c66d87e4831b043e7614ce6b804f41ce 100644 (file)
--- 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;
                /* 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  */
                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");
                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. */
                        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)
 
                        /* 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;
                /* Descomprimo */
                FILE *fp_out;
                VFILE *fp_in;

-               unsigned long int block_size, k;
+               Uint32 block_size, k;

                char *block, *mtf, *orig;
                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);
 
                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;
 
                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) {
                        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);
 
                                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);
 
                                fwrite(orig, block_size, sizeof(char), fp_out);
                                free(block);