X-Git-Url: https://git.llucax.com/z.facultad/75.06/jacu.git/blobdiff_plain/f4f9947b91b6b8d3ec18eb66639c8f2825a8dc4c..617749754a2fc4ee73f8d5e3de4bc7305267d36a:/src/jacu.c?ds=sidebyside

diff --git a/src/jacu.c b/src/jacu.c
index 5add536..089bc79 100644
--- a/src/jacu.c
+++ b/src/jacu.c
@@ -99,9 +99,9 @@ int main(int argc, char* argv[])
 		/* Comprimo */		
 		FILE *fp;
 		Uint32 i, j, total, k;
-		char *mtf;
-		char *salida, *data;
-		char *z;
+		unsigned char *mtf;
+		unsigned char *salida, *data;
+		unsigned char *z;
 		int z_len;
 		
 		/* Preparo el compresor huffman */
@@ -109,8 +109,8 @@ int main(int argc, char* argv[])
 		if (mflag == 1) shuff_loadmodel(shuff,staticmodel);
 		
 		/* Preparo el BS alocando mem para el K, el Block y su Size */
-		data = malloc(sizeof(char)*pagesize);
-		salida = malloc(sizeof(char)*pagesize+sizeof(Uint32)*2);
+		data = malloc(sizeof(unsigned char)*pagesize);
+		salida = malloc(sizeof(unsigned char)*pagesize+sizeof(Uint32)*2);
 		bs = bs_create(pagesize);
 
 		/* Abrimos el archivo a comprimir y encodeamos bloques */
@@ -195,10 +195,10 @@ int main(int argc, char* argv[])
 	if (dflag == 1) { 
 		/* Descomprimo */
 		FILE *fp_out;
-		FILE *fp_in;
+		/*FILE *fp_in;*/
 		Uint32 block_size, k;
-		char *block, *mtf, *orig;
-		char *z;
+		unsigned char *block, *mtf, *orig;
+		unsigned char *z;
 		int z_len,moredata = 0,decoded = 0;
 
 		/* Inicializo el descompresor */
@@ -213,7 +213,7 @@ int main(int argc, char* argv[])
 			moredata = shuff_decode_chunk(shuff,(char*)&block_size,sizeof(Uint32),&decoded);
 			if (block_size > 0) {
 				moredata = shuff_decode_chunk(shuff,(char*)&z_len,sizeof(int),&decoded);				
-				z = malloc(sizeof(char)*z_len);
+				z = malloc(sizeof(unsigned char)*z_len);
 				moredata = shuff_decode_chunk(shuff,z,z_len,&decoded);				
 
 				/*printf("MTF Z (len=%d) = [", z_len);
@@ -225,8 +225,8 @@ int main(int argc, char* argv[])
 	
 				}*/
 				
-				block = malloc(block_size*sizeof(char)+sizeof(Uint32));
-				orig = malloc(block_size*sizeof(char));
+				block = malloc(block_size*sizeof(unsigned char)+sizeof(Uint32));
+				orig = malloc(block_size*sizeof(unsigned char));
 				moredata = shuff_decode_chunk(shuff,block,block_size+sizeof(Uint32),&decoded);				
 
 				/*printf("Antes MTF_inv = [");
@@ -237,7 +237,7 @@ int main(int argc, char* argv[])
 					printf("]\n");
 				}*/
 				/* Hago el MTF inverso */
-				mtf = jacu_mtf_inv(z, block, block_size*sizeof(char)+sizeof(Uint32));
+				mtf = jacu_mtf_inv(z, block, block_size*sizeof(unsigned char)+sizeof(Uint32));
 
 				/*printf("Luego de MTF Inv= [");
 				{
@@ -253,7 +253,7 @@ int main(int argc, char* argv[])
 				/*printf("Restored : k=%ld\n", k);*/
 				bs_restore(orig, mtf+sizeof(Uint32), k, block_size);
 
-				fwrite(orig, block_size, sizeof(char), fp_out);
+				fwrite(orig, block_size, sizeof(unsigned char), fp_out);
 				free(block);
 				free(orig);
 				free(mtf);