Agrego descompresor. No funciona porque me esta faltando el vector "pos" del MTF...

[z.facultad/75.06/jacu.git] / src / jacu.c

diff --git a/src/jacu.c b/src/jacu.c
index 21f31c53b9d0c20784837a29bd50d8b6c12afa7e..3d18ed3be44af85c1c97ae75db13ec99fe6283ff 100644 (file)
--- a/src/jacu.c
+++ b/src/jacu.c
@@ -103,8 +103,39 @@ int main(int argc, char* argv[])
        
        if (dflag == 1) { 
                /* Descomprimo */
-               return shuff_decode_file(argv[optind],argv[optind+1]);
+               FILE *fp_out;
+               VFILE *fp_in;
+               unsigned long int block_size, k;
+               char *block, *mtf, *orig;
+               int *pos;
+
+               shuff_decode_file(argv[optind], "tmp.comp"); /*argv[optind+1]);*/
+               fp_in = vfopen("tmp.comp", "r", 0);
+               fp_out = fopen(argv[optind+1], "wb");
+
+               while (!vfeof(fp_in)) {
+                       block_size = 0;
+                       vfread(&block_size, sizeof(unsigned long int), 1, fp_in);
+                       if (block_size > 0) {
+                               block = malloc((block_size+sizeof(unsigned long int))*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);
+
+                               memcpy(&k, block, sizeof(unsigned long int));
+
+                               bs_restore(orig, block+sizeof(unsigned long int), k, block_size);
+
+                               fwrite(orig, block_size, sizeof(char), fp_out);
+                               free(block);
+                               free(orig);
+                               free(mtf);
+                       }
+               }
+               vfclose(fp_in);
+               fclose(fp_out);
        }
-               
+
        return 0;
 }