X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=swcsa%2FintIndex%2FpsiHuffmanRLE.c;h=c5b9451cf20ff7dc33958e6681619e184723d9b0;hb=72aa11ca7df7975f650344e8904a1a690be2480e;hp=ac619a164a4a36eeb5b030811ffdb64f34020cd7;hpb=46d3fee70e7e9576c4cc8af46cd66c1c8eceb1e9;p=SXSI%2FTextCollection.git

diff --git a/swcsa/intIndex/psiHuffmanRLE.c b/swcsa/intIndex/psiHuffmanRLE.c
index ac619a1..c5b9451 100644
--- a/swcsa/intIndex/psiHuffmanRLE.c
+++ b/swcsa/intIndex/psiHuffmanRLE.c
@@ -67,11 +67,11 @@ HuffmanCompressedPsi huffmanCompressPsi(unsigned int *Psi, unsigned int psiSize,
 				else
 					if(diffs[index]<0) {	// Valor negativo
 						absolute_value = -diffs[index];
-						binaryLenght = bits(absolute_value);
+						binaryLenght = _bits(absolute_value);
 						huffmanDst[binaryLenght+negStart-1]++;
 					} else {				// Valor grande >= 128
 						absolute_value = diffs[index];
-						binaryLenght = bits(absolute_value);
+						binaryLenght = _bits(absolute_value);
 						huffmanDst[binaryLenght+bigStart-1]++;
 					}
 			}
@@ -99,8 +99,8 @@ HuffmanCompressedPsi huffmanCompressPsi(unsigned int *Psi, unsigned int psiSize,
 	
 	// Calculamos o numero de mostras e o espacio ocupado por cada mostra e por cada punteiro
 	numberOfSamples = (psiSize+T-1)/T;	
-	sampleSize = bits(psiSize);
-	pointerSize = bits(streamSize);	
+	sampleSize = _bits(psiSize);
+	pointerSize = _bits(streamSize);	
 
 	// Reservamos espacio para a secuencia e para as mostras e punteiros
 	samples = (unsigned int *)malloc(sizeof(uint)*((numberOfSamples*sampleSize+31)/32));	
@@ -132,13 +132,13 @@ HuffmanCompressedPsi huffmanCompressPsi(unsigned int *Psi, unsigned int psiSize,
 				else
 					if(diffs[index]<0) {	// Valor negativo
 						absolute_value = -diffs[index];
-						binaryLenght = bits(absolute_value);
+						binaryLenght = _bits(absolute_value);
 						ptr = encodeHuff(diffsHT,binaryLenght+negStart-1,stream,ptr);
 						bitwrite(stream,ptr,binaryLenght,absolute_value);
 						ptr += binaryLenght;						
 					} else {				// Valor grande >= 128
 						absolute_value = diffs[index];
-						binaryLenght = bits(absolute_value);					
+						binaryLenght = _bits(absolute_value);					
 						ptr = encodeHuff(diffsHT,binaryLenght+bigStart-1,stream,ptr);
 						bitwrite(stream,ptr,binaryLenght,absolute_value);						
 						ptr += binaryLenght;