File libvorbis-1.1.2-warning-fixes.diff of Package libvorbis

Overview Repositories Revisions Requests Users Attributes Meta

File libvorbis-1.1.2-warning-fixes.diff of Package libvorbis (Revision cff367a9214f74f4a7bbd987a42dc5e7)

Currently displaying revision cff367a9214f74f4a7bbd987a42dc5e7 , Show latest

--- lib/mapping0.c-dist	2005-12-02 15:53:22.000000000 +0100
+++ lib/mapping0.c	2005-12-02 15:53:30.000000000 +0100
@@ -586,8 +586,8 @@ static int mapping0_forward(vorbis_block
     float **couple_bundle=alloca(sizeof(*couple_bundle)*vi->channels);
     int *zerobundle=alloca(sizeof(*zerobundle)*vi->channels);
     int **sortindex=alloca(sizeof(*sortindex)*vi->channels);
-    float **mag_memo;
-    int **mag_sort;
+    float **mag_memo = NULL;
+    int **mag_sort = NULL;
 
     if(info->coupling_steps){
       mag_memo=_vp_quantize_couple_memo(vb,
@@ -735,7 +735,7 @@ static int mapping0_inverse(vorbis_block
   codec_setup_info     *ci=vi->codec_setup;
   private_state        *b=vd->backend_state;
   vorbis_info_mapping0 *info=(vorbis_info_mapping0 *)l;
-  int hs=ci->halfrate_flag; 
+  /*int hs=ci->halfrate_flag; */
 
   int                   i,j;
   long                  n=vb->pcmend=ci->blocksizes[vb->W];
--- lib/scales.h-dist	2005-12-02 15:53:22.000000000 +0100
+++ lib/scales.h	2005-12-02 16:00:31.000000000 +0100
@@ -25,7 +25,7 @@
 #define VORBIS_IEEE_FLOAT32 1
 #ifdef VORBIS_IEEE_FLOAT32
 
-static float unitnorm(float x){
+static inline float unitnorm(float x){
   union {
     ogg_uint32_t i;
     float f;
@@ -36,7 +36,7 @@ static float unitnorm(float x){
 }
 
 /* Segher was off (too high) by ~ .3 decibel.  Center the conversion correctly. */
-static float todB(const float *x){
+static inline float todB(const float *x){
   union {
     ogg_uint32_t i;
     float f;
@@ -50,7 +50,7 @@ static float todB(const float *x){
 
 #else
 
-static float unitnorm(float x){
+static inline float unitnorm(float x){
   if(x<0)return(-1.f);
   return(1.f);
 }
--- lib/psy.c-dist	2005-12-02 15:53:22.000000000 +0100
+++ lib/psy.c	2005-12-02 15:53:30.000000000 +0100
@@ -553,7 +553,7 @@ static void bark_noise_hybridmp(int n,co
   int i;
 
   int lo, hi;
-  float R, A, B, D;
+  float R, A = 0, B = 0, D = 0;
   float w, x, y;
 
   tN = tX = tXX = tY = tXY = 0.f;
@@ -1214,7 +1214,7 @@ void hf_reduction(vorbis_info_psy_global
  
   int i,j,n=p->n, de=0.3*p->m_val;
   int limit=g->coupling_pointlimit[p->vi->blockflag][PACKETBLOBS/2];
-  int start=p->vi->normal_start;
+  /*int start=p->vi->normal_start;*/
   
   for(i=0; i<vi->coupling_steps; i++){
     /* for(j=start; j<limit; j++){} // ???*/
--- lib/res0.c-dist	2005-12-02 15:53:22.000000000 +0100
+++ lib/res0.c	2005-12-02 15:53:30.000000000 +0100
@@ -370,7 +370,7 @@ static long **_01class(vorbis_block *vb,
   vorbis_look_residue0 *look=(vorbis_look_residue0 *)vl;
   vorbis_info_residue0 *info=look->info;
   vorbis_info           *vi=vb->vd->vi;
-  codec_setup_info      *ci=vi->codec_setup;
+  /*codec_setup_info      *ci=vi->codec_setup;*/
 
   /* move all this setup out later */
   int samples_per_partition=info->grouping;
@@ -498,7 +498,7 @@ static int _01forward(oggpack_buffer *op
   vorbis_look_residue0 *look=(vorbis_look_residue0 *)vl;
   vorbis_info_residue0 *info=look->info;
 
-  vorbis_dsp_state      *vd=vb->vd;
+  /*vorbis_dsp_state      *vd=vb->vd;*/
 
   /* move all this setup out later */
   int samples_per_partition=info->grouping;
--- lib/vorbisfile.c-dist	2005-12-02 15:53:22.000000000 +0100
+++ lib/vorbisfile.c	2005-12-02 15:53:30.000000000 +0100
@@ -987,7 +987,7 @@ int ov_raw_seek(OggVorbis_File *vf,ogg_i
     int lastblock=0;
     int accblock=0;
     int thisblock;
-    int eosflag;
+    int eosflag = 0;
 
     ogg_stream_init(&work_os,vf->current_serialno); /* get the memory ready */
     ogg_stream_reset(&work_os); /* eliminate the spurious OV_HOLE
--- lib/floor1.c-dist	2005-12-02 15:53:22.000000000 +0100
+++ lib/floor1.c	2005-12-02 15:53:30.000000000 +0100
@@ -413,7 +413,7 @@ static int accumulate_fit(const float *f
 			  int x0, int x1,lsfit_acc *a,
 			  int n,vorbis_info_floor1 *info){
   long i;
-  int quantized=vorbis_dBquant(flr+x0);
+  /*int quantized=vorbis_dBquant(flr+x0);*/
 
   long xa=0,ya=0,x2a=0,y2a=0,xya=0,na=0, xb=0,yb=0,x2b=0,y2b=0,xyb=0,nb=0;
 
@@ -591,7 +591,7 @@ static int post_Y(int *A,int *B,int pos)
   return (A[pos]+B[pos])>>1;
 }
 
-static int seq=0;
+/*static int seq=0;*/
 
 int *floor1_fit(vorbis_block *vb,vorbis_look_floor1 *look,
 			  const float *logmdct,   /* in */
@@ -763,7 +763,7 @@ int floor1_encode(oggpack_buffer *opb,vo
 
   long i,j;
   vorbis_info_floor1 *info=look->vi;
-  long n=look->n;
+  /*long n=look->n;*/
   long posts=look->posts;
   codec_setup_info *ci=vb->vd->vi->codec_setup;
   int out[VIF_POSIT+2];
--- examples/seeking_example.c-dist	2005-12-02 15:53:22.000000000 +0100
+++ examples/seeking_example.c	2005-12-02 15:53:30.000000000 +0100
@@ -130,7 +130,7 @@ int main(){
     
       for(i=0;i<1000;i++){
 	ogg_int64_t val=(double)rand()/RAND_MAX*length;
-	ogg_int64_t pos;
+	ogg_int64_t pos=0;
 	printf("\r\t%d [raw position %ld]...     ",i,(long)val);
 	fflush(stdout);
 	ret=ov_raw_seek(&ov,val);
@@ -151,7 +151,7 @@ int main(){
     
       for(i=0;i<1000;i++){
 	ogg_int64_t val=(double)rand()/RAND_MAX*pcmlength;
-	ogg_int64_t pos;
+	ogg_int64_t pos=0;
 	printf("\r\t%d [pcm position %ld]...     ",i,(long)val);
 	fflush(stdout);
 	ret=ov_pcm_seek_page(&ov,val);
@@ -167,13 +167,13 @@ int main(){
     
     printf("\r");
     {
-      ogg_int64_t length=ov.end;
+      /*ogg_int64_t length=ov.end;*/
       printf("testing pcm exact seeking to random places in %ld samples....\n",
 	     (long)pcmlength);
     
       for(i=0;i<1000;i++){
 	ogg_int64_t val=(double)rand()/RAND_MAX*pcmlength;
-	ogg_int64_t pos;
+	ogg_int64_t pos=0;
 	printf("\r\t%d [pcm position %ld]...     ",i,(long)val);
 	fflush(stdout);
 	ret=ov_pcm_seek(&ov,val);

Places

File libvorbis-1.1.2-warning-fixes.diff of Package libvorbis (Revision cff367a9214f74f4a7bbd987a42dc5e7)

Places