X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=swcsa%2Futils%2Fhuff.c;h=ebea07734c392e02d11e7fbac1e23db0e8ea3687;hb=898f6e5c6b7223f4753b7ccb7939809ee5f53aae;hp=b45a48404de50420968047c681652562e6360c43;hpb=102e33b134075765e6d4e0c38bc1307568ce5602;p=SXSI%2FTextCollection.git

diff --git a/swcsa/utils/huff.c b/swcsa/utils/huff.c
index b45a484..ebea077 100755
--- a/swcsa/utils/huff.c
+++ b/swcsa/utils/huff.c
@@ -166,7 +166,7 @@ int encodeHuff (THuff H, uint symb, uint *stream, uint ptr)
          pos -= H.num[d--];
        }
      code += pos;
-     if (d > W) { bitzero(stream,ptr,d-W); ptr += d-W; d = W; }
+     if (d > W) { bitzero2(stream,ptr,d-W); ptr += d-W; d = W; }
      while (d--)
         { if ((code >> d) & 1) bitset(stream,ptr);
 	  else bitclean(stream,ptr);
@@ -236,7 +236,7 @@ int decodeHuff (THuff *H, uint *symb, uint *stream, uint ptr)
      return ptr+d;
    } 
 */
-void saveHuff (THuff H, FILE *f)
+void saveHuff2 (THuff H, FILE *f)
 
    { uint *symb = (uint *)malloc((H.lim+1)*sizeof(uint));
      int i;
@@ -250,7 +250,7 @@ void saveHuff (THuff H, FILE *f)
      free (symb);
    }
 
-uint sizeHuff (THuff H)
+uint sizeHuff2 (THuff H)
 
    { return (4 +(H.lim+1)+2*(H.depth+1))*sizeof(uint);
    }
@@ -260,13 +260,13 @@ uint sizeHuffDisk (THuff H)
    { return ( sizeof(THuff) + ((H.lim+1)+(H.depth+1))*sizeof(uint) );
    }
 
-void freeHuff (THuff H)
+void freeHuff2 (THuff H)
 
   { free (H.s.spos);  free (H.num); free (H.fst);
   }
 
 
-THuff loadHuff (FILE *f, int enc)   //enc (0/1)-> do you only  want to perform encoding ??
+THuff loadHuff2 (FILE *f, int enc)   //enc (0/1)-> do you only  want to perform encoding ??
 
    { THuff H;
      uint *symb;