Update the VQ tools to pared down codebook abstraction.

[platform/upstream/libvorbis.git] / vq / build.c

diff --git a/vq/build.c b/vq/build.c
index 2d307fe..ac76bc8 100644 (file)
--- a/vq/build.c
+++ b/vq/build.c
@@ -1,17 +1,17 @@
 /********************************************************************
  *                                                                  *
  * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
- * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH    *
- * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
+ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
+ * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation http://www.xiph.org/                  *
  *                                                                  *
  ********************************************************************
 
  function: utility main for building codebooks from training sets
- last mod: $Id: build.c,v 1.19 2001/02/02 03:52:26 xiphmont Exp $
+ last mod: $Id$
 
  ********************************************************************/
 
@@ -36,26 +36,26 @@ static char *rline(FILE *in,FILE *out){
 
     while(!gotline){
       if(sofar>=lbufsize){
-       if(!lbufsize){  
-         lbufsize=1024;
-         linebuffer=_ogg_malloc(lbufsize);
-       }else{
-         lbufsize*=2;
-         linebuffer=_ogg_realloc(linebuffer,lbufsize);
-       }
+        if(!lbufsize){        
+          lbufsize=1024;
+          linebuffer=_ogg_malloc(lbufsize);
+        }else{
+          lbufsize*=2;
+          linebuffer=_ogg_realloc(linebuffer,lbufsize);
+        }
       }
       {
-       long c=fgetc(in);
-       switch(c){
-       case '\n':
-       case EOF:
-         gotline=1;
-         break;
-       default:
-         linebuffer[sofar++]=c;
-         linebuffer[sofar]='\0';
-         break;
-       }
+        long c=fgetc(in);
+        switch(c){
+        case '\n':
+        case EOF:
+          gotline=1;
+          break;
+        default:
+          linebuffer[sofar++]=c;
+          linebuffer[sofar]='\0';
+          break;
+        }
       }
     }
     
@@ -135,7 +135,7 @@ int main(int argc,char *argv[]){
   /* quant */
   line=rline(in,out);
   if(sscanf(line,"%ld %ld %d %d",&q.min,&q.delta,
-           &q.quant,&q.sequencep)!=4){
+            &q.quant,&q.sequencep)!=4){
     fprintf(stderr,"Syntax error reading book file\n");
     exit(1);
   }
@@ -167,9 +167,9 @@ int main(int argc,char *argv[]){
     v.entries=0; /* hack to avoid reseeding */
     while(1){
       for(k=0;k<dim+aux;k++){
-       line=rline(in,out);
-       if(!line)break;
-       sscanf(line,"%f",b+k);
+        line=rline(in,out);
+        if(!line)break;
+        sscanf(line,"%f",b+k);
       }
       if(feof(in))break;
       vqgen_addpoint(&v,b,NULL);